Merge develop into solr-8-upgrade

BUILDING.txt

@@ -37,16 +37,16 @@ to the root 64-bit JRE directory.
 2) Get Sleuth Kit Setup
 2a) Download and build a Release version of Sleuth Kit (TSK) 4.0. See
     win32\BUILDING.txt in the TSK package for more information. You need to 
-    build the tsk_jni project. Select the Release_PostgreSQL Win32 or x64 target,
+    build the tsk_jni project. Select the Release Win32 or x64 target,
     depending upon your target build. You can use a released version or download 
     the latest from github:
 - git://github.com/sleuthkit/sleuthkit.git
 
-2b) Build the TSK JAR file by typing 'ant dist-PostgreSQL' in
+2b) Build the TSK JAR file by typing 'ant dist' in
     bindings/java in the
     TSK source code folder from a command line. Note it is case
     sensitive. You can also add the code to a NetBeans project and build
-    it from there, selecting the dist-PostgreSQL target.
+    it from there, selecting the dist target.
 
 2c) Set TSK_HOME environment variable to the root directory of TSK
 
@@ -54,6 +54,9 @@ to the root 64-bit JRE directory.
 from the TSK root directory to install the libraries and such in
 the needed places (i.e. '/usr/local').
 
+2e) Build the TSK CaseUco jar file by running 'ant' in
+    the case-uco/java folder of the TSK source folder. You can also add the
+    code to a NetBeans project and build using the regular 'build' action.
 
 3) For Windows builds, GStreamer must be setup. GStreamer is used to view video
 files. You can either download it and install it, or you can copy it from the
@@ -100,7 +103,7 @@ the build process.
 
 - The Sleuth Kit Java datamodel JAR file has native JNI libraries
 that are copied into it. These JNI libraries have dependencies on
-libewf, zlib, libpq, libintl-8, libeay32, and ssleay32 DLL files. On non-Windows 
+libewf, zlib, libintl-8, libeay32, and ssleay32 DLL files. On non-Windows 
 platforms, the JNI library also has a dependency on libtsk (on Windows, 
 it is compiled into libtsk_jni).
 

Core/build.xml

@@ -54,6 +54,16 @@
             <fileset dir="${thirdparty.dir}/7-Zip"/>
         </copy>
 
+        <!--Copy InterestingFileSetRules to release-->
+        <copy todir="${basedir}/release/InterestingFileSetRules" >
+            <fileset dir="${thirdparty.dir}/InterestingFileSetRules"/>
+        </copy>
+
+        <!--Copy OfficialHashSets to release-->
+        <copy todir="${basedir}/release/OfficialHashSets" >
+            <fileset dir="${thirdparty.dir}/OfficialHashSets"/>
+        </copy>
+
         <!-- The 'libgstlibav.dll' file is too big to store on GitHub, so we
         have it stored in a ZIP file. We'll extract it in place and remove
         the ZIP file afterward. -->
@@ -105,7 +115,9 @@
         <copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.jar"
               tofile="${ext.dir}/c3p0-0.9.5.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/SparseBitSet-1.1.jar"
-                      tofile="${ext.dir}/SparseBitSet-1.1.jar"/>	  
+                      tofile="${ext.dir}/SparseBitSet-1.1.jar"/>	
+        <copy file="${env.TSK_HOME}/case-uco/java/dist/sleuthkit-caseuco-${TSK_VERSION}.jar" 
+              tofile="${ext.dir}/sleuthkit-caseuco-${TSK_VERSION}.jar"/>  
     </target>
 
     <target name="download-binlist">

Core/manifest.mf

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.core/10
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 31
+OpenIDE-Module-Implementation-Version: 32
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
 AutoUpdate-Show-In-Client: true
 AutoUpdate-Essential-Module: true

Core/nbproject/project.properties

@@ -83,6 +83,7 @@ file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sis-metadata-0.8.jar=release\\modules\\ext\\sis-metadata-0.8.jar
 file.reference.sis-netcdf-0.8.jar=release\\modules\\ext\\sis-netcdf-0.8.jar
 file.reference.sis-utility-0.8.jar=release\\modules\\ext\\sis-utility-0.8.jar
+file.reference.sleuthkit-caseuco-4.10.0.jar=release/modules/ext/sleuthkit-caseuco-4.10.0.jar
 file.reference.slf4j-api-1.7.25.jar=release\\modules\\ext\\slf4j-api-1.7.25.jar
 file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
@@ -90,7 +91,7 @@ file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0
 file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar
 file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar
 file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar
-file.reference.sleuthkit-4.9.0.jar=release/modules/ext/sleuthkit-4.9.0.jar
+file.reference.sleuthkit-4.10.0.jar=release/modules/ext/sleuthkit-4.10.0.jar
 file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
 file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar
 file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar
@@ -138,5 +139,5 @@ nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar
-spec.version.base=10.19
+spec.version.base=10.20
 

Core/nbproject/project.xml

@@ -472,8 +472,8 @@
                 <binary-origin>release/modules/ext/commons-pool2-2.4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-4.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-4.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-4.10.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-4.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jxmapviewer2-2.4.jar</runtime-relative-path>
@@ -779,6 +779,10 @@
                 <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/sleuthkit-caseuco-4.10.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.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>

Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2019 Basis Technology Corp.
+ * Copyright 2013-2020 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -139,7 +139,7 @@ abstract class AddTagAction extends AbstractAction implements Presenter.Popup {
                 if (!tagNamesMap.isEmpty()) {
                     for (Map.Entry<String, TagName> entry : tagNamesMap.entrySet()) {
                         TagName tagName = entry.getValue();
-                        TagSet tagSet = tagName.getTagSet();
+                        TagSet tagSet = tagsManager.getTagSet(tagName);
 
                         // Show custom tags before predefined tags in the menu
                         if (tagSet != null) {

Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java

@@ -29,6 +29,9 @@ import org.openide.util.Utilities;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager.ContentViewerTag;
+import org.sleuthkit.autopsy.contentviewers.imagetagging.ImageTagRegion;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.TskCoreException;
@@ -72,6 +75,12 @@ public class DeleteContentTagAction extends AbstractAction {
         new Thread(() -> {
             for (ContentTag tag : selectedTags) {
                 try {
+                    // Check if there is an image tag before deleting the content tag.
+                    ContentViewerTag<ImageTagRegion> imageTag = ContentViewerTagManager.getTag(tag, ImageTagRegion.class);
+                    if(imageTag != null) {
+                        ContentViewerTagManager.deleteTag(imageTag);
+                    }
+                    
                     Case.getCurrentCaseThrows().getServices().getTagsManager().deleteContentTag(tag);
                 } catch (TskCoreException | NoCurrentCaseException ex) {
                     Logger.getLogger(DeleteContentTagAction.class.getName()).log(Level.SEVERE, "Error deleting tag", ex); //NON-NLS

Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java

@@ -39,6 +39,9 @@ import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager.ContentViewerTag;
+import org.sleuthkit.autopsy.contentviewers.imagetagging.ImageTagRegion;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.tags.TagUtils;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -123,6 +126,13 @@ public class DeleteFileContentTagAction extends AbstractAction implements Presen
 
                 try {
                     logger.log(Level.INFO, "Removing tag {0} from {1}", new Object[]{tagName.getDisplayName(), contentTag.getContent().getName()}); //NON-NLS
+                    
+                    // Check if there is an image tag before deleting the content tag.
+                    ContentViewerTag<ImageTagRegion> imageTag = ContentViewerTagManager.getTag(contentTag, ImageTagRegion.class);
+                    if(imageTag != null) {
+                        ContentViewerTagManager.deleteTag(imageTag);
+                    }
+                    
                     tagsManager.deleteContentTag(contentTag);
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error untagging file", tskCoreException); //NON-NLS

Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2013-2020 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,6 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +35,6 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JList;
 import javax.swing.KeyStroke;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -150,7 +148,7 @@ public class GetTagNameAndCommentDialog extends JDialog {
         }
         );
 
-        try {
+        try { 
             TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
             List<String> standardTagNames = TagsManager.getStandardTagNames();
             Map<String, TagName> tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap());
@@ -161,7 +159,7 @@ public class GetTagNameAndCommentDialog extends JDialog {
             tagNamesMap.entrySet().stream().map((entry) -> entry.getValue()).forEachOrdered((tagName) -> {
                 TagSet tagSet = null;
                 try {
-                    tagSet = tagName.getTagSet();
+                    tagSet = tagsManager.getTagSet(tagName);
                 } catch (TskCoreException ex) {
                     Logger.getLogger(GetTagNameAndCommentDialog.class
                     .getName()).log(Level.SEVERE, "Failed to get tag set", ex); //NON-NLS

Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java

@@ -29,6 +29,9 @@ import org.openide.util.Utilities;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager;
+import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager.ContentViewerTag;
+import org.sleuthkit.autopsy.contentviewers.imagetagging.ImageTagRegion;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.TagName;
@@ -83,9 +86,19 @@ public final class ReplaceContentTagAction extends ReplaceTagAction<ContentTag>
                 try {
                     logger.log(Level.INFO, "Replacing tag {0}  with tag {1} for artifact {2}", new Object[]{oldTag.getName().getDisplayName(), newTagName.getDisplayName(), oldTag.getContent().getName()}); //NON-NLS
 
+                    // Check if there is an image tag before deleting the content tag.
+                    ContentViewerTag<ImageTagRegion> imageTag = ContentViewerTagManager.getTag(oldTag, ImageTagRegion.class);
+                    if(imageTag != null) {
+                        ContentViewerTagManager.deleteTag(imageTag);
+                    }
+                    
                     tagsManager.deleteContentTag(oldTag);
-                    tagsManager.addContentTag(oldTag.getContent(), newTagName, newComment);
-
+                    ContentTag newTag = tagsManager.addContentTag(oldTag.getContent(), newTagName, newComment);
+                    
+                    // Resave the image tag if present.
+                    if(imageTag != null) {
+                        ContentViewerTagManager.saveTag(newTag, imageTag.getDetails());
+                    }
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error replacing artifact tag", tskCoreException); //NON-NLS
                     Platform.runLater(()

Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2018 Basis Technology Corp.
+ * Copyright 2018-2020 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -131,7 +131,7 @@ abstract class ReplaceTagAction<T extends Tag> extends AbstractAction implements
                 if (!tagNamesMap.isEmpty()) {
                     for (Map.Entry<String, TagName> entry : tagNamesMap.entrySet()) {
                         TagName tagName = entry.getValue();
-                        TagSet tagSet = tagName.getTagSet();
+                        TagSet tagSet = tagsManager.getTagSet(tagName);
 
                         // Show custom tags before predefined tags in the menu
                         if (tagSet != null) {

Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java

@@ -30,6 +30,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgress
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.imagewriter.ImageWriterService;
 import org.sleuthkit.autopsy.imagewriter.ImageWriterSettings;
+import org.sleuthkit.datamodel.AddDataSourceCallbacks;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.SleuthkitJNI;
@@ -42,17 +43,10 @@ import org.sleuthkit.datamodel.TskDataException;
 class AddImageTask implements Runnable {
 
     private final Logger logger = Logger.getLogger(AddImageTask.class.getName());
-    private final String deviceId;
-    private final String imagePath;
-    private final int sectorSize;
-    private final String timeZone;
-    private final ImageWriterSettings imageWriterSettings;
-    private final boolean ignoreFatOrphanFiles;
-    private final String md5;
-    private final String sha1;
-    private final String sha256;
+    private final ImageDetails imageDetails;
     private final DataSourceProcessorProgressMonitor progressMonitor;
-    private final DataSourceProcessorCallback callback;
+    private final AddDataSourceCallbacks addDataSourceCallbacks;
+    private final AddImageTaskCallback addImageTaskCallback;
     private boolean criticalErrorOccurred;
 
     /*
@@ -73,40 +67,18 @@ class AddImageTask implements Runnable {
 
     /**
      * Constructs a runnable task that adds an image to the case database.
-     *
-     * @param deviceId             An ASCII-printable identifier for the device
-     *                             associated with the data source that is
-     *                             intended to be unique across multiple cases
-     *                             (e.g., a UUID).
-     * @param imagePath            Path to the image file.
-     * @param sectorSize           The sector size (use '0' for autodetect).
-     * @param timeZone             The time zone to use when processing dates
-     *                             and times for the image, obtained from
-     *                             java.util.TimeZone.getID.
-     * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
-     *                             FAT filesystem.
-     * @param md5                  The MD5 hash of the image, may be null.
-     * @param sha1                 The SHA-1 hash of the image, may be null.
-     * @param sha256               The SHA-256 hash of the image, may be null.
-     * @param imageWriterPath      Path that a copy of the image should be
-     *                             written to. Use empty string to disable image
-     *                             writing
+     * 
+     * @param imageDetails         Holds all data about the image.
      * @param progressMonitor      Progress monitor to report progress during
      *                             processing.
-     * @param callback             Callback to call when processing is done.
+     * @param addDataSourceCallbacks  Callback for sending data to the ingest pipeline if an ingest stream is being used.
+     * @param addImageTaskCallback    Callback for dealing with add image task completion.
      */
-    AddImageTask(String deviceId, String imagePath, int sectorSize, String timeZone, boolean ignoreFatOrphanFiles, String md5, String sha1, String sha256, ImageWriterSettings imageWriterSettings,
-            DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
-        this.deviceId = deviceId;
-        this.imagePath = imagePath;
-        this.sectorSize = sectorSize;
-        this.timeZone = timeZone;
-        this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
-        this.md5 = md5;
-        this.sha1 = sha1;
-        this.sha256 = sha256;
-        this.imageWriterSettings = imageWriterSettings;
-        this.callback = callback;
+    AddImageTask(ImageDetails imageDetails, DataSourceProcessorProgressMonitor progressMonitor, AddDataSourceCallbacks addDataSourceCallbacks,  
+            AddImageTaskCallback addImageTaskCallback) {
+        this.imageDetails = imageDetails;
+        this.addDataSourceCallbacks = addDataSourceCallbacks;
+        this.addImageTaskCallback = addImageTaskCallback;
         this.progressMonitor = progressMonitor;
         tskAddImageProcessLock = new Object();
     }
@@ -120,21 +92,21 @@ class AddImageTask implements Runnable {
         try {
             currentCase = Case.getCurrentCaseThrows();
         } catch (NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, String.format("Failed to add image data source at %s, no current case", imagePath), ex);
+            logger.log(Level.SEVERE, String.format("Failed to start AddImageTask for %s, no current case", imageDetails.getImagePath()), ex);
             return;
         }
         progressMonitor.setIndeterminate(true);
         progressMonitor.setProgress(0);
         String imageWriterPath = "";
-        if (imageWriterSettings != null) {
-            imageWriterPath = imageWriterSettings.getPath();
+        if (imageDetails.imageWriterSettings != null) {
+            imageWriterPath = imageDetails.imageWriterSettings.getPath();
         }
         List<String> errorMessages = new ArrayList<>();
         List<Content> newDataSources = new ArrayList<>();
         try {
             synchronized (tskAddImageProcessLock) {
                 if (!tskAddImageProcessStopped) {
-                    tskAddImageProcess = currentCase.getSleuthkitCase().makeAddImageProcess(timeZone, true, ignoreFatOrphanFiles, imageWriterPath);
+                    tskAddImageProcess = currentCase.getSleuthkitCase().makeAddImageProcess(imageDetails.timeZone, true, imageDetails.ignoreFatOrphanFiles, imageWriterPath);
                 } else {
                     return;
                 }
@@ -143,7 +115,7 @@ class AddImageTask implements Runnable {
             progressUpdateThread.start();
             runAddImageProcess(errorMessages);
             progressUpdateThread.interrupt();
-            commitOrRevertAddImageProcess(currentCase, errorMessages, newDataSources);
+            finishAddImageProcess(errorMessages, newDataSources);
             progressMonitor.setProgress(100);
         } finally {
             DataSourceProcessorCallback.DataSourceProcessorResult result;
@@ -154,7 +126,7 @@ class AddImageTask implements Runnable {
             } else {
                 result = DataSourceProcessorResult.NO_ERRORS;
             }
-            callback.done(result, errorMessages, newDataSources);
+            addImageTaskCallback.onCompleted(result, errorMessages, newDataSources);
         }
     }
 
@@ -177,7 +149,7 @@ class AddImageTask implements Runnable {
                     tskAddImageProcess.stop();
 
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, String.format("Error cancelling adding image %s to the case database", imagePath), ex); //NON-NLS
+                    logger.log(Level.SEVERE, String.format("Error cancelling adding image %s to the case database", imageDetails.getImagePath()), ex); //NON-NLS
                 }
             }
         }
@@ -191,23 +163,22 @@ class AddImageTask implements Runnable {
      */
     private void runAddImageProcess(List<String> errorMessages) {
         try {
-            tskAddImageProcess.run(deviceId, new String[]{imagePath}, sectorSize);
+            tskAddImageProcess.run(imageDetails.deviceId, imageDetails.image, imageDetails.sectorSize, this.addDataSourceCallbacks);
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, String.format("Critical error occurred adding image %s", imagePath), ex); //NON-NLS
+            logger.log(Level.SEVERE, String.format("Critical error occurred adding image %s", imageDetails.getImagePath()), ex); //NON-NLS
             criticalErrorOccurred = true;
             errorMessages.add(ex.getMessage());
         } catch (TskDataException ex) {
-            logger.log(Level.WARNING, String.format("Non-critical error occurred adding image %s", imagePath), ex); //NON-NLS
+            logger.log(Level.WARNING, String.format("Non-critical error occurred adding image %s", imageDetails.getImagePath()), ex); //NON-NLS
             errorMessages.add(ex.getMessage());
         }
     }
 
     /**
-     * Commits or reverts the results of the TSK add image process. If the
-     * process was stopped before it completed or there was a critical error the
-     * results are reverted, otherwise they are committed.
+     * Handle the results of the TSK add image process. 
+     * The image will be in the database even if a critical error occurred or
+     * the user canceled.
      *
-     * @param currentCase    The current case.
      * @param errorMessages  Error messages, if any, are added to this list for
      *                       eventual return via the callback.
      * @param newDataSources If the new image is successfully committed, it is
@@ -216,84 +187,66 @@ class AddImageTask implements Runnable {
      *
      * @return
      */
-    private void commitOrRevertAddImageProcess(Case currentCase, List<String> errorMessages, List<Content> newDataSources) {
+    private void finishAddImageProcess(List<String> errorMessages, List<Content> newDataSources) {
         synchronized (tskAddImageProcessLock) {
-            if (tskAddImageProcessStopped || criticalErrorOccurred) {
+            Image newImage = imageDetails.image;
+            String verificationError = newImage.verifyImageSize();
+            if (!verificationError.isEmpty()) {
+                errorMessages.add(verificationError);
+            }
+            if (imageDetails.imageWriterSettings != null) {
+                ImageWriterService.createImageWriter(newImage.getId(), imageDetails.imageWriterSettings);
+            }
+            newDataSources.add(newImage);
+
+            // If the add image process was cancelled don't do any further processing here
+            if (tskAddImageProcessStopped) {
+                return;
+            }
+
+            if (!StringUtils.isBlank(imageDetails.md5)) {
                 try {
-                    tskAddImageProcess.revert();
+                    newImage.setMD5(imageDetails.md5);
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, String.format("Error reverting after adding image %s to the case database", imagePath), ex); //NON-NLS
+                    logger.log(Level.SEVERE, String.format("Failed to add MD5 hash for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
                     errorMessages.add(ex.getMessage());
                     criticalErrorOccurred = true;
+                } catch (TskDataException ignored) {
+                    /*
+                     * The only reasonable way for this to happen at
+                     * present is through C/C++ processing of an EWF
+                     * image, which is not an error.
+                     */
                 }
-            } else {
+            }
+            if (!StringUtils.isBlank(imageDetails.sha1)) {
                 try {
-                    long imageId = tskAddImageProcess.commit();
-                    if (imageId != 0) {
-                        Image newImage = currentCase.getSleuthkitCase().getImageById(imageId);
-                        String verificationError = newImage.verifyImageSize();
-                        if (!verificationError.isEmpty()) {
-                            errorMessages.add(verificationError);
-                        }
-                        if (imageWriterSettings != null) {
-                            ImageWriterService.createImageWriter(imageId, imageWriterSettings);
-                        }
-                        newDataSources.add(newImage);
-                        if (!StringUtils.isBlank(md5)) {
-                            try {
-                                newImage.setMD5(md5);
-                            } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, String.format("Failed to add MD5 hash for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
-                                errorMessages.add(ex.getMessage());
-                                criticalErrorOccurred = true;
-                            } catch (TskDataException ignored) {
-                                /*
-                                 * The only reasonable way for this to happen at
-                                 * present is through C/C++ processing of an EWF
-                                 * image, which is not an error.
-                                 */
-                            }
-                        }
-                        if (!StringUtils.isBlank(sha1)) {
-                            try {
-                                newImage.setSha1(sha1);
-                            } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, String.format("Failed to add SHA1 hash for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
-                                errorMessages.add(ex.getMessage());
-                                criticalErrorOccurred = true;
-                            } catch (TskDataException ignored) {
-                                /*
-                                 * The only reasonable way for this to happen at
-                                 * present is through C/C++ processing of an EWF
-                                 * image, which is not an error.
-                                 */
-                            }
-                        }
-                        if (!StringUtils.isBlank(sha256)) {
-                            try {
-                                newImage.setSha256(sha256);
-                            } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, String.format("Failed to add SHA256 for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
-                                errorMessages.add(ex.getMessage());
-                                criticalErrorOccurred = true;
-                            } catch (TskDataException ignored) {
-                                /*
-                                 * The only reasonable way for this to happen at
-                                 * present is through C/C++ processing of an EWF
-                                 * image, which is not an error.
-                                 */
-                            }
-                        }
-                    } else {
-                        String errorMessage = String.format("Error commiting after adding image %s to the case database, no object id returned", imagePath); //NON-NLS
-                        logger.log(Level.SEVERE, errorMessage);
-                        errorMessages.add(errorMessage);
-                        criticalErrorOccurred = true;
-                    }
+                    newImage.setSha1(imageDetails.sha1);
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, String.format("Error committing adding image %s to the case database", imagePath), ex); //NON-NLS
+                    logger.log(Level.SEVERE, String.format("Failed to add SHA1 hash for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
                     errorMessages.add(ex.getMessage());
                     criticalErrorOccurred = true;
+                } catch (TskDataException ignored) {
+                    /*
+                     * The only reasonable way for this to happen at
+                     * present is through C/C++ processing of an EWF
+                     * image, which is not an error.
+                     */
+                }
+            }
+            if (!StringUtils.isBlank(imageDetails.sha256)) {
+                try {
+                    newImage.setSha256(imageDetails.sha256);
+                } catch (TskCoreException ex) {
+                    logger.log(Level.SEVERE, String.format("Failed to add SHA256 for image data source %s (objId=%d)", newImage.getName(), newImage.getId()), ex);
+                    errorMessages.add(ex.getMessage());
+                    criticalErrorOccurred = true;
+                } catch (TskDataException ignored) {
+                    /*
+                     * The only reasonable way for this to happen at
+                     * present is through C/C++ processing of an EWF
+                     * image, which is not an error.
+                     */
                 }
             }
         }
@@ -352,4 +305,37 @@ class AddImageTask implements Runnable {
         }
     }
 
+    /**
+     * Utility class to hold image data.
+     */
+    static class ImageDetails {
+        String deviceId;
+        Image image;
+        int sectorSize;
+        String timeZone;
+        boolean ignoreFatOrphanFiles;
+        String md5;
+        String sha1; 
+        String sha256; 
+        ImageWriterSettings imageWriterSettings;
+        
+        ImageDetails(String deviceId, Image image, int sectorSize, String timeZone, boolean ignoreFatOrphanFiles, String md5, String sha1, String sha256, ImageWriterSettings imageWriterSettings) {
+            this.deviceId = deviceId;
+            this.image = image;
+            this.sectorSize = sectorSize;
+            this.timeZone = timeZone;
+            this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
+            this.md5 = md5;
+            this.sha1 = sha1; 
+            this.sha256 = sha256; 
+            this.imageWriterSettings = imageWriterSettings;
+        }
+	
+        String getImagePath() {
+            if (image.getPaths().length > 0) {
+                return image.getPaths()[0];
+            }
+            return "Unknown data source path";
+        }
+    }
 }

Core/src/org/sleuthkit/autopsy/casemodule/AddImageTaskCallback.java

@@ -0,0 +1,38 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.util.List;
+import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult;
+import org.sleuthkit.datamodel.Content;
+
+/**
+ * Called on completion of the add image task.
+ */
+interface AddImageTaskCallback {
+
+    /**
+     * Called when the add image task is completed.
+     * 
+     * @param result   The result from the data source processor.
+     * @param errList  The list of errors.
+     * @param newDataSources  The list of new data sources.
+     */
+    void onCompleted(DataSourceProcessorResult result, List<String> errList, List<Content> newDataSources);
+}

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java

@@ -302,7 +302,9 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
     private void startIngest() {
         if (!newContents.isEmpty() && readyToIngest && !ingested) {
             ingested = true;
-            IngestManager.getInstance().queueIngestJob(newContents, ingestJobSettings);
+            if (dsProcessor != null && ! dsProcessor.supportsIngestStream()) {
+                IngestManager.getInstance().queueIngestJob(newContents, ingestJobSettings);
+            }
             setStateFinished();
         }
     }
@@ -360,8 +362,12 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
 
             setStateStarted();
 
-            // Kick off the DSProcessor 
-            dsProcessor.run(getDSPProgressMonitorImpl(), cbObj);
+            // Kick off the DSProcessor
+            if (dsProcessor.supportsIngestStream()) {
+                dsProcessor.runWithIngestStream(ingestJobSettings, getDSPProgressMonitorImpl(), cbObj);
+            } else {
+                dsProcessor.run(getDSPProgressMonitorImpl(), cbObj);
+            }
         }
     }
 

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java

@@ -41,6 +41,7 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
     private final AddImageAction action;
     private int progressPanelIndex;
     private int dsPanelIndex;
+    private int ingestPanelIndex;
     private final static String PROP_LASTPROFILE_NAME = "AIW_LASTPROFILE_NAME"; //NON-NLS
 
     AddImageWizardIterator(AddImageAction action) {
@@ -69,6 +70,7 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
             panels.add(progressPanel);
             progressPanelIndex = panels.indexOf(progressPanel);  //Doing programatically because number of panels is variable
             dsPanelIndex = panels.indexOf(dsPanel);
+            ingestPanelIndex = panels.indexOf(ingestConfigPanel);
             String[] steps = new String[panels.size()];
             for (int i = 0; i < panels.size(); i++) {
                 Component c = panels.get(i).getComponent();
@@ -177,7 +179,7 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
         // Start processing the data source by handing it off to the selected DSP, 
         // so it gets going in the background while the user is still picking the Ingest modules    
         // This will occur when the next button is clicked on the panel where you have chosen your data to process
-        if (index == dsPanelIndex) {
+        if (index == ingestPanelIndex) {
             ((AddImageWizardAddingProgressPanel) panels.get(progressPanelIndex)).
                     startDataSourceProcessing(((AddImageWizardDataSourceSettingsPanel) panels.get(dsPanelIndex)).getComponent().getCurrentDSProcessor());
         }

Core/src/org/sleuthkit/autopsy/casemodule/Case.java

@@ -107,7 +107,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.events.AutopsyEvent;
 import org.sleuthkit.autopsy.events.AutopsyEventException;
 import org.sleuthkit.autopsy.events.AutopsyEventPublisher;
-import org.sleuthkit.autopsy.filequery.OpenFileDiscoveryAction;
+import org.sleuthkit.autopsy.discovery.OpenDiscoveryAction;
 import org.sleuthkit.autopsy.ingest.IngestJob;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestServices;
@@ -1124,7 +1124,7 @@ public class Case {
                 CallableSystemAction.get(OpenCommVisualizationToolAction.class).setEnabled(true);
                 CallableSystemAction.get(CommonAttributeSearchAction.class).setEnabled(true);
                 CallableSystemAction.get(OpenOutputFolderAction.class).setEnabled(false);
-                CallableSystemAction.get(OpenFileDiscoveryAction.class).setEnabled(true);
+                CallableSystemAction.get(OpenDiscoveryAction.class).setEnabled(true);
 
                 /*
                  * Add the case to the recent cases tracker that supplies a list
@@ -1179,7 +1179,7 @@ public class Case {
                 CallableSystemAction.get(OpenCommVisualizationToolAction.class).setEnabled(false);
                 CallableSystemAction.get(OpenOutputFolderAction.class).setEnabled(false);
                 CallableSystemAction.get(CommonAttributeSearchAction.class).setEnabled(false);
-                CallableSystemAction.get(OpenFileDiscoveryAction.class).setEnabled(false);
+                CallableSystemAction.get(OpenDiscoveryAction.class).setEnabled(false);
 
                 /*
                  * Clear the notifications in the notfier component in the lower

Core/src/org/sleuthkit/autopsy/casemodule/DefaultIngestStream.java

@@ -0,0 +1,59 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.util.List;
+import org.sleuthkit.autopsy.ingest.IngestStream;
+import org.sleuthkit.autopsy.ingest.IngestStreamClosedException;
+
+/**
+ * This is a default ingest stream to use with the data source processors when
+ * an IngestStream is not supplied. Adding files/data sources are no-ops.
+ */
+class DefaultIngestStream implements IngestStream {
+
+    private boolean isClosed = false;
+    private boolean isStopped = false;
+
+    @Override
+    public void addFiles(List<Long> fileObjectIds) throws IngestStreamClosedException {
+        // Do nothing
+    }
+
+    @Override
+    public synchronized boolean isClosed() {
+        return isClosed;
+    }
+
+    @Override
+    public synchronized void close() {
+        isClosed = true;
+    }
+
+    @Override
+    public synchronized void stop() {
+        isClosed = true;
+        isStopped = true;
+    }
+
+    @Override
+    public synchronized boolean wasStopped() {
+        return isStopped;
+    }
+}

Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java

@@ -24,6 +24,7 @@ import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.UUID;
 import javax.swing.filechooser.FileFilter;
 import org.openide.util.NbBundle;
@@ -33,7 +34,14 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgress
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 import org.sleuthkit.autopsy.coreutils.DataSourceUtils;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor;
+import org.sleuthkit.autopsy.ingest.IngestJobSettings;
+import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.ingest.IngestStream;
+import org.sleuthkit.datamodel.Image;
+import org.sleuthkit.datamodel.SleuthkitJNI;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * A image file data source processor that implements the DataSourceProcessor
@@ -49,6 +57,7 @@ import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor;
 public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSourceProcessor {
 
     private final static String DATA_SOURCE_TYPE = NbBundle.getMessage(ImageDSProcessor.class, "ImageDSProcessor.dsType.text");
+    private final Logger logger = Logger.getLogger(ImageDSProcessor.class.getName());
     private static final List<String> allExt = new ArrayList<>();
     private static final GeneralFilter rawFilter = new GeneralFilter(GeneralFilter.RAW_IMAGE_EXTS, GeneralFilter.RAW_IMAGE_DESC);
     private static final GeneralFilter encaseFilter = new GeneralFilter(GeneralFilter.ENCASE_IMAGE_EXTS, GeneralFilter.ENCASE_IMAGE_DESC);
@@ -58,6 +67,8 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
     private static final List<FileFilter> filtersList = new ArrayList<>();
     private final ImageFilePanel configPanel;
     private AddImageTask addImageTask;
+    private IngestStream ingestStream = null;
+    private Image image = null;
     /*
      * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields
      * when the deprecated method setDataSourceOptions is removed.
@@ -170,6 +181,77 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
      */
     @Override
     public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        ingestStream = new DefaultIngestStream();
+        readConfigSettings();
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{imagePath}, sectorSize, timeZone, md5, sha1, sha256, deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding data source with path " + imagePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+                errors.add(ex.getMessage());
+            callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }
+        
+        doAddImageProcess(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, progressMonitor, callback);
+    }
+    
+    /**
+     * Adds a data source to the case database using a background task in a
+     * separate thread and the settings provided by the selection and
+     * configuration panel. Files found during ingest will be sent directly to the
+     * IngestStream provided. Returns as soon as the background task is started.
+     * The background task uses a callback object to signal task completion and
+     * return results.
+     *
+     * This method should not be called unless isPanelValid returns true, and 
+     * should only be called for DSPs that support ingest streams.
+     * 
+     * @param settings        The ingest job settings.
+     * @param progress        Progress monitor that will be used by the
+     *                        background task to report progress.
+     * @param callBack        Callback that will be used by the background task
+     *                        to return results.
+     */
+    @Override
+    public void runWithIngestStream(IngestJobSettings settings, DataSourceProcessorProgressMonitor progress, 
+            DataSourceProcessorCallback callBack) {
+	
+        // Read the settings from the wizard 
+        readConfigSettings();
+	
+        // Set up the data source before creating the ingest stream
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{imagePath}, sectorSize, timeZone, md5, sha1, sha256, deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding data source with path " + imagePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+            errors.add(ex.getMessage());
+            callBack.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }
+
+        // Now initialize the ingest stream
+        try {
+            ingestStream = IngestManager.getInstance().openIngestStream(image, settings);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error starting ingest modules", ex);
+            final List<String> errors = new ArrayList<>();
+            errors.add(ex.getMessage());
+            callBack.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }
+        
+
+        doAddImageProcess(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, progress, callBack);
+    }
+    
+    /**
+     * Store the options from the config panel.
+     */
+    private void readConfigSettings() {
         if (!setDataSourceOptionsCalled) {
             configPanel.storeSettings();
             deviceId = UUID.randomUUID().toString();
@@ -190,8 +272,17 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
                 sha256 = null;
             }
         }
-        run(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, progressMonitor, callback);
     }
+    
+    /**
+     * Check if this DSP supports ingest streams.
+     * 
+     * @return True if this DSP supports an ingest stream, false otherwise.
+     */
+    @Override
+    public boolean supportsIngestStream() {
+        return true;
+    }    
 
     /**
      * Adds a data source to the case database using a background task in a
@@ -215,7 +306,19 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
      * @param callback             Callback to call when processing is done.
      */
     public void run(String deviceId, String imagePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
-        run(deviceId, imagePath, 0, timeZone, ignoreFatOrphanFiles, null, null, null, progressMonitor, callback);
+        ingestStream = new DefaultIngestStream();
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{imagePath}, sectorSize, timeZone, "", "", "", deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding data source with path " + imagePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+                errors.add(ex.getMessage());
+            callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }
+
+        doAddImageProcess(deviceId, imagePath, 0, timeZone, ignoreFatOrphanFiles, null, null, null, progressMonitor, callback);
     }
 
     /**
@@ -224,6 +327,10 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
      * selection and configuration panel. Returns as soon as the background task
      * is started and uses the callback object to signal task completion and
      * return results.
+     * 
+     * The image should be loaded in the database and stored in "image"
+     * before calling this method. Additionally, an ingest stream should be initialized
+     * and stored in "ingestStream". 
      *
      * @param deviceId             An ASCII-printable identifier for the device
      *                             associated with the data source that is
@@ -243,8 +350,31 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
      *                             during processing.
      * @param callback             Callback to call when processing is done.
      */
-    private void run(String deviceId, String imagePath, int sectorSize, String timeZone, boolean ignoreFatOrphanFiles, String md5, String sha1, String sha256, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
-        addImageTask = new AddImageTask(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, null, progressMonitor, callback);
+    private void doAddImageProcess(String deviceId, String imagePath, int sectorSize, String timeZone, boolean ignoreFatOrphanFiles, String md5, String sha1, String sha256, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+
+	// If the data source or ingest stream haven't been initialized, stop processing
+    if (ingestStream == null) {
+        String message = "Ingest stream was not initialized before running the add image process on " + imagePath;
+        logger.log(Level.SEVERE, message);
+        final List<String> errors = new ArrayList<>();
+        errors.add(message);
+        callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+        return;
+    }
+    if (image == null) {
+        String message = "Image was not added to database before running the add image process on " + imagePath;
+        logger.log(Level.SEVERE, message);
+        final List<String> errors = new ArrayList<>();
+        errors.add(message);
+        callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+        return;
+	}
+
+	AddImageTask.ImageDetails imageDetails = new AddImageTask.ImageDetails(deviceId, image, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, null);
+	addImageTask = new AddImageTask(imageDetails, 
+                progressMonitor, 
+                new StreamingAddDataSourceCallbacks(ingestStream), 
+                new StreamingAddImageTaskCallback(ingestStream, callback));
         new Thread(addImageTask).start();
     }
 
@@ -260,6 +390,9 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
         if (null != addImageTask) {
             addImageTask.cancelTask();
         }
+        if (ingestStream != null) {
+            ingestStream.stop();
+        }
     }
 
     /**
@@ -316,7 +449,20 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
         this.timeZone = Calendar.getInstance().getTimeZone().getID();
         this.ignoreFatOrphanFiles = false;
         setDataSourceOptionsCalled = true;
-        run(deviceId, dataSourcePath.toString(), sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, progressMonitor, callBack);
+        
+        ingestStream = new DefaultIngestStream();
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{imagePath}, sectorSize, timeZone, "", "", "", deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding data source with path " + imagePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+                errors.add(ex.getMessage());
+            callBack.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }
+        
+        doAddImageProcess(deviceId, dataSourcePath.toString(), sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, progressMonitor, callBack);
     }
 
     /**

Core/src/org/sleuthkit/autopsy/casemodule/IngestJobInfoPanel.java

@@ -31,7 +31,9 @@ import javax.swing.JOptionPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.table.AbstractTableModel;
 import org.openide.util.NbBundle.Messages;
+import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.events.AutopsyEvent;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.datamodel.IngestJobInfo;
 import org.sleuthkit.datamodel.IngestModuleInfo;
@@ -47,6 +49,8 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
 
     private static final Logger logger = Logger.getLogger(IngestJobInfoPanel.class.getName());
     private static final Set<IngestManager.IngestJobEvent> INGEST_JOB_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestJobEvent.STARTED, IngestManager.IngestJobEvent.CANCELLED, IngestManager.IngestJobEvent.COMPLETED);
+    private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(Case.Events.CURRENT_CASE);
+
     private List<IngestJobInfo> ingestJobs;
     private final List<IngestJobInfo> ingestJobsForSelectedDataSource = new ArrayList<>();
     private IngestJobTableModel ingestJobTableModel = new IngestJobTableModel();
@@ -79,6 +83,16 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
                 refresh();
             }
         });
+        
+        Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, (PropertyChangeEvent evt) -> {
+            if (!(evt instanceof AutopsyEvent) || (((AutopsyEvent) evt).getSourceType() != AutopsyEvent.SourceType.LOCAL)) {
+                return;
+            }
+                    
+            if (CURRENT_CASE == Case.Events.valueOf(evt.getPropertyName())) {
+                refresh();
+            }
+        });
     }
 
     /**
@@ -110,9 +124,15 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
      */
     private void refresh() {
         try {
-            SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
-            this.ingestJobs = skCase.getIngestJobs();
-            setDataSource(selectedDataSource);
+            if (Case.isCaseOpen()) {
+                SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
+                this.ingestJobs = skCase.getIngestJobs();
+                setDataSource(selectedDataSource);
+            } else {
+                this.ingestJobs = new ArrayList<>();
+                setDataSource(null);
+            }
+            
         } catch (TskCoreException | NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Failed to load ingest jobs.", ex);
             JOptionPane.showMessageDialog(this, Bundle.IngestJobInfoPanel_loadIngestJob_error_text(), Bundle.IngestJobInfoPanel_loadIngestJob_error_title(), JOptionPane.ERROR_MESSAGE);

Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java

@@ -18,15 +18,22 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 import java.util.UUID;
+import java.util.logging.Level;
 import javax.swing.JPanel;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.imagewriter.ImageWriterSettings;
+import org.sleuthkit.datamodel.Image;
+import org.sleuthkit.datamodel.SleuthkitJNI;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * A local drive data source processor that implements the DataSourceProcessor
@@ -37,6 +44,7 @@ import org.sleuthkit.autopsy.imagewriter.ImageWriterSettings;
 @ServiceProvider(service = DataSourceProcessor.class)
 public class LocalDiskDSProcessor implements DataSourceProcessor {
 
+    private final Logger logger = Logger.getLogger(LocalDiskDSProcessor.class.getName());
     private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalDiskDSProcessor.class, "LocalDiskDSProcessor.dsType.text");
     private final LocalDiskPanel configPanel;
     private AddImageTask addDiskTask;
@@ -139,7 +147,25 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
                 imageWriterSettings = null;
             }
         }
-        addDiskTask = new AddImageTask(deviceId, drivePath, sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, imageWriterSettings, progressMonitor, callback);
+
+        Image image;
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{drivePath}, sectorSize,
+                timeZone, null, null, null, deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding local disk with path " + drivePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+            errors.add(ex.getMessage());
+            callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        }   
+
+        addDiskTask = new AddImageTask(
+                new AddImageTask.ImageDetails(deviceId, image, sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, imageWriterSettings), 
+                progressMonitor,
+                new StreamingAddDataSourceCallbacks(new DefaultIngestStream()), 
+                new StreamingAddImageTaskCallback(new DefaultIngestStream(), callback));
         new Thread(addDiskTask).start();
     }
 
@@ -191,7 +217,23 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
      * @param callback             Callback to call when processing is done.
      */
     private void run(String deviceId, String drivePath, int sectorSize, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
-        addDiskTask = new AddImageTask(deviceId, drivePath, sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, imageWriterSettings, progressMonitor, callback);
+        Image image;
+        try {
+            image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(),
+                new String[]{drivePath}, sectorSize,
+                timeZone, null, null, null, deviceId);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Error adding local disk with path " + drivePath + " to database", ex);
+            final List<String> errors = new ArrayList<>();
+            errors.add(ex.getMessage());
+            callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>());
+            return;
+        } 
+        
+	    addDiskTask = new AddImageTask(new AddImageTask.ImageDetails(deviceId, image, sectorSize, timeZone, ignoreFatOrphanFiles, null, null, null, imageWriterSettings), 
+                progressMonitor, 
+                new StreamingAddDataSourceCallbacks(new DefaultIngestStream()), 
+                new StreamingAddImageTaskCallback(new DefaultIngestStream(), callback));
         new Thread(addDiskTask).start();
     }
 

Core/src/org/sleuthkit/autopsy/casemodule/StreamingAddDataSourceCallbacks.java

@@ -0,0 +1,66 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.util.List;
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.ingest.IngestStream;
+import org.sleuthkit.autopsy.ingest.IngestStreamClosedException;
+import org.sleuthkit.datamodel.AddDataSourceCallbacks;
+
+/**
+ * A set of callbacks to be called during the process of adding a data source to
+ * the case database. This implementation of the interface is suitable for
+ * streaming ingest use cases.
+ */
+class StreamingAddDataSourceCallbacks implements AddDataSourceCallbacks {
+
+    private final Logger logger = Logger.getLogger(StreamingAddDataSourceCallbacks.class.getName());
+    private final IngestStream ingestStream;
+
+    /**
+     * Constructs a set of callbacks to be called during the process of adding a
+     * data source to the case database. This implementation of the interface is
+     * suitable for streaming ingest use cases.
+     *
+     * @param stream The IngestStream to send data to
+     */
+    StreamingAddDataSourceCallbacks(IngestStream stream) {
+        ingestStream = stream;
+    }
+
+    @Override
+    public void onFilesAdded(List<Long> fileObjectIds) {
+        if (ingestStream.wasStopped()) {
+            return;
+        }
+
+        try {
+            ingestStream.addFiles(fileObjectIds);
+        } catch (IngestStreamClosedException ex) {
+            if (!ingestStream.wasStopped()) {
+                // If the ingest stream is closed but not stopped log the error.
+                // This state should only happen once the data source is completely
+                // added which means it's a severe error that files are still being added.
+                logger.log(Level.SEVERE, "Error adding files to ingest stream - ingest stream is closed");
+            }
+        }
+    }
+}

Core/src/org/sleuthkit/autopsy/casemodule/StreamingAddImageTaskCallback.java

@@ -0,0 +1,65 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.util.List;
+import org.sleuthkit.autopsy.ingest.IngestStream;
+import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
+import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult;
+import org.sleuthkit.datamodel.Content;
+
+/**
+ * A callback to be called on completion of an add image task. This
+ * implementation of the interface is suitable for streaming ingest use cases.
+ * It closes the ingest stream and then calls the data source processor done
+ * callback.
+ */
+class StreamingAddImageTaskCallback implements AddImageTaskCallback {
+
+    private final IngestStream ingestStream;
+    private final DataSourceProcessorCallback dspCallback;
+
+    /**
+     * Constructs a callback to be called on completion of an add image task.
+     * This implementation of the interface is suitable for streaming ingest use
+     * cases. It closes the ingest stream and then calls the data source
+     * processor done callback.
+     *
+     * @param ingestStream The ingest stream that data is being sent to.
+     * @param dspCallback  The callback for non-ingest stream related
+     *                     processing.
+     */
+    StreamingAddImageTaskCallback(IngestStream ingestStream, DataSourceProcessorCallback dspCallback) {
+        this.ingestStream = ingestStream;
+        this.dspCallback = dspCallback;
+    }
+
+    /**
+     * Called when the add image task is completed.
+     *
+     * @param result         The result from the data source processor.
+     * @param errList        The list of errors.
+     * @param newDataSources The list of new data sources.
+     */
+    @Override
+    public void onCompleted(DataSourceProcessorResult result, List<String> errList, List<Content> newDataSources) {
+        ingestStream.close();
+        dspCallback.done(result, errList, newDataSources);
+    }
+}

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties-MERGED

@@ -1,4 +1,6 @@
 CTL_DataSourceSummaryAction=Data Source Summary
+DataSourceSummaryCountsPanel.ArtifactCountsTableModel.count.header=Count
+DataSourceSummaryCountsPanel.ArtifactCountsTableModel.type.header=Result Type
 DataSourceSummaryCountsPanel.FilesByCategoryTableModel.all.row=All
 DataSourceSummaryCountsPanel.FilesByCategoryTableModel.allocated.row=Allocated
 DataSourceSummaryCountsPanel.FilesByCategoryTableModel.count.header=Count

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceInfoUtilities.java

@@ -18,7 +18,8 @@
  */
 package org.sleuthkit.autopsy.casemodule.datasourcesummary;
 
-import java.util.ArrayList;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -43,6 +44,297 @@ final class DataSourceInfoUtilities {
 
     private static final Logger logger = Logger.getLogger(DataSourceInfoUtilities.class.getName());
 
+    /**
+     * Gets a count of files for a particular datasource where it is not a
+     * virtual directory and has a name.
+     *
+     * @param currentDataSource The datasource.
+     * @param additionalWhere   Additional sql where clauses.
+     * @param onError           The message to log on error.
+     *
+     * @return The count of files or null on error.
+     */
+    private static Long getCountOfFiles(DataSource currentDataSource, String additionalWhere, String onError) {
+        if (currentDataSource != null) {
+            try {
+                SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
+                return skCase.countFilesWhere(
+                        "dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
+                        + " AND name<>''"
+                        + " AND data_source_obj_id=" + currentDataSource.getId()
+                        + " AND " + additionalWhere);
+            } catch (TskCoreException | NoCurrentCaseException ex) {
+                logger.log(Level.WARNING, onError, ex);
+                //unable to get count of files for the specified types cell will be displayed as empty
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get count of files in a data source.
+     *
+     * @param currentDataSource The data source.
+     *
+     * @return The count.
+     */
+    static Long getCountOfFiles(DataSource currentDataSource) {
+        return getCountOfFiles(currentDataSource,
+                "type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType(),
+                "Unable to get count of files, providing empty results");
+    }
+
+    /**
+     * Get count of unallocated files in a data source.
+     *
+     * @param currentDataSource The data source.
+     *
+     * @return The count.
+     */
+    static Long getCountOfUnallocatedFiles(DataSource currentDataSource) {
+        return getCountOfFiles(currentDataSource,
+                "type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
+                + " AND dir_flags=" + TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue(),
+                "Unable to get counts of unallocated files for datasource, providing empty results");
+    }
+
+    /**
+     * Get count of directories in a data source.
+     *
+     * @param currentDataSource The data source.
+     *
+     * @return The count.
+     */
+    static Long getCountOfDirectories(DataSource currentDataSource) {
+        return getCountOfFiles(currentDataSource,
+                "type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
+                + " AND meta_type=" + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue(),
+                "Unable to get count of directories for datasource, providing empty results");
+    }
+
+    /**
+     * Get count of slack files in a data source.
+     *
+     * @param currentDataSource The data source.
+     *
+     * @return The count.
+     */
+    static Long getCountOfSlackFiles(DataSource currentDataSource) {
+        return getCountOfFiles(currentDataSource,
+                "type=" + TskData.TSK_DB_FILES_TYPE_ENUM.SLACK.getFileType(),
+                "Unable to get count of slack files for datasources, providing empty results");
+    }
+
+    /**
+     * An interface for handling a result set and returning a value.
+     */
+    private interface ResultSetHandler<T> {
+
+        T process(ResultSet resultset) throws SQLException;
+    }
+
+    /**
+     * Retrieves a result based on the provided query.
+     *
+     * @param query        The query.
+     * @param processor    The result set handler.
+     * @param errorMessage The error message to display if there is an error
+     *                     retrieving the resultset.
+     *
+     * @return The ResultSetHandler value or null if no ResultSet could be
+     *         obtained.
+     */
+    private static <T> T getBaseQueryResult(String query, ResultSetHandler<T> processor, String errorMessage) {
+        try (SleuthkitCase.CaseDbQuery dbQuery = Case.getCurrentCaseThrows().getSleuthkitCase().executeQuery(query)) {
+            ResultSet resultSet = dbQuery.getResultSet();
+            try {
+                return processor.process(resultSet);
+            } catch (SQLException ex) {
+                logger.log(Level.WARNING, errorMessage, ex);
+            }
+        } catch (TskCoreException | NoCurrentCaseException ex) {
+            logger.log(Level.WARNING, errorMessage, ex);
+        }
+        return null;
+    }
+
+    /**
+     * Gets the size of unallocated files in a particular datasource.
+     *
+     * @param currentDataSource The data source.
+     *
+     * @return The size or null if the query could not be executed.
+     */
+    static Long getSizeOfUnallocatedFiles(DataSource currentDataSource) {
+        if (currentDataSource == null) {
+            return null;
+        }
+
+        final String valueParam = "value";
+        final String countParam = "count";
+        String query = "SELECT SUM(size) AS " + valueParam + ", COUNT(*) AS " + countParam
+                + " FROM tsk_files WHERE type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
+                + " AND dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
+                + " AND dir_flags=" + TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue()
+                + " AND name<>''"
+                + " AND data_source_obj_id=" + currentDataSource.getId();
+
+        ResultSetHandler<Long> handler = (resultSet) -> {
+            if (resultSet.next()) {
+                // ensure that there is an unallocated count result that is attached to this data source
+                long resultCount = resultSet.getLong(valueParam);
+                return (resultCount > 0) ? resultSet.getLong(valueParam) : null;
+            } else {
+                return null;
+            }
+        };
+        String errorMessage = "Unable to get size of unallocated files; returning null.";
+
+        return getBaseQueryResult(query, handler, errorMessage);
+    }
+
+    /**
+     * Retrieves counts for each artifact type in a data source.
+     *
+     * @param selectedDataSource The data source.
+     *
+     * @return A mapping of artifact type name to the counts or null if there
+     *         was an error executing the query.
+     */
+    static Map<String, Long> getCountsOfArtifactsByType(DataSource selectedDataSource) {
+        if (selectedDataSource == null) {
+            return Collections.emptyMap();
+        }
+
+        final String nameParam = "name";
+        final String valueParam = "value";
+        String query
+                = "SELECT bbt.display_name AS " + nameParam + ", COUNT(*) AS " + valueParam
+                + " FROM blackboard_artifacts bba "
+                + " INNER JOIN blackboard_artifact_types bbt ON bba.artifact_type_id = bbt.artifact_type_id"
+                + " WHERE bba.data_source_obj_id =" + selectedDataSource.getId()
+                + " GROUP BY bbt.display_name";
+
+        ResultSetHandler<Map<String, Long>> handler = (resultSet) -> {
+            Map<String, Long> toRet = new HashMap<>();
+            while (resultSet.next()) {
+                try {
+                    toRet.put(resultSet.getString(nameParam), resultSet.getLong(valueParam));
+                } catch (SQLException ex) {
+                    logger.log(Level.WARNING, "Failed to get a result pair from the result set.", ex);
+                }
+            }
+
+            return toRet;
+        };
+
+        String errorMessage = "Unable to get artifact type counts; returning null.";
+
+        return getBaseQueryResult(query, handler, errorMessage);
+    }
+
+    /**
+     * Generates a string which is a concatenation of the value received from
+     * the result set.
+     *
+     * @param query              The query.
+     * @param valueParam         The parameter for the value in the result set.
+     * @param separator          The string separator used in concatenation.
+     * @param errorMessage       The error message if the result set could not
+     *                           be received.
+     * @param singleErrorMessage The error message if a single result could not
+     *                           be obtained.
+     *
+     * @return The concatenated string or null if the query could not be
+     *         executed.
+     */
+    private static String getConcattedStringsResult(String query, String valueParam, String separator, String errorMessage, String singleErrorMessage) {
+        ResultSetHandler<String> handler = (resultSet) -> {
+            String toRet = "";
+            boolean first = true;
+            while (resultSet.next()) {
+                try {
+                    if (first) {
+                        first = false;
+                    } else {
+                        toRet += separator;
+                    }
+                    toRet += resultSet.getString(valueParam);
+                } catch (SQLException ex) {
+                    logger.log(Level.WARNING, singleErrorMessage, ex);
+                }
+            }
+
+            return toRet;
+        };
+
+        return getBaseQueryResult(query, handler, errorMessage);
+    }
+
+    /**
+     * Generates a concatenated string value based on the text value of a
+     * particular attribute in a particular artifact for a specific data source.
+     *
+     * @param dataSourceId    The data source id.
+     * @param artifactTypeId  The artifact type id.
+     * @param attributeTypeId The attribute type id.
+     *
+     * @return The concatenated value or null if the query could not be
+     *         executed.
+     */
+    private static String getConcattedAttrValue(long dataSourceId, int artifactTypeId, int attributeTypeId) {
+        final String valueParam = "concatted_attribute_value";
+        String query = "SELECT attr.value_text AS " + valueParam
+                + " FROM blackboard_artifacts bba "
+                + " INNER JOIN blackboard_attributes attr ON bba.artifact_id = attr.artifact_id "
+                + " WHERE bba.data_source_obj_id = " + dataSourceId
+                + " AND bba.artifact_type_id = " + artifactTypeId
+                + " AND attr.attribute_type_id = " + attributeTypeId;
+
+        String errorMessage = "Unable to execute query to retrieve concatted attribute values.";
+        String singleErrorMessage = "There was an error retrieving one of the results.  That result will be omitted from concatted value.";
+        String separator = ", ";
+        return getConcattedStringsResult(query, valueParam, separator, errorMessage, singleErrorMessage);
+    }
+
+    /**
+     * Retrieves the concatenation of operating system attributes for a
+     * particular data source.
+     *
+     * @param dataSource The data source.
+     *
+     * @return The concatenated value or null if the query could not be
+     *         executed.
+     */
+    static String getOperatingSystems(DataSource dataSource) {
+        if (dataSource == null) {
+            return null;
+        }
+
+        return getConcattedAttrValue(dataSource.getId(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_INFO.getTypeID(),
+                BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID());
+    }
+
+    /**
+     * Retrieves the concatenation of data source usage for a particular data
+     * source.
+     *
+     * @param dataSource The data source.
+     *
+     * @return The concatenated value or null if the query could not be
+     *         executed.
+     */
+    static String getDataSourceType(DataSource dataSource) {
+        if (dataSource == null) {
+            return null;
+        }
+
+        return getConcattedAttrValue(dataSource.getId(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_DATA_SOURCE_USAGE.getTypeID(),
+                BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION.getTypeID());
+    }
+
     /**
      * Get a map containing the TSK_DATA_SOURCE_USAGE description attributes
      * associated with each data source in the current case.
@@ -147,39 +439,6 @@ final class DataSourceInfoUtilities {
         }
     }
 
-    /**
-     * Get a map containing the names of operating systems joined in a comma
-     * seperated list to the Data Source they exist on in the current case. No
-     * item will exist in the map for data sources which do not contain
-     * TS_OS_INFO artifacts which have a program name.
-     *
-     * @return Collection which maps datasource id to a String which is a comma
-     *         seperated list of Operating system names found on the data
-     *         source.
-     */
-    static Map<Long, String> getOperatingSystems() {
-        Map<Long, String> osDetailMap = new HashMap<>();
-        try {
-            SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
-            ArrayList<BlackboardArtifact> osInfoArtifacts = skCase.getBlackboardArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_INFO);
-            for (BlackboardArtifact osInfo : osInfoArtifacts) {
-                BlackboardAttribute programName = osInfo.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME));
-                if (programName != null) {
-                    String currentOsString = osDetailMap.get(osInfo.getDataSource().getId());
-                    if (currentOsString == null || currentOsString.isEmpty()) {
-                        currentOsString = programName.getValueString();
-                    } else {
-                        currentOsString = currentOsString + ", " + programName.getValueString();
-                    }
-                    osDetailMap.put(osInfo.getDataSource().getId(), currentOsString);
-                }
-            }
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, "Failed to load OS info artifacts.", ex);
-        }
-        return osDetailMap;
-    }
-
     /**
      * Get the number of files in the case database for the current data source
      * which have the specified mimetypes.
@@ -212,134 +471,6 @@ final class DataSourceInfoUtilities {
         return null;
     }
 
-    /**
-     * Get a map containing the number of unallocated files in each data source
-     * in the current case.
-     *
-     * @return Collection which maps datasource id to a count for the number of
-     *         unallocated files in the datasource, will only contain entries
-     *         for datasources which have at least 1 unallocated file
-     */
-    static Map<Long, Long> getCountsOfUnallocatedFiles() {
-        try {
-            final String countUnallocatedFilesQuery = "data_source_obj_id, COUNT(*) AS value"
-                    + " FROM tsk_files WHERE type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
-                    + " AND dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
-                    + " AND dir_flags=" + TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue()
-                    + " AND name<>'' GROUP BY data_source_obj_id"; //NON-NLS
-            return getValuesMap(countUnallocatedFilesQuery);
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to get counts of unallocated files for all datasources, providing empty results", ex);
-            return Collections.emptyMap();
-        }
-    }
-
-    /**
-     * Get a map containing the total size of unallocated files in each data
-     * source in the current case.
-     *
-     * @return Collection which maps datasource id to a total size in bytes of
-     *         unallocated files in the datasource, will only contain entries
-     *         for datasources which have at least 1 unallocated file
-     */
-    static Map<Long, Long> getSizeOfUnallocatedFiles() {
-        try {
-            final String countUnallocatedFilesQuery = "data_source_obj_id, sum(size) AS value"
-                    + " FROM tsk_files WHERE type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
-                    + " AND dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
-                    + " AND dir_flags=" + TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue()
-                    + " AND name<>'' GROUP BY data_source_obj_id"; //NON-NLS
-            return getValuesMap(countUnallocatedFilesQuery);
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to get size of unallocated files for all datasources, providing empty results", ex);
-            return Collections.emptyMap();
-        }
-    }
-
-    /**
-     * Get a map containing the number of directories in each data source in the
-     * current case.
-     *
-     * @return Collection which maps datasource id to a count for the number of
-     *         directories in the datasource, will only contain entries for
-     *         datasources which have at least 1 directory
-     */
-    static Map<Long, Long> getCountsOfDirectories() {
-        try {
-            final String countDirectoriesQuery = "data_source_obj_id, COUNT(*) AS value"
-                    + " FROM tsk_files WHERE type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType()
-                    + " AND dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
-                    + " AND meta_type=" + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue()
-                    + " AND name<>'' GROUP BY data_source_obj_id"; //NON-NLS
-            return getValuesMap(countDirectoriesQuery);
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to get counts of directories for all datasources, providing empty results", ex);
-            return Collections.emptyMap();
-        }
-    }
-
-    /**
-     * Get a map containing the number of slack files in each data source in the
-     * current case.
-     *
-     * @return Collection which maps datasource id to a count for the number of
-     *         slack files in the datasource, will only contain entries for
-     *         datasources which have at least 1 slack file
-     */
-    static Map<Long, Long> getCountsOfSlackFiles() {
-        try {
-            final String countSlackFilesQuery = "data_source_obj_id, COUNT(*) AS value"
-                    + " FROM tsk_files WHERE type=" + TskData.TSK_DB_FILES_TYPE_ENUM.SLACK.getFileType()
-                    + " AND dir_type<>" + TskData.TSK_FS_NAME_TYPE_ENUM.VIRT_DIR.getValue()
-                    + " AND name<>'' GROUP BY data_source_obj_id"; //NON-NLS
-            return getValuesMap(countSlackFilesQuery);
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to get counts of slack files for all datasources, providing empty results", ex);
-            return Collections.emptyMap();
-        }
-    }
-
-    /**
-     * Get a map containing maps which map artifact type to the number of times
-     * it exosts in each data source in the current case.
-     *
-     * @return Collection which maps datasource id to maps of artifact display
-     *         name to number of occurences in the datasource, will only contain
-     *         entries for artifacts which have at least one occurence in the
-     *         data source.
-     */
-    static Map<Long, Map<String, Long>> getCountsOfArtifactsByType() {
-        try {
-            final String countArtifactsQuery = "blackboard_artifacts.data_source_obj_id, blackboard_artifact_types.display_name AS label, COUNT(*) AS value"
-                    + " FROM blackboard_artifacts, blackboard_artifact_types"
-                    + " WHERE blackboard_artifacts.artifact_type_id = blackboard_artifact_types.artifact_type_id"
-                    + " GROUP BY blackboard_artifacts.data_source_obj_id, blackboard_artifact_types.display_name";
-            return getLabeledValuesMap(countArtifactsQuery);
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to get counts of all artifact types for all datasources, providing empty results", ex);
-            return Collections.emptyMap();
-        }
-    }
-
-    /**
-     * Helper method to execute a select query with a
-     * DataSourceLabeledValueCallback.
-     *
-     * @param query the portion of the query which should follow the SELECT
-     *
-     * @return a map of datasource object IDs to maps of String labels to the
-     *         values associated with them.
-     *
-     * @throws TskCoreException
-     * @throws NoCurrentCaseException
-     */
-    private static Map<Long, Map<String, Long>> getLabeledValuesMap(String query) throws TskCoreException, NoCurrentCaseException {
-        SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
-        DataSourceLabeledValueCallback callback = new DataSourceLabeledValueCallback();
-        skCase.getCaseDbAccessManager().select(query, callback);
-        return callback.getMapOfLabeledValues();
-    }
-
     /**
      * Helper method to execute a select query with a
      * DataSourceSingleValueCallback.

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.form

@@ -70,18 +70,13 @@
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
         <Component class="javax.swing.JTable" name="fileCountsByMimeTypeTable">
-          <Properties>
-            <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="filesByMimeTypeTableModel" type="code"/>
-            </Property>
-          </Properties>
         </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JLabel" name="byMimeTypeLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties" key="DataSourceSummaryCountsPanel.byMimeTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties" key="DataSourceSummaryCountsPanel.byMimeTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -93,25 +88,20 @@
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
         <Component class="javax.swing.JTable" name="fileCountsByCategoryTable">
-          <Properties>
-            <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="filesByCategoryTableModel" type="code"/>
-            </Property>
-          </Properties>
         </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JLabel" name="byCategoryLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties" key="DataSourceSummaryCountsPanel.byCategoryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties" key="DataSourceSummaryCountsPanel.byCategoryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties" key="DataSourceSummaryCountsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties" key="DataSourceSummaryCountsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -123,15 +113,6 @@
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
         <Component class="javax.swing.JTable" name="artifactCountsTable">
-          <Properties>
-            <Property name="autoCreateRowSorter" type="boolean" value="true"/>
-            <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-              <Table columnCount="2" rowCount="0">
-                <Column editable="false" title="Result Type" type="java.lang.Object"/>
-                <Column editable="false" title="Count" type="java.lang.Object"/>
-              </Table>
-            </Property>
-          </Properties>
         </Component>
       </SubComponents>
     </Container>

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.java

@@ -18,15 +18,12 @@
  */
 package org.sleuthkit.autopsy.casemodule.datasourcesummary;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JLabel;
-import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.DefaultTableModel;
 import org.openide.util.NbBundle.Messages;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.FileTypeUtils;
 import org.sleuthkit.datamodel.DataSource;
 
@@ -34,69 +31,224 @@ import org.sleuthkit.datamodel.DataSource;
  * Panel for displaying summary information on the known files present in the
  * specified DataSource
  */
+@Messages({"DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.type.header=File Type",
+    "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.count.header=Count",
+    "DataSourceSummaryCountsPanel.ArtifactCountsTableModel.type.header=Result Type",
+    "DataSourceSummaryCountsPanel.ArtifactCountsTableModel.count.header=Count",
+    "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.type.header=File Type",
+    "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.count.header=Count"
+})
 class DataSourceSummaryCountsPanel extends javax.swing.JPanel {
 
+    // Result returned for a data model if no data found.
+    private static final Object[][] EMPTY_PAIRS = new Object[][]{};
+
+    // column headers for mime type table
+    private static final Object[] MIME_TYPE_COLUMN_HEADERS = new Object[]{
+        Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_type_header(),
+        Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_count_header()
+    };
+
+    // column headers for file by category table
+    private static final Object[] FILE_BY_CATEGORY_COLUMN_HEADERS = new Object[]{
+        Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_type_header(),
+        Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_count_header()
+    };
+
+    // column headers for artifact counts table
+    private static final Object[] ARTIFACT_COUNTS_COLUMN_HEADERS = new Object[]{
+        Bundle.DataSourceSummaryCountsPanel_ArtifactCountsTableModel_type_header(),
+        Bundle.DataSourceSummaryCountsPanel_ArtifactCountsTableModel_count_header()
+    };
+
     private static final long serialVersionUID = 1L;
-    private FilesByMimeTypeTableModel filesByMimeTypeTableModel = new FilesByMimeTypeTableModel(null);
-    private FilesByCategoryTableModel filesByCategoryTableModel = new FilesByCategoryTableModel(null);
     private static final Logger logger = Logger.getLogger(DataSourceSummaryCountsPanel.class.getName());
-    private final Map<Long, Long> allFilesCountsMap;
-    private final Map<Long, Long> slackFilesCountsMap;
-    private final Map<Long, Long> directoriesCountsMap;
-    private final Map<Long, Long> unallocatedFilesCountsMap;
-    private final Map<Long, Map<String, Long>> artifactsByTypeCountsMap;
     private final DefaultTableCellRenderer rightAlignedRenderer = new DefaultTableCellRenderer();
 
+    private DataSource dataSource;
+
     /**
      * Creates new form DataSourceSummaryCountsPanel
      */
-    DataSourceSummaryCountsPanel(Map<Long, Long> fileCountsMap) {
-        this.allFilesCountsMap = fileCountsMap;
-        this.slackFilesCountsMap = DataSourceInfoUtilities.getCountsOfSlackFiles();
-        this.directoriesCountsMap = DataSourceInfoUtilities.getCountsOfDirectories();
-        this.unallocatedFilesCountsMap = DataSourceInfoUtilities.getCountsOfUnallocatedFiles();
-        this.artifactsByTypeCountsMap = DataSourceInfoUtilities.getCountsOfArtifactsByType();
+    DataSourceSummaryCountsPanel() {
         rightAlignedRenderer.setHorizontalAlignment(JLabel.RIGHT);
         initComponents();
         fileCountsByMimeTypeTable.getTableHeader().setReorderingAllowed(false);
         fileCountsByCategoryTable.getTableHeader().setReorderingAllowed(false);
+        artifactCountsTable.getTableHeader().setReorderingAllowed(false);
+        setDataSource(null);
     }
 
     /**
-     * Specify the DataSource to display file information for
+     * The datasource currently used as the model in this panel.
      *
-     * @param selectedDataSource the DataSource to display file information for
+     * @return The datasource currently being used as the model in this panel.
      */
-    void updateCountsTableData(DataSource selectedDataSource) {
-        filesByMimeTypeTableModel = new FilesByMimeTypeTableModel(selectedDataSource);
-        fileCountsByMimeTypeTable.setModel(filesByMimeTypeTableModel);
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    /**
+     * Sets datasource to visualize in the panel.
+     *
+     * @param dataSource The datasource to use in this panel.
+     */
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+        if (dataSource == null || !Case.isCaseOpen()) {
+            updateCountsTableData(EMPTY_PAIRS,
+                    EMPTY_PAIRS,
+                    EMPTY_PAIRS);
+        } else {
+            updateCountsTableData(getMimeTypeModel(dataSource),
+                    getFileCategoryModel(dataSource),
+                    getArtifactCountsModel(dataSource));
+        }
+
+    }
+
+    /**
+     * Specify the DataSource to display file information for.
+     *
+     * @param mimeTypeDataModel     The mime type data model.
+     * @param fileCategoryDataModel The file category data model.
+     * @param artifactDataModel     The artifact type data model.
+     */
+    private void updateCountsTableData(Object[][] mimeTypeDataModel, Object[][] fileCategoryDataModel, Object[][] artifactDataModel) {
+        fileCountsByMimeTypeTable.setModel(new NonEditableTableModel(mimeTypeDataModel, MIME_TYPE_COLUMN_HEADERS));
         fileCountsByMimeTypeTable.getColumnModel().getColumn(1).setCellRenderer(rightAlignedRenderer);
         fileCountsByMimeTypeTable.getColumnModel().getColumn(0).setPreferredWidth(130);
-        filesByCategoryTableModel = new FilesByCategoryTableModel(selectedDataSource);
-        fileCountsByCategoryTable.setModel(filesByCategoryTableModel);
+
+        fileCountsByCategoryTable.setModel(new NonEditableTableModel(fileCategoryDataModel, FILE_BY_CATEGORY_COLUMN_HEADERS));
         fileCountsByCategoryTable.getColumnModel().getColumn(1).setCellRenderer(rightAlignedRenderer);
         fileCountsByCategoryTable.getColumnModel().getColumn(0).setPreferredWidth(130);
-        updateArtifactCounts(selectedDataSource);
+
+        artifactCountsTable.setModel(new NonEditableTableModel(artifactDataModel, ARTIFACT_COUNTS_COLUMN_HEADERS));
+        artifactCountsTable.getColumnModel().getColumn(0).setPreferredWidth(230);
+        artifactCountsTable.getColumnModel().getColumn(1).setCellRenderer(rightAlignedRenderer);
+
         this.repaint();
     }
 
     /**
-     * Helper method to update the artifact specific counts by clearing the
-     * table and adding counts for the artifacts which exist in the selected
-     * data source.
+     * Determines the JTable data model for datasource mime types.
      *
-     * @param selectedDataSource the data source to display artifact counts for
+     * @param dataSource The DataSource.
+     *
+     * @return The model to be used with a JTable.
      */
-    private void updateArtifactCounts(DataSource selectedDataSource) {
-        ((DefaultTableModel) artifactCountsTable.getModel()).setRowCount(0);
-        if (selectedDataSource != null && artifactsByTypeCountsMap.get(selectedDataSource.getId()) != null) {
-            Map<String, Long> artifactCounts = artifactsByTypeCountsMap.get(selectedDataSource.getId());
-            for (String key : artifactCounts.keySet()) {
-                ((DefaultTableModel) artifactCountsTable.getModel()).addRow(new Object[]{key, artifactCounts.get(key)});
-            }
+    @Messages({
+        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.images.row=Images",
+        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.videos.row=Videos",
+        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.audio.row=Audio",
+        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.documents.row=Documents",
+        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.executables.row=Executables"
+    })
+    private static Object[][] getMimeTypeModel(DataSource dataSource) {
+        return new Object[][]{
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_images_row(),
+                getCount(dataSource, FileTypeUtils.FileTypeCategory.IMAGE)},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_videos_row(),
+                getCount(dataSource, FileTypeUtils.FileTypeCategory.VIDEO)},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_audio_row(),
+                getCount(dataSource, FileTypeUtils.FileTypeCategory.AUDIO)},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_documents_row(),
+                getCount(dataSource, FileTypeUtils.FileTypeCategory.DOCUMENTS)},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_executables_row(),
+                getCount(dataSource, FileTypeUtils.FileTypeCategory.EXECUTABLE)}
+        };
+    }
+
+    /**
+     * Retrieves the counts of files of a particular mime type for a particular
+     * DataSource.
+     *
+     * @param dataSource The DataSource.
+     * @param category   The mime type category.
+     *
+     * @return The count.
+     */
+    private static Long getCount(DataSource dataSource, FileTypeUtils.FileTypeCategory category) {
+        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(dataSource, category.getMediaTypes());
+    }
+
+    /**
+     * Determines the JTable data model for datasource file categories.
+     *
+     * @param dataSource The DataSource.
+     *
+     * @return The model to be used with a JTable.
+     */
+    @Messages({
+        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.all.row=All",
+        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.allocated.row=Allocated",
+        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.unallocated.row=Unallocated",
+        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.slack.row=Slack",
+        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.directory.row=Directory"
+    })
+    private static Object[][] getFileCategoryModel(DataSource selectedDataSource) {
+        Long fileCount = zeroIfNull(DataSourceInfoUtilities.getCountOfFiles(selectedDataSource));
+        Long unallocatedFiles = zeroIfNull(DataSourceInfoUtilities.getCountOfUnallocatedFiles(selectedDataSource));
+        Long allocatedFiles = zeroIfNull(getAllocatedCount(fileCount, unallocatedFiles));
+        Long slackFiles = zeroIfNull(DataSourceInfoUtilities.getCountOfSlackFiles(selectedDataSource));
+        Long directories = zeroIfNull(DataSourceInfoUtilities.getCountOfDirectories(selectedDataSource));
+
+        return new Object[][]{
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_all_row(), fileCount},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_allocated_row(), allocatedFiles},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_unallocated_row(), unallocatedFiles},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_slack_row(), slackFiles},
+            new Object[]{Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_directory_row(), directories}
+        };
+    }
+
+    /**
+     * Returns 0 if value is null.
+     *
+     * @param origValue The original value.
+     *
+     * @return The value or 0 if null.
+     */
+    private static Long zeroIfNull(Long origValue) {
+        return origValue == null ? 0 : origValue;
+    }
+
+    /**
+     * Safely gets the allocated files count.
+     *
+     * @param allFilesCount         The count of all files.
+     * @param unallocatedFilesCount The count of unallocated files.
+     *
+     * @return The count of allocated files.
+     */
+    private static long getAllocatedCount(Long allFilesCount, Long unallocatedFilesCount) {
+        if (allFilesCount == null) {
+            return 0;
+        } else if (unallocatedFilesCount == null) {
+            return allFilesCount;
+        } else {
+            return allFilesCount - unallocatedFilesCount;
         }
-        artifactCountsTable.getColumnModel().getColumn(0).setPreferredWidth(230);
-        artifactCountsTable.getColumnModel().getColumn(1).setCellRenderer(rightAlignedRenderer);
+    }
+
+    /**
+     * The counts of different artifact types found in a DataSource.
+     *
+     * @param selectedDataSource The DataSource.
+     *
+     * @return The JTable data model of counts of artifact types.
+     */
+    private static Object[][] getArtifactCountsModel(DataSource selectedDataSource) {
+        Map<String, Long> artifactMapping = DataSourceInfoUtilities.getCountsOfArtifactsByType(selectedDataSource);
+        if (artifactMapping == null) {
+            return EMPTY_PAIRS;
+        }
+
+        return artifactMapping.entrySet().stream()
+                .filter((entrySet) -> entrySet != null && entrySet.getKey() != null)
+                .sorted((a, b) -> a.getKey().compareTo(b.getKey()))
+                .map((entrySet) -> new Object[]{entrySet.getKey(), entrySet.getValue()})
+                .toArray(Object[][]::new);
     }
 
     /**
@@ -118,35 +270,16 @@ class DataSourceSummaryCountsPanel extends javax.swing.JPanel {
         artifactCountsScrollPane = new javax.swing.JScrollPane();
         artifactCountsTable = new javax.swing.JTable();
 
-        fileCountsByMimeTypeTable.setModel(filesByMimeTypeTableModel);
         fileCountsByMimeTypeScrollPane.setViewportView(fileCountsByMimeTypeTable);
 
         org.openide.awt.Mnemonics.setLocalizedText(byMimeTypeLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryCountsPanel.class, "DataSourceSummaryCountsPanel.byMimeTypeLabel.text")); // NOI18N
 
-        fileCountsByCategoryTable.setModel(filesByCategoryTableModel);
         fileCountsByCategoryScrollPane.setViewportView(fileCountsByCategoryTable);
 
         org.openide.awt.Mnemonics.setLocalizedText(byCategoryLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryCountsPanel.class, "DataSourceSummaryCountsPanel.byCategoryLabel.text")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(DataSourceSummaryCountsPanel.class, "DataSourceSummaryCountsPanel.jLabel1.text")); // NOI18N
 
-        artifactCountsTable.setAutoCreateRowSorter(true);
-        artifactCountsTable.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
-
-            },
-            new String [] {
-                "Result Type", "Count"
-            }
-        ) {
-            boolean[] canEdit = new boolean [] {
-                false, false
-            };
-
-            public boolean isCellEditable(int rowIndex, int columnIndex) {
-                return canEdit [columnIndex];
-            }
-        });
         artifactCountsScrollPane.setViewportView(artifactCountsTable);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -206,190 +339,4 @@ class DataSourceSummaryCountsPanel extends javax.swing.JPanel {
     private javax.swing.JTable fileCountsByMimeTypeTable;
     private javax.swing.JLabel jLabel1;
     // End of variables declaration//GEN-END:variables
-
-    /**
-     * Table model for the files table model to display counts of specific file
-     * types by mime type found in the currently selected data source.
-     */
-    @Messages({"DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.type.header=File Type",
-        "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.count.header=Count"})
-    private class FilesByMimeTypeTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 1L;
-        private final DataSource currentDataSource;
-        private final List<String> columnHeaders = new ArrayList<>();
-        private static final int IMAGES_ROW_INDEX = 0;
-        private static final int VIDEOS_ROW_INDEX = 1;
-        private static final int AUDIO_ROW_INDEX = 2;
-        private static final int DOCUMENTS_ROW_INDEX = 3;
-        private static final int EXECUTABLES_ROW_INDEX = 4;
-
-        /**
-         * Create a FilesByMimeTypeTableModel for the speicified datasource.
-         *
-         * @param selectedDataSource the datasource which this
-         *                           FilesByMimeTypeTablemodel will represent
-         */
-        FilesByMimeTypeTableModel(DataSource selectedDataSource) {
-            columnHeaders.add(Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_type_header());
-            columnHeaders.add(Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_count_header());
-            currentDataSource = selectedDataSource;
-        }
-
-        @Override
-        public int getRowCount() {
-            //should be kept equal to the number of types we are displaying in the tables
-            return 5;
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnHeaders.size();
-        }
-
-        @Messages({
-            "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.images.row=Images",
-            "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.videos.row=Videos",
-            "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.audio.row=Audio",
-            "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.documents.row=Documents",
-            "DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.executables.row=Executables"
-        })
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            if (columnIndex == 0) {
-                switch (rowIndex) {
-                    case IMAGES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_images_row();
-                    case VIDEOS_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_videos_row();
-                    case AUDIO_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_audio_row();
-                    case DOCUMENTS_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_documents_row();
-                    case EXECUTABLES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_executables_row();
-                    default:
-                        break;
-                }
-            } else if (columnIndex == 1) {
-                switch (rowIndex) {
-                    case 0:
-                        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(currentDataSource, FileTypeUtils.FileTypeCategory.IMAGE.getMediaTypes());
-                    case 1:
-                        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(currentDataSource, FileTypeUtils.FileTypeCategory.VIDEO.getMediaTypes());
-                    case 2:
-                        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(currentDataSource, FileTypeUtils.FileTypeCategory.AUDIO.getMediaTypes());
-                    case 3:
-                        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(currentDataSource, FileTypeUtils.FileTypeCategory.DOCUMENTS.getMediaTypes());
-                    case 4:
-                        return DataSourceInfoUtilities.getCountOfFilesForMimeTypes(currentDataSource, FileTypeUtils.FileTypeCategory.EXECUTABLE.getMediaTypes());
-                    default:
-                        break;
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public String getColumnName(int column) {
-            return columnHeaders.get(column);
-        }
-    }
-
-    /**
-     * Table model for the files table model to display counts of specific file
-     * types by category found in the currently selected data source.
-     */
-    @Messages({"DataSourceSummaryCountsPanel.FilesByCategoryTableModel.type.header=File Type",
-        "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.count.header=Count"})
-    private class FilesByCategoryTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 1L;
-        private final DataSource currentDataSource;
-        private final List<String> columnHeaders = new ArrayList<>();
-        private static final int ALL_FILES_ROW_INDEX = 0;
-        private static final int ALLOCATED_FILES_ROW_INDEX = 1;
-        private static final int UNALLOCATED_FILES_ROW_INDEX = 2;
-        private static final int SLACK_FILES_ROW_INDEX = 3;
-        private static final int DIRECTORIES_ROW_INDEX = 4;
-        /**
-         * Create a FilesByCategoryTableModel for the speicified datasource.
-         *
-         * @param selectedDataSource the datasource which this
-         *                           FilesByCategoryTablemodel will represent
-         */
-        FilesByCategoryTableModel(DataSource selectedDataSource) {
-            columnHeaders.add(Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_type_header());
-            columnHeaders.add(Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_count_header());
-            currentDataSource = selectedDataSource;
-        }
-
-        @Override
-        public int getRowCount() {
-            //should be kept equal to the number of types we are displaying in the tables
-            return 5;
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnHeaders.size();
-        }
-
-        @Messages({
-            "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.all.row=All",
-            "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.allocated.row=Allocated",
-            "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.unallocated.row=Unallocated",
-            "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.slack.row=Slack",
-            "DataSourceSummaryCountsPanel.FilesByCategoryTableModel.directory.row=Directory"
-        })
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            if (columnIndex == 0) {
-                switch (rowIndex) {
-                    case ALL_FILES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_all_row();
-                    case ALLOCATED_FILES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_allocated_row();
-                    case UNALLOCATED_FILES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_unallocated_row();
-                    case SLACK_FILES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_slack_row();
-                    case DIRECTORIES_ROW_INDEX:
-                        return Bundle.DataSourceSummaryCountsPanel_FilesByCategoryTableModel_directory_row();
-                    default:
-                        break;
-                }
-            } else if (columnIndex == 1 && currentDataSource != null) {
-                switch (rowIndex) {
-                    case 0:
-                        return allFilesCountsMap.get(currentDataSource.getId()) == null ? 0 : allFilesCountsMap.get(currentDataSource.getId());
-                    case 1:
-                        //All files should be either allocated or unallocated as dir_flags only has two values so any file that isn't unallocated is allocated
-                        Long unallocatedFilesCount = unallocatedFilesCountsMap.get(currentDataSource.getId());
-                        Long allFilesCount = allFilesCountsMap.get(currentDataSource.getId());
-                        if (allFilesCount == null) {
-                            return 0;
-                        } else if (unallocatedFilesCount == null) {
-                            return allFilesCount;
-                        } else {
-                            return allFilesCount - unallocatedFilesCount;
-                        }
-                    case 2:
-                        return unallocatedFilesCountsMap.get(currentDataSource.getId()) == null ? 0 : unallocatedFilesCountsMap.get(currentDataSource.getId());
-                    case 3:
-                        return slackFilesCountsMap.get(currentDataSource.getId()) == null ? 0 : slackFilesCountsMap.get(currentDataSource.getId());
-                    case 4:
-                        return directoriesCountsMap.get(currentDataSource.getId()) == null ? 0 : directoriesCountsMap.get(currentDataSource.getId());
-                    default:
-                        break;
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public String getColumnName(int column) {
-            return columnHeaders.get(column);
-        }
-    }
 }

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.java

@@ -19,12 +19,12 @@
 package org.sleuthkit.autopsy.casemodule.datasourcesummary;
 
 import java.text.DecimalFormat;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.table.DefaultTableModel;
+import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle.Messages;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.DataSource;
 import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.TskCoreException;
@@ -36,23 +36,47 @@ class DataSourceSummaryDetailsPanel extends javax.swing.JPanel {
 
     //Because this panel was made using the gridbaglayout and netbean's Customize Layout tool it will be best to continue to modify it through that
     private static final long serialVersionUID = 1L;
-    private Map<Long, String> osDetailMap = new HashMap<>();
     private static final Integer SIZE_COVERSION_CONSTANT = 1000;
     private static final DecimalFormat APPROXIMATE_SIZE_FORMAT = new DecimalFormat("#.##");
-    private final Map<Long, Long> unallocatedFilesSizeMap;
-    private final Map<Long, String> usageMap;
     private static final Logger logger = Logger.getLogger(DataSourceSummaryDetailsPanel.class.getName());
 
+    private DataSource dataSource;
+
     /**
      * Creates new form DataSourceSummaryDetailsPanel
      */
     @Messages({"DataSourceSummaryDetailsPanel.getDataSources.error.text=Failed to get the list of datasources for the current case.",
         "DataSourceSummaryDetailsPanel.getDataSources.error.title=Load Failure"})
-    DataSourceSummaryDetailsPanel(Map<Long, String> usageMap) {
+    DataSourceSummaryDetailsPanel() {
         initComponents();
-        this.usageMap = usageMap;
-        this.unallocatedFilesSizeMap = DataSourceInfoUtilities.getSizeOfUnallocatedFiles();
-        osDetailMap = DataSourceInfoUtilities.getOperatingSystems();
+        setDataSource(null);
+    }
+
+    /**
+     * The datasource currently used as the model in this panel.
+     *
+     * @return The datasource currently being used as the model in this panel.
+     */
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    /**
+     * Sets datasource to visualize in the panel.
+     *
+     * @param dataSource The datasource to use in this panel.
+     */
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+
+        if (dataSource == null || !Case.isCaseOpen()) {
+            updateDetailsPanelData(null, null, null, null);
+        } else {
+            updateDetailsPanelData(dataSource,
+                    DataSourceInfoUtilities.getSizeOfUnallocatedFiles(dataSource),
+                    DataSourceInfoUtilities.getOperatingSystems(dataSource),
+                    DataSourceInfoUtilities.getDataSourceType(dataSource));
+        }
     }
 
     /**
@@ -60,77 +84,80 @@ class DataSourceSummaryDetailsPanel extends javax.swing.JPanel {
      *
      * @param selectedDataSource the DataSource to display details about.
      */
-    void updateDetailsPanelData(DataSource selectedDataSource) {
+    private void updateDetailsPanelData(DataSource selectedDataSource, Long unallocatedFilesSize, String osDetails, String usage) {
         clearTableValues();
         if (selectedDataSource != null) {
-            String sizeString = "";
-            String sectorSizeString = "";
-            String md5String = "";
-            String sha1String = "";
-            String sha256String = "";
-            String acquisitionDetailsString = "";
-            String imageTypeString = "";
-            String[] filePaths = new String[0];
-            String osDetailString = osDetailMap.get(selectedDataSource.getId()) == null ? "" : osDetailMap.get(selectedDataSource.getId());
-            String dataSourceTypeString = usageMap.get(selectedDataSource.getId()) == null ? "" : usageMap.get(selectedDataSource.getId());
-            try {
-                acquisitionDetailsString = selectedDataSource.getAcquisitionDetails();
-            } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Unable to get aquisition details for selected data source", ex);
-            }
-            if (selectedDataSource instanceof Image) {
-                imageTypeString = ((Image) selectedDataSource).getType().getName();
-                filePaths = ((Image) selectedDataSource).getPaths();
-                sizeString = getSizeString(selectedDataSource.getSize());
-                sectorSizeString = getSizeString(((Image) selectedDataSource).getSsize());
-                try {
-                    //older databases may have null as the hash values
-                    md5String = ((Image) selectedDataSource).getMd5();
-                    if (md5String == null) {
-                        md5String = "";
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Unable to get MD5 for selected data source", ex);
-                }
-                try {
-                    sha1String = ((Image) selectedDataSource).getSha1();
-                    if (sha1String == null) {
-                        sha1String = "";
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Unable to get SHA1 for selected data source", ex);
-                }
-                try {
-                    sha256String = ((Image) selectedDataSource).getSha256();
-                    if (sha256String == null) {
-                        sha256String = "";
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Unable to get SHA256 for selected data source", ex);
-                }
-            }
+            unallocatedSizeValue.setText(getSizeString(unallocatedFilesSize));
+            operatingSystemValue.setText(StringUtils.isBlank(osDetails) ? "" : osDetails);
+            dataSourceUsageValue.setText(StringUtils.isBlank(usage) ? "" : usage);
+
+            timeZoneValue.setText(selectedDataSource.getTimeZone());
             displayNameValue.setText(selectedDataSource.getName());
             originalNameValue.setText(selectedDataSource.getName());
             deviceIdValue.setText(selectedDataSource.getDeviceId());
-            dataSourceUsageValue.setText(dataSourceTypeString);
-            operatingSystemValue.setText(osDetailString);
-            timeZoneValue.setText(selectedDataSource.getTimeZone());
-            acquisitionDetailsTextArea.setText(acquisitionDetailsString);
-            imageTypeValue.setText(imageTypeString);
-            sizeValue.setText(sizeString);
-            unallocatedSizeValue.setText(getSizeString(unallocatedFilesSizeMap.get(selectedDataSource.getId())));
-            sectorSizeValue.setText(sectorSizeString);
-            md5HashValue.setText(md5String);
-            sha1HashValue.setText(sha1String);
-            sha256HashValue.setText(sha256String);
-            for (String path : filePaths) {
-                ((DefaultTableModel) filePathsTable.getModel()).addRow(new Object[]{path});
+
+            try {
+                acquisitionDetailsTextArea.setText(selectedDataSource.getAcquisitionDetails());
+            } catch (TskCoreException ex) {
+                logger.log(Level.WARNING, "Unable to get aquisition details for selected data source", ex);
+            }
+
+            if (selectedDataSource instanceof Image) {
+                setFieldsForImage((Image) selectedDataSource);
             }
         }
         updateFieldVisibility();
         this.repaint();
     }
 
+    /**
+     * Sets text fields for an image. This should be called after
+     * clearTableValues and before updateFieldVisibility to ensure the proper
+     * rendering.
+     *
+     * @param selectedImage The selected image.
+     */
+    private void setFieldsForImage(Image selectedImage) {
+        imageTypeValue.setText(selectedImage.getType().getName());
+        sizeValue.setText(getSizeString(selectedImage.getSize()));
+        sectorSizeValue.setText(getSizeString(selectedImage.getSsize()));
+
+        for (String path : selectedImage.getPaths()) {
+            ((DefaultTableModel) filePathsTable.getModel()).addRow(new Object[]{path});
+        }
+
+        try {
+            //older databases may have null as the hash values
+            String md5String = selectedImage.getMd5();
+            if (md5String == null) {
+                md5String = "";
+            }
+            md5HashValue.setText(md5String);
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to get MD5 for selected data source", ex);
+        }
+
+        try {
+            String sha1String = selectedImage.getSha1();
+            if (sha1String == null) {
+                sha1String = "";
+            }
+            sha1HashValue.setText(sha1String);
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to get SHA1 for selected data source", ex);
+        }
+
+        try {
+            String sha256String = selectedImage.getSha256();
+            if (sha256String == null) {
+                sha256String = "";
+            }
+            sha256HashValue.setText(sha256String);
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to get SHA256 for selected data source", ex);
+        }
+    }
+
     /**
      * Get a long size in bytes as a string formated to be read by users.
      *
@@ -147,7 +174,7 @@ class DataSourceSummaryDetailsPanel extends javax.swing.JPanel {
         "DataSourceSummaryDetailsPanel.units.terabytes= TB",
         "DataSourceSummaryDetailsPanel.units.petabytes= PB"
     })
-    private String getSizeString(Long size) {
+    private static String getSizeString(Long size) {
         if (size == null) {
             return "";
         }

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.form

@@ -68,6 +68,11 @@
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
         <Container class="javax.swing.JTabbedPane" name="dataSourceTabbedPane">
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="dataSourceSummaryTabbedPane"/>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+          </AuxValues>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="right"/>

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.java

@@ -27,7 +27,6 @@ import java.util.Observer;
 import java.util.Set;
 import javax.swing.event.ListSelectionEvent;
 import org.openide.util.NbBundle.Messages;
-import org.sleuthkit.autopsy.casemodule.IngestJobInfoPanel;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
 import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent.Reason;
@@ -41,10 +40,8 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
 
     private static final long serialVersionUID = 1L;
     private static final Set<IngestManager.IngestJobEvent> INGEST_JOB_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestJobEvent.DATA_SOURCE_ANALYSIS_COMPLETED);
-    private final DataSourceSummaryCountsPanel countsPanel;
-    private final DataSourceSummaryDetailsPanel detailsPanel;
     private final DataSourceBrowser dataSourcesPanel;
-    private final IngestJobInfoPanel ingestHistoryPanel;
+    private final DataSourceSummaryTabbedPane dataSourceSummaryTabbedPane;
 
     /**
      * Creates new form DataSourceSummaryDialog for displaying a summary of the
@@ -61,21 +58,14 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
         super(owner, Bundle.DataSourceSummaryDialog_window_title(), true);
         Map<Long, String> usageMap = DataSourceInfoUtilities.getDataSourceTypes();
         Map<Long, Long> fileCountsMap = DataSourceInfoUtilities.getCountsOfFiles();
-        countsPanel = new DataSourceSummaryCountsPanel(fileCountsMap);
-        detailsPanel = new DataSourceSummaryDetailsPanel(usageMap);
         dataSourcesPanel = new DataSourceBrowser(usageMap, fileCountsMap);
-        ingestHistoryPanel = new IngestJobInfoPanel();
+        dataSourceSummaryTabbedPane = new DataSourceSummaryTabbedPane();
         initComponents();
         dataSourceSummarySplitPane.setLeftComponent(dataSourcesPanel);
-        dataSourceTabbedPane.addTab(Bundle.DataSourceSummaryDialog_detailsTab_title(), detailsPanel);
-        dataSourceTabbedPane.addTab(Bundle.DataSourceSummaryDialog_countsTab_title(), countsPanel);
-        dataSourceTabbedPane.addTab(Bundle.DataSourceSummaryDialog_ingestHistoryTab_title(), ingestHistoryPanel);
         dataSourcesPanel.addListSelectionListener((ListSelectionEvent e) -> {
             if (!e.getValueIsAdjusting()) {
                 DataSource selectedDataSource = dataSourcesPanel.getSelectedDataSource();
-                countsPanel.updateCountsTableData(selectedDataSource);
-                detailsPanel.updateDetailsPanelData(selectedDataSource);
-                ingestHistoryPanel.setDataSource(selectedDataSource);
+                dataSourceSummaryTabbedPane.setDataSource(selectedDataSource);
                 this.repaint();
             }
         });
@@ -116,7 +106,7 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
 
         closeButton = new javax.swing.JButton();
         dataSourceSummarySplitPane = new javax.swing.JSplitPane();
-        dataSourceTabbedPane = new javax.swing.JTabbedPane();
+        javax.swing.JTabbedPane dataSourceTabbedPane = dataSourceSummaryTabbedPane;
 
         org.openide.awt.Mnemonics.setLocalizedText(closeButton, org.openide.util.NbBundle.getMessage(DataSourceSummaryDialog.class, "DataSourceSummaryDialog.closeButton.text")); // NOI18N
         closeButton.addActionListener(new java.awt.event.ActionListener() {
@@ -173,6 +163,5 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton closeButton;
     private javax.swing.JSplitPane dataSourceSummarySplitPane;
-    private javax.swing.JTabbedPane dataSourceTabbedPane;
     // End of variables declaration//GEN-END:variables
 }

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryTabbedPane.java

@@ -0,0 +1,74 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.datasourcesummary;
+
+import javax.swing.JTabbedPane;
+import org.sleuthkit.autopsy.casemodule.IngestJobInfoPanel;
+import org.sleuthkit.datamodel.DataSource;
+
+/**
+ * A tabbed pane showing the summary of a data source including tabs of:
+ * DataSourceSummaryCountsPanel, DataSourceSummaryDetailsPanel, and
+ * IngestJobInfoPanel.
+ */
+public class DataSourceSummaryTabbedPane extends JTabbedPane {
+
+    private static final long serialVersionUID = 1L;
+    
+    private final DataSourceSummaryCountsPanel countsPanel;
+    private final DataSourceSummaryDetailsPanel detailsPanel;
+    private final IngestJobInfoPanel ingestHistoryPanel;
+
+    private DataSource dataSource = null;
+
+    /**
+     * Constructs a tabbed pane showing the summary of a data source.
+     */
+    public DataSourceSummaryTabbedPane() {
+        countsPanel = new DataSourceSummaryCountsPanel();
+        detailsPanel = new DataSourceSummaryDetailsPanel();
+        ingestHistoryPanel = new IngestJobInfoPanel();
+        
+        addTab(Bundle.DataSourceSummaryDialog_detailsTab_title(), detailsPanel);
+        addTab(Bundle.DataSourceSummaryDialog_countsTab_title(), countsPanel);
+        addTab(Bundle.DataSourceSummaryDialog_ingestHistoryTab_title(), ingestHistoryPanel);
+    }
+
+    /**
+     * The datasource currently used as the model in this panel.
+     *
+     * @return The datasource currently being used as the model in this panel.
+     */
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    /**
+     * Sets datasource to visualize in the tabbed panel.
+     *
+     * @param dataSource The datasource to use in this panel.
+     */
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+
+        detailsPanel.setDataSource(dataSource);
+        countsPanel.setDataSource(dataSource);
+        ingestHistoryPanel.setDataSource(dataSource);
+    }
+}

Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/NonEditableTableModel.java

@@ -0,0 +1,37 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.datasourcesummary;
+
+import javax.swing.table.DefaultTableModel;
+
+/**
+ * A Table model where cells are not editable.
+ */
+class NonEditableTableModel extends DefaultTableModel {
+    private static final long serialVersionUID = 1L;
+    
+    NonEditableTableModel(Object[][] data, Object[] columnNames) {
+        super(data, columnNames);
+    }
+
+    @Override
+    public boolean isCellEditable(int row, int column) {
+        return false;
+    }
+}

Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2020 Basis Technology Corp.
+ * Copyright 2013-2020 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,7 +56,7 @@ public class TagsManager implements Closeable {
     private final SleuthkitCase caseDb;
 
     private static String DEFAULT_TAG_SET_NAME = "Project VIC";
-    
+
     private static final Object lock = new Object();
 
     static {
@@ -235,16 +235,16 @@ public class TagsManager implements Closeable {
     public static String getNotableTagDisplayName() {
         return TagNameDefinition.getNotableTagDisplayName();
     }
-    
+
     /**
      * Creates a new TagSetDefinition file.
-     * 
+     *
      * @param tagSetDef The tag set definition.
-     * 
-     * @throws IOException 
+     *
+     * @throws IOException
      */
     public static void addTagSetDefinition(TagSetDefinition tagSetDef) throws IOException {
-        synchronized(lock) {
+        synchronized (lock) {
             TagSetDefinition.writeTagSetDefinition(tagSetDef);
         }
     }
@@ -267,20 +267,20 @@ public class TagsManager implements Closeable {
                     caseDb.addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus());
                 }
                 //Assume new case and add tag sets
-                for(TagSetDefinition setDef: TagSetDefinition.readTagSetDefinitions()) {
+                for (TagSetDefinition setDef : TagSetDefinition.readTagSetDefinitions()) {
                     List<TagName> tagNameList = new ArrayList<>();
-                    for(TagNameDefinition tagNameDef: setDef.getTagNameDefinitions()) {
+                    for (TagNameDefinition tagNameDef : setDef.getTagNameDefinitions()) {
                         tagNameList.add(caseDb.addOrUpdateTagName(tagNameDef.getDisplayName(), tagNameDef.getDescription(), tagNameDef.getColor(), tagNameDef.getKnownStatus()));
                     }
-                    
-                    if(!tagNameList.isEmpty()) {
+
+                    if (!tagNameList.isEmpty()) {
                         taggingMgr.addTagSet(setDef.getName(), tagNameList);
                     }
                 }
             }
         } catch (TskCoreException ex) {
             LOGGER.log(Level.SEVERE, "Error updating standard tag name and tag set definitions", ex);
-        } catch(IOException ex) {
+        } catch (IOException ex) {
             LOGGER.log(Level.SEVERE, "Error loading tag set JSON files", ex);
         }
 
@@ -288,28 +288,41 @@ public class TagsManager implements Closeable {
             tagName.saveToCase(caseDb);
         }
     }
-    
+
     /**
      * Get a list of all tag sets currently in the case database.
-     * 
+     *
      * @return A list, possibly empty, of TagSet objects.
-     * 
+     *
      * @throws TskCoreException
      */
     public List<TagSet> getAllTagSets() throws TskCoreException {
         return caseDb.getTaggingManager().getTagSets();
     }
-    
+
+    /**
+     * Gets the tag set a tag name (tag definition) belongs to, if any.
+     *
+     * @param tagName The tag name.
+     *
+     * @return A TagSet object or null.
+     *
+     * @throws TskCoreException If there is an error querying the case database.
+     */
+    public TagSet getTagSet(TagName tagName) throws TskCoreException {
+        return caseDb.getTaggingManager().getTagSet(tagName);        
+    }
+
     /**
      * Add a new TagSet to the case database. Tags will be ranked in the order
      * which they are passed to this method.
-     * 
-     * @param name Tag set name.
+     *
+     * @param name        Tag set name.
      * @param tagNameList List of TagName in rank order.
-     * 
+     *
      * @return A new TagSet object.
-     * 
-     * @throws TskCoreException 
+     *
+     * @throws TskCoreException
      */
     public TagSet addTagSet(String name, List<TagName> tagNameList) throws TskCoreException {
         return caseDb.getTaggingManager().addTagSet(name, tagNameList);
@@ -501,7 +514,7 @@ public class TagsManager implements Closeable {
      *                                       name to the case database.
      */
     public TagName addTagName(String displayName, String description, TagName.HTML_COLOR color, TskData.FileKnown knownStatus) throws TagNameAlreadyExistsException, TskCoreException {
-        synchronized(lock) {
+        synchronized (lock) {
             try {
                 TagName tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus);
                 Set<TagNameDefinition> customTypes = TagNameDefinition.getTagNameDefinitions();

Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties

@@ -1,9 +1,9 @@
 OpenIDE-Module-Name=Central Repository
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Short-Description=Correlation Engine Ingest Module
+OpenIDE-Module-Short-Description=Central Repository Ingest Module
 OpenIDE-Module-Long-Description=\
-    Correlation Engine ingest module and central database.  \n\n\
-    The Correlation Engine ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\
+    Central Repository ingest module and central database.  \n\n\
+    The Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\
     Stored attributes are used in future cases to correlate and analyzes files and artifacts during ingest.
 CentralRepoCommentDialog.commentLabel.text=Comment:
 CentralRepoCommentDialog.okButton.text=&OK

Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED

@@ -4,10 +4,10 @@ AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoCommentNoMD5=Add/
 CentralRepoCommentDialog.title.addEditCentralRepoComment=Add/Edit Central Repository Comment
 OpenIDE-Module-Name=Central Repository
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Short-Description=Correlation Engine Ingest Module
+OpenIDE-Module-Short-Description=Central Repository Ingest Module
 OpenIDE-Module-Long-Description=\
-    Correlation Engine ingest module and central database.  \n\n\
-    The Correlation Engine ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\
+    Central Repository ingest module and central database.  \n\n\
+    The Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\
     Stored attributes are used in future cases to correlate and analyzes files and artifacts during ingest.
 CentralRepoCommentDialog.commentLabel.text=Comment:
 CentralRepoCommentDialog.okButton.text=&OK

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccount.java

@@ -23,25 +23,28 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import org.apache.commons.lang.StringUtils;
 import org.sleuthkit.datamodel.Account;
-
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 
 /**
  * This class abstracts an Account as stored in the CR database.
  */
 public final class CentralRepoAccount {
-    
-	// primary key in the Accounts table in CR database
-	private final long accountId;
 
-	private final CentralRepoAccountType accountType;
-        
-        // type specific unique account identifier
-	private final String typeSpecificIdentifier;
-        
+    // primary key in the Accounts table in CR database
+    private final long accountId;
+
+    private final CentralRepoAccountType accountType;
+
+    // type specific unique account identifier
+    private final String typeSpecificIdentifier;
+
     /**
-     * Encapsulates a central repo account type and the correlation type
-     * that it maps to.
+     * Encapsulates a central repo account type and the correlation type that it
+     * maps to.
      */
     public static final class CentralRepoAccountType {
 
@@ -55,7 +58,6 @@ public final class CentralRepoAccount {
             this.correlationTypeId = correlationTypeId;
             this.accountTypeId = acctTypeID;
         }
-        
 
         /**
          * @return the acctType
@@ -71,72 +73,103 @@ public final class CentralRepoAccount {
         public int getAccountTypeId() {
             return this.accountTypeId;
         }
+
+        @Override
+        public int hashCode() {
+            int hash = 5;
+            hash = 29 * hash + this.accountTypeId;
+            hash = 29 * hash + Objects.hashCode(this.acctType);
+            hash = 29 * hash + this.correlationTypeId;
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            final CentralRepoAccountType other = (CentralRepoAccountType) obj;
+            if (this.accountTypeId != other.getAccountTypeId()) {
+                return false;
+            }
+            if (this.correlationTypeId != other.getCorrelationTypeId()) {
+                return false;
+            }
+            return Objects.equals(this.acctType, other.getAcctType());
+        }
+
     }
-    
+
     public CentralRepoAccount(long accountId, CentralRepoAccountType accountType, String typeSpecificIdentifier) {
-		this.accountId = accountId;
-		this.accountType = accountType;
-		this.typeSpecificIdentifier = typeSpecificIdentifier;
-	}
+        this.accountId = accountId;
+        this.accountType = accountType;
+        this.typeSpecificIdentifier = typeSpecificIdentifier;
+    }
 
-	/**
-	 * Gets unique identifier (assigned by a provider) for the account. Example
-	 * includes an email address, a phone number, or a website username.
-	 *
-	 * @return type specific account id.
-	 */
-	public String getIdentifier() {
-		return this.typeSpecificIdentifier;
-	}
+    /**
+     * Gets unique identifier (assigned by a provider) for the account. Example
+     * includes an email address, a phone number, or a website username.
+     *
+     * @return type specific account id.
+     */
+    public String getIdentifier() {
+        return this.typeSpecificIdentifier;
+    }
 
-	/**
-	 * Gets the account type
-	 *
-	 * @return account type
-	 */
-	public CentralRepoAccountType getAccountType() {
-		return this.accountType;
-	}
+    /**
+     * Gets the account type
+     *
+     * @return account type
+     */
+    public CentralRepoAccountType getAccountType() {
+        return this.accountType;
+    }
 
-	/**
-	 * Gets the unique row id for this account in the database.
-	 *
-	 * @return unique row id.
-	 */
-	public long getId() {
-		return this.accountId;
-	}
+    /**
+     * Gets the unique row id for this account in the database.
+     *
+     * @return unique row id.
+     */
+    public long getId() {
+        return this.accountId;
+    }
 
-	@Override
-	public int hashCode() {
-		int hash = 5;
-		hash = 43 * hash + (int) (this.accountId ^ (this.accountId >>> 32));
-		hash = 43 * hash + (this.accountType != null ? this.accountType.hashCode() : 0);
-		hash = 43 * hash + (this.typeSpecificIdentifier != null ? this.typeSpecificIdentifier.hashCode() : 0);
-		return hash;
-	}
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 43 * hash + (int) (this.accountId ^ (this.accountId >>> 32));
+        hash = 43 * hash + (this.accountType != null ? this.accountType.hashCode() : 0);
+        hash = 43 * hash + (this.typeSpecificIdentifier != null ? this.typeSpecificIdentifier.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final CentralRepoAccount other = (CentralRepoAccount) obj;
+        if (this.accountId != other.getId()) {
+            return false;
+        }
+        if (!Objects.equals(this.typeSpecificIdentifier, other.getIdentifier())) {
+            return false;
+        }
+        return Objects.equals(this.accountType, other.getAccountType());
+    }
 
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		final CentralRepoAccount other = (CentralRepoAccount) obj;
-		if (this.accountId != other.getId()) {
-			return false;
-		}
-		if ((this.typeSpecificIdentifier == null) ? (other.getIdentifier() != null) : !this.typeSpecificIdentifier.equals(other.getIdentifier())) {
-			return false;
-		}
-		return !(this.accountType != other.getAccountType() && (this.accountType == null || !this.accountType.equals(other.getAccountType())));
-	}
-    
     /**
      * Callback to process a query that gets accounts
      */
@@ -152,7 +185,7 @@ public final class CentralRepoAccount {
                 // create account
                 Account.Type acctType = new Account.Type(rs.getString("type_name"), rs.getString("display_name"));
                 CentralRepoAccountType crAccountType = new CentralRepoAccountType(rs.getInt("account_type_id"), acctType, rs.getInt("correlation_type_id"));
-                 
+
                 CentralRepoAccount account = new CentralRepoAccount(
                         rs.getInt("account_id"),
                         crAccountType,
@@ -167,7 +200,6 @@ public final class CentralRepoAccount {
         }
     };
 
-    
     private static final String ACCOUNTS_QUERY_CLAUSE
             = "SELECT accounts.id as account_id,  "
             + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier,"
@@ -175,66 +207,138 @@ public final class CentralRepoAccount {
             + " account_types.type_name as type_name, account_types.display_name as display_name, account_types.correlation_type_id as correlation_type_id  "
             + " FROM accounts "
             + " JOIN account_types as account_types on accounts.account_type_id = account_types.id ";
-     
-     
-     /**
+
+    /**
      * Get all accounts with account identifier matching the given substring.
      *
-     * @param accountIdentifierSubstring Account identifier substring to look for.
+     * @param accountIdentifierSubstring Account identifier substring to look
+     * for.
      *
-     * @return Collection of all accounts with identifier matching the given substring, may
-     * be empty.
-     * 
-     * @throws CentralRepoException If there is an error in getting the accounts.
+     * @return Collection of all accounts with identifier matching the given
+     * substring, may be empty.
+     *
+     * @throws CentralRepoException If there is an error in getting the
+     * accounts.
      */
     public static Collection<CentralRepoAccount> getAccountsWithIdentifierLike(String accountIdentifierSubstring) throws CentralRepoException {
-       
+
         String queryClause = ACCOUNTS_QUERY_CLAUSE
-                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + accountIdentifierSubstring + "%')";
+                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER(?)";
+
+        List<Object> params = new ArrayList<>();
+        params.add("%" + accountIdentifierSubstring + "%");
 
         AccountsQueryCallback queryCallback = new AccountsQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getAccountsList();
     }
-    
+
     /**
      * Get all accounts with account identifier matching the given identifier.
      *
      * @param accountIdentifier Account identifier to look for.
      *
-     * @return Collection of all accounts with identifier matching the given identifier, may
-     * be empty.
-     * 
-     * @throws CentralRepoException If there is an error in getting the accounts.
+     * @return Collection of all accounts with identifier matching the given
+     * identifier, may be empty.
+     *
+     * @throws CentralRepoException If there is an error in getting the
+     * accounts.
      */
-    public static Collection<CentralRepoAccount> getAccountsWithIdentifier(String accountIdentifier) throws CentralRepoException {
-       
+    public static Collection<CentralRepoAccount> getAccountsWithIdentifier(String accountIdentifier) throws InvalidAccountIDException, CentralRepoException {
+
+        String normalizedAccountIdentifier = normalizeAccountIdentifier(accountIdentifier);
         String queryClause = ACCOUNTS_QUERY_CLAUSE
-                + " WHERE LOWER(accounts.account_unique_identifier) = LOWER('" + accountIdentifier + "')";
+                + " WHERE LOWER(accounts.account_unique_identifier) = LOWER(?)";
+
+        List<Object> params = new ArrayList<>();
+        params.add(normalizedAccountIdentifier);
 
         AccountsQueryCallback queryCallback = new AccountsQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getAccountsList();
     }
-    
+
     /**
      * Get all central repo accounts.
      *
-     * @return Collection of all accounts with identifier matching the given identifier, may
-     * be empty.
-     * 
-     * @throws CentralRepoException If there is an error in getting the accounts.
+     * @return Collection of all accounts with identifier matching the given
+     * identifier, may be empty.
+     *
+     * @throws CentralRepoException If there is an error in getting the
+     * accounts.
      */
     public static Collection<CentralRepoAccount> getAllAccounts() throws CentralRepoException {
-       
+
         String queryClause = ACCOUNTS_QUERY_CLAUSE;
 
+        List<Object> params = new ArrayList<>(); // empty param list
+
         AccountsQueryCallback queryCallback = new AccountsQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getAccountsList();
     }
+
+    /**
+     * Attempts to normalize an account identifier, after trying to guess the
+     * account type.
+     *
+     * @param accountIdentifier Account identifier to be normalized.
+     * @return normalized identifier
+     *
+     * @throws InvalidAccountIDException If the account identifier is not valid.
+     */
+    private static String normalizeAccountIdentifier(String accountIdentifier) throws InvalidAccountIDException {
+        if (StringUtils.isEmpty(accountIdentifier)) {
+            throw new InvalidAccountIDException("Account id is null or empty.");
+        }
+
+        String normalizedAccountIdentifier;
+        try {
+            if (CorrelationAttributeNormalizer.isValidPhoneNumber(accountIdentifier)) {
+                normalizedAccountIdentifier = CorrelationAttributeNormalizer.normalizePhone(accountIdentifier);
+            } else if (CorrelationAttributeNormalizer.isValidEmailAddress(accountIdentifier)) {
+                normalizedAccountIdentifier = CorrelationAttributeNormalizer.normalizeEmail(accountIdentifier);
+            } else {
+                normalizedAccountIdentifier = accountIdentifier.toLowerCase().trim();
+            }
+        } catch (CorrelationAttributeNormalizationException ex) {
+            throw new InvalidAccountIDException("Failed to normalize the account idenitier " + accountIdentifier, ex);
+        }
+        return normalizedAccountIdentifier;
+    }
     
+    /**
+     * Normalizes an account identifier, based on the given account type.
+     *
+     * @param crAccountType Account type.
+     * @param accountIdentifier Account identifier to be normalized.
+     * @return Normalized identifier.
+     *
+     * @throws InvalidAccountIDException If the account identifier is invalid.
+     */
+    public static String normalizeAccountIdentifier(CentralRepoAccountType crAccountType, String accountIdentifier) throws InvalidAccountIDException {
+       
+        if (StringUtils.isBlank(accountIdentifier)) {
+            throw new InvalidAccountIDException("Account identifier is null or empty.");
+        }
+        
+        String normalizedAccountIdentifier;
+        try {
+            if (crAccountType.getAcctType().equals(Account.Type.PHONE)) {
+                normalizedAccountIdentifier = CorrelationAttributeNormalizer.normalizePhone(accountIdentifier);
+            } else if (crAccountType.getAcctType().equals(Account.Type.EMAIL)) {
+                normalizedAccountIdentifier = CorrelationAttributeNormalizer.normalizeEmail(accountIdentifier);
+            } else {
+                // convert to lowercase
+                normalizedAccountIdentifier = accountIdentifier.toLowerCase();
+            }
+        } catch (CorrelationAttributeNormalizationException ex) {
+            throw new InvalidAccountIDException("Invalid account identifier", ex);
+        }
+
+        return normalizedAccountIdentifier;
+    }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbUtil.java

@@ -25,6 +25,9 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
 import java.util.logging.Level;
+import javax.swing.SwingUtilities;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import static org.sleuthkit.autopsy.centralrepository.datamodel.RdbmsCentralRepo.SOFTWARE_CR_DB_SCHEMA_VERSION;
@@ -259,8 +262,21 @@ public class CentralRepoDbUtil {
      *                                      used
      */
     public static void setUseCentralRepo(boolean centralRepoCheckBoxIsSelected) {
+        closePersonasTopComponent();
         ModuleSettings.setConfigSetting(CENTRAL_REPO_NAME, CENTRAL_REPO_USE_KEY, Boolean.toString(centralRepoCheckBoxIsSelected));
     }
+    
+    /**
+     * Closes Personas top component if it exists.
+     */
+    private static void closePersonasTopComponent() {
+        SwingUtilities.invokeLater(() -> {
+            TopComponent personasWindow = WindowManager.getDefault().findTopComponent("PersonasTopComponent");
+            if (personasWindow != null && personasWindow.isOpened()) {
+                personasWindow.close();   
+            }
+        });
+    }
 
     /**
      * Use the current settings and the validation query to test the connection

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepository.java

@@ -27,6 +27,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType;
 import org.sleuthkit.autopsy.coordinationservice.CoordinationService;
 import org.sleuthkit.datamodel.HashHitInfo;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 
 /**
  * Main interface for interacting with the database
@@ -64,7 +65,8 @@ public interface CentralRepository {
      * It will not close active/in-use connections. Thus, it is vital that there
      * are no in-use connections when you call this method.
      *
-     * @throws CentralRepoException if there is a problem closing the connection pool.
+     * @throws CentralRepoException if there is a problem closing the connection
+     * pool.
      */
     void shutdownConnections() throws CentralRepoException;
 
@@ -101,7 +103,7 @@ public interface CentralRepository {
     /**
      * Add a new name/value pair in the db_info table.
      *
-     * @param name  Key to set
+     * @param name Key to set
      * @param value Value to set
      *
      * @throws CentralRepoException
@@ -112,9 +114,9 @@ public interface CentralRepository {
      * Set the data source object id for a specific entry in the data_sources
      * table
      *
-     * @param rowId              - the row id for the data_sources table entry
+     * @param rowId - the row id for the data_sources table entry
      * @param dataSourceObjectId - the object id for the data source from the
-     *                           caseDb
+     * caseDb
      */
     void addDataSourceObjectId(int rowId, long dataSourceObjectId) throws CentralRepoException;
 
@@ -132,7 +134,7 @@ public interface CentralRepository {
     /**
      * Update the value for a name in the name/value db_info table.
      *
-     * @param name  Name to find
+     * @param name Name to find
      * @param value Value to assign to name.
      *
      * @throws CentralRepoException
@@ -161,10 +163,10 @@ public interface CentralRepository {
      * @param eamCase The case to update
      */
     void updateCase(CorrelationCase eamCase) throws CentralRepoException;
-    
+
     /**
-     * Queries the examiner table for the given user name. 
-     * Adds a row if the user is not found in the examiner table.
+     * Queries the examiner table for the given user name. Adds a row if the
+     * user is not found in the examiner table.
      *
      * @param examinerLoginName user name to look for.
      * @return CentralRepoExaminer for the given user name.
@@ -215,7 +217,7 @@ public interface CentralRepository {
      * @param eamDataSource the data source to add
      *
      * @return - A CorrelationDataSource object with data source's central
-     *         repository id
+     * repository id
      */
     CorrelationDataSource newDataSource(CorrelationDataSource eamDataSource) throws CentralRepoException;
 
@@ -244,8 +246,8 @@ public interface CentralRepository {
     /**
      * Retrieves Data Source details based on data source device ID
      *
-     * @param correlationCase    the current CorrelationCase used for ensuring
-     *                           uniqueness of DataSource
+     * @param correlationCase the current CorrelationCase used for ensuring
+     * uniqueness of DataSource
      * @param caseDbDataSourceId the data source device ID number
      *
      * @return The data source
@@ -256,8 +258,8 @@ public interface CentralRepository {
      * Retrieves Data Source details based on data source ID
      *
      * @param correlationCase the current CorrelationCase used for ensuring
-     *                        uniqueness of DataSource
-     * @param dataSourceId    the data source ID number
+     * uniqueness of DataSource
+     * @param dataSourceId the data source ID number
      *
      * @return The data source
      */
@@ -274,7 +276,7 @@ public interface CentralRepository {
      * Changes the name of a data source in the DB
      *
      * @param eamDataSource The data source
-     * @param newName       The new name
+     * @param newName The new name
      *
      * @throws CentralRepoException
      */
@@ -292,12 +294,12 @@ public interface CentralRepository {
      * Retrieves eamArtifact instances from the database that are associated
      * with the eamArtifactType and eamArtifactValues of the given eamArtifact.
      *
-     * @param aType  EamArtifact.Type to search for
+     * @param aType EamArtifact.Type to search for
      * @param values The list of correlation values to get
-     *               CorrelationAttributeInstances for
+     * CorrelationAttributeInstances for
      *
      * @return List of artifact instances for a given type with the specified
-     *         values
+     * values
      *
      * @throws CorrelationAttributeNormalizationException
      * @throws CentralRepoException
@@ -323,14 +325,14 @@ public interface CentralRepository {
      * with the eamArtifactType and eamArtifactValues of the given eamArtifact
      * for the specified cases.
      *
-     * @param aType   The type of the artifact
-     * @param values  The list of correlation values to get
-     *                CorrelationAttributeInstances for
+     * @param aType The type of the artifact
+     * @param values The list of correlation values to get
+     * CorrelationAttributeInstances for
      * @param caseIds The list of central repository case ids to get
-     *                CorrelationAttributeInstances for
+     * CorrelationAttributeInstances for
      *
      * @return List of artifact instances for a given type with the specified
-     *         values for the specified cases
+     * values for the specified cases
      *
      * @throws CorrelationAttributeNormalizationException
      * @throws CentralRepoException
@@ -345,7 +347,7 @@ public interface CentralRepository {
      * @param value Value to search for
      *
      * @return Number of artifact instances having ArtifactType and
-     *         ArtifactValue.
+     * ArtifactValue.
      */
     Long getCountArtifactInstancesByTypeValue(CorrelationAttributeInstance.Type aType, String value) throws CentralRepoException, CorrelationAttributeNormalizationException;
 
@@ -384,7 +386,7 @@ public interface CentralRepository {
      * @param correlationDataSource Data source to search for
      *
      * @return Number of artifact instances having caseDisplayName and
-     *         dataSource
+     * dataSource
      */
     Long getCountArtifactInstancesByCaseDataSource(CorrelationDataSource correlationDataSource) throws CentralRepoException;
 
@@ -413,7 +415,7 @@ public interface CentralRepository {
      * in the associated CorrelationAttribute object.
      *
      * @param eamArtifact The correlation attribute whose database instance will
-     *                    be updated.
+     * be updated.
      *
      * @throws CentralRepoException
      */
@@ -426,11 +428,11 @@ public interface CentralRepository {
      * Method exists to support instances added using Central Repository version
      * 1,1 and older
      *
-     * @param type                  The type of instance.
-     * @param correlationCase       The case tied to the instance.
+     * @param type The type of instance.
+     * @param correlationCase The case tied to the instance.
      * @param correlationDataSource The data source tied to the instance.
-     * @param value                 The value tied to the instance.
-     * @param filePath              The file path tied to the instance.
+     * @param value The value tied to the instance.
+     * @param filePath The file path tied to the instance.
      *
      * @return The correlation attribute if it exists; otherwise null.
      *
@@ -443,11 +445,10 @@ public interface CentralRepository {
      * Find a correlation attribute in the Central Repository database given the
      * instance type, case, data source, object id.
      *
-     * @param type                  The type of instance.
-     * @param correlationCase       The case tied to the instance.
+     * @param type The type of instance.
+     * @param correlationCase The case tied to the instance.
      * @param correlationDataSource The data source tied to the instance.
-     * @param objectID              The object id of the file tied to the
-     *                              instance.
+     * @param objectID The object id of the file tied to the instance.
      *
      * @return The correlation attribute if it exists; otherwise null.
      *
@@ -483,7 +484,7 @@ public interface CentralRepository {
      * @param value Value to search for
      *
      * @return List of cases containing this artifact with instances marked as
-     *         bad
+     * bad
      *
      * @throws CentralRepoException
      */
@@ -497,7 +498,7 @@ public interface CentralRepository {
      * @param value Value to search for
      *
      * @return List of cases containing this artifact with instances marked as
-     *         bad
+     * bad
      *
      * @throws CentralRepoException
      */
@@ -554,13 +555,13 @@ public interface CentralRepository {
      */
     public boolean isFileHashInReferenceSet(String hash, int referenceSetID) throws CentralRepoException, CorrelationAttributeNormalizationException;
 
-    
     /**
-     * Retrieves the given file HashHitInfo if the given file hash is in this 
+     * Retrieves the given file HashHitInfo if the given file hash is in this
      * reference set. Only searches the reference_files table.
      *
      * @param hash The hash to find in a search.
-     * @param referenceSetID The referenceSetID within which the file should exist.
+     * @param referenceSetID The referenceSetID within which the file should
+     * exist.
      *
      * @return The HashHitInfo if found or null if not found.
      *
@@ -569,7 +570,6 @@ public interface CentralRepository {
      */
     HashHitInfo lookupHash(String hash, int referenceSetID) throws CentralRepoException, CorrelationAttributeNormalizationException;
 
-    
     /**
      * Check if the given value is in a specific reference set
      *
@@ -637,7 +637,7 @@ public interface CentralRepository {
      * Update an existing organization.
      *
      * @param updatedOrganization the values the Organization with the same ID
-     *                            will be updated to in the database.
+     * will be updated to in the database.
      *
      * @throws CentralRepoException
      */
@@ -689,8 +689,7 @@ public interface CentralRepository {
      * Add a new reference instance
      *
      * @param eamGlobalFileInstance The reference instance to add
-     * @param correlationType       Correlation Type that this Reference
-     *                              Instance is
+     * @param correlationType Correlation Type that this Reference Instance is
      *
      * @throws CentralRepoException
      */
@@ -700,8 +699,8 @@ public interface CentralRepository {
      * Insert the bulk collection of Global File Instances
      *
      * @param globalInstances a Set of EamGlobalFileInstances to insert into the
-     *                        db.
-     * @param contentType     the Type of the global instances
+     * db.
+     * @param contentType the Type of the global instances
      *
      * @throws CentralRepoException
      */
@@ -710,7 +709,7 @@ public interface CentralRepository {
     /**
      * Get all reference entries having a given correlation type and value
      *
-     * @param aType  Type to use for matching
+     * @param aType Type to use for matching
      * @param aValue Value to use for matching
      *
      * @return List of all global file instances with a type and value
@@ -735,7 +734,7 @@ public interface CentralRepository {
      * used to correlate artifacts.
      *
      * @return List of EamArtifact.Type's. If none are defined in the database,
-     *         the default list will be returned.
+     * the default list will be returned.
      *
      * @throws CentralRepoException
      */
@@ -746,7 +745,7 @@ public interface CentralRepository {
      * artifacts.
      *
      * @return List of enabled EamArtifact.Type's. If none are defined in the
-     *         database, the default list will be returned.
+     * database, the default list will be returned.
      *
      * @throws CentralRepoException
      */
@@ -757,7 +756,7 @@ public interface CentralRepository {
      * correlate artifacts.
      *
      * @return List of supported EamArtifact.Type's. If none are defined in the
-     *         database, the default list will be returned.
+     * database, the default list will be returned.
      *
      * @throws CentralRepoException
      */
@@ -798,15 +797,15 @@ public interface CentralRepository {
      *
      * @return the lock, or null if locking is not supported
      *
-     * @throws CentralRepoException if the coordination service is running but we fail
-     *                        to get the lock
+     * @throws CentralRepoException if the coordination service is running but
+     * we fail to get the lock
      */
     public CoordinationService.Lock getExclusiveMultiUserDbLock() throws CentralRepoException;
 
     /**
      * Process the Artifact instance in the EamDb
      *
-     * @param type                  EamArtifact.Type to search for
+     * @param type EamArtifact.Type to search for
      * @param instanceTableCallback callback to process the instance
      *
      * @throws CentralRepoException
@@ -816,9 +815,9 @@ public interface CentralRepository {
     /**
      * Process the Artifact instance in the EamDb
      *
-     * @param type                  EamArtifact.Type to search for
+     * @param type EamArtifact.Type to search for
      * @param instanceTableCallback callback to process the instance
-     * @param whereClause           query string to execute
+     * @param whereClause query string to execute
      *
      * @throws CentralRepoException
      */
@@ -827,78 +826,79 @@ public interface CentralRepository {
     /**
      * Process a SELECT query
      *
-     * @param selectClause          query string to execute
+     * @param selectClause query string to execute
      * @param instanceTableCallback callback to process the instance
      *
      * @throws CentralRepoException
      */
-    public void processSelectClause(String selectClause, InstanceTableCallback instanceTableCallback) throws CentralRepoException;     
-    
-    
+    public void processSelectClause(String selectClause, InstanceTableCallback instanceTableCallback) throws CentralRepoException;
+
     /**
-     * Executes an INSERT sql statement on the central repository database.
-     * @param sql INSERT sql to execute.
-     * 
-     * @throws CentralRepoException  If there is an error.
+     * Executes an INSERT/UPDATE/DELETE sql as a prepared statement, on the
+     * central repository database.
+     *
+     * @param sql sql to execute.
+     * @param params List of query params to use, may be empty.
+     *
+     * @throws CentralRepoException If there is an error.
      */
-    void executeInsertSQL(String sql) throws CentralRepoException;
-    
+    void executeCommand(String sql, List<Object> params) throws CentralRepoException;
+
     /**
-     * Executes a SELECT sql statement on the central repository database.
-     * 
-     * @param sql SELECT sql to execute.
+     * Executes a SELECT query sql as a prepared statement, on the central
+     * repository database.
+     *
+     * @param sql sql to execute.
+     * @param params List of query params to use, may be empty.
      * @param queryCallback Query callback to handle the result of the query.
-     * 
+     *
      * @throws CentralRepoException If there is an error.
      */
-    void executeSelectSQL(String sql, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException;
-    
-    /**
-     * Executes an UPDATE sql statement on the central repository database.
-     * 
-     * @param sql UPDATE sql to execute.
-     * 
-     * @throws CentralRepoException If there is an error.
-     */
-    void executeUpdateSQL(String sql) throws CentralRepoException;
-    
-    /**
-     * Executes a DELETE sql statement on the central repository database.
-     * 
-     * @param sql DELETE sql to execute.
-     * 
-     * @throws CentralRepoException If there is an error.
-     */
-    void executeDeleteSQL(String sql) throws CentralRepoException;
-    
+    void executeQuery(String sql, List<Object> params, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException;
+
     /**
      * Get account type by type name.
-     * 
+     *
      * @param accountTypeName account type name to look for
      * @return CR account type
-     * @throws CentralRepoException 
+     * @throws CentralRepoException
      */
     CentralRepoAccountType getAccountTypeByName(String accountTypeName) throws CentralRepoException;
-     
+
     /**
      * Gets all account types.
-     * 
+     *
      * @return Collection of all CR account types in the database.
-     * 
-     * @throws CentralRepoException 
+     *
+     * @throws CentralRepoException
      */
     Collection<CentralRepoAccountType> getAllAccountTypes() throws CentralRepoException;
-    
+
     /**
-     * Get an account from the accounts table matching the given type/ID.  
+     * Get an account from the accounts table matching the given type/ID.
      * Inserts a row if one doesn't exists.
-     * 
+     *
      * @param crAccountType CR account type to look for or create
      * @param accountUniqueID type specific unique account id
      * @return CR account
      * 
-     * @throws CentralRepoException 
+     * @throws CentralRepoException  If there is an error accessing Central Repository.
+     * @throws InvalidAccountIDException If the account identifier is not valid.
      */
-    CentralRepoAccount getOrCreateAccount(CentralRepoAccount.CentralRepoAccountType crAccountType, String accountUniqueID) throws CentralRepoException;
-   
+    CentralRepoAccount getOrCreateAccount(CentralRepoAccount.CentralRepoAccountType crAccountType, String accountUniqueID) throws InvalidAccountIDException, CentralRepoException;
+    
+    /**
+     * Gets an account from the accounts table matching the given type/ID, if
+     * one exists.
+     *
+     * @param crAccountType   CR account type to look for or create
+     * @param accountUniqueID type specific unique account id
+     *
+     * @return CR account, if found, null otherwise.
+     *
+     * @throws CentralRepoException  If there is an error accessing Central Repository.
+     * @throws InvalidAccountIDException If the account identifier is not valid.
+     */
+    CentralRepoAccount getAccount(CentralRepoAccount.CentralRepoAccountType crAccountType, String accountUniqueID) throws InvalidAccountIDException, CentralRepoException;
+
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeNormalizer.java

@@ -19,12 +19,14 @@
  */
 package org.sleuthkit.autopsy.centralrepository.datamodel;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
-import org.sleuthkit.datamodel.CommunicationsUtils;
-import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Provides functions for normalizing data by attribute type before insertion or
@@ -40,7 +42,7 @@ final public class CorrelationAttributeNormalizer {
      * data is a valid string of the format expected given the attributeType.
      *
      * @param attributeType correlation type of data
-     * @param data          data to normalize
+     * @param data data to normalize
      *
      * @return normalized data
      */
@@ -94,7 +96,7 @@ final public class CorrelationAttributeNormalizer {
                 } catch (CentralRepoException ex) {
                     throw new CorrelationAttributeNormalizationException("Failed to get default correlation types.", ex);
                 }
-            }
+        }
     }
 
     /**
@@ -102,7 +104,7 @@ final public class CorrelationAttributeNormalizer {
      * is a valid string of the format expected given the attributeType.
      *
      * @param attributeTypeId correlation type of data
-     * @param data            data to normalize
+     * @param data data to normalize
      *
      * @return normalized data
      */
@@ -155,25 +157,43 @@ final public class CorrelationAttributeNormalizer {
 
     /**
      * Verify and normalize email address.
+     *
+     * @param emailAddress Address to normalize.
+     * @return Normalized email address.
+     * @throws CorrelationAttributeNormalizationExceptions If the input is not a
+     * valid email address.
+     *
      */
-    private static String normalizeEmail(String data) throws CorrelationAttributeNormalizationException {
-       try {
-           return CommunicationsUtils.normalizeEmailAddress(data);
-       }
-       catch(TskCoreException ex) {
-           throw new CorrelationAttributeNormalizationException(String.format("Data was expected to be a valid email address: %s", data), ex);
-       }
+    static String normalizeEmail(String emailAddress) throws CorrelationAttributeNormalizationException {
+        if (isValidEmailAddress(emailAddress)) {
+            return emailAddress.toLowerCase().trim();
+        } else {
+            throw new CorrelationAttributeNormalizationException(String.format("Data was expected to be a valid email address: %s", emailAddress));
+        }
     }
 
     /**
      * Verify and normalize phone number.
+     *
+     * @param phoneNumber Phone number to normalize.
+     * @return Normalized phone number.
+     * @throws CorrelationAttributeNormalizationExceptions If the input is not a
+     * valid phone number.
+     *
      */
-    private static String normalizePhone(String data) throws CorrelationAttributeNormalizationException {
-        try {
-             return CommunicationsUtils.normalizePhoneNum(data);
-        }
-        catch(TskCoreException ex) {
-            throw new CorrelationAttributeNormalizationException(String.format("Data was expected to be a valid phone number: %s", data));
+    static String normalizePhone(String phoneNumber) throws CorrelationAttributeNormalizationException {
+        if (isValidPhoneNumber(phoneNumber)) {
+            String normalizedNumber = phoneNumber.replaceAll("\\s+", ""); // remove spaces.	
+            normalizedNumber = normalizedNumber.replaceAll("[\\-()]", ""); // remove parens & dashes.
+
+            // ensure a min length
+            if (normalizedNumber.length() < MIN_PHONENUMBER_LEN) {
+                throw new CorrelationAttributeNormalizationException(String.format("Phone number string %s is too short ", phoneNumber));
+            }
+            return normalizedNumber;
+
+        } else {
+            throw new CorrelationAttributeNormalizationException(String.format("Data was expected to be a valid phone number: %s", phoneNumber));
         }
     }
 
@@ -196,7 +216,7 @@ final public class CorrelationAttributeNormalizer {
      * @return the unmodified data if the data was a valid length to be an SSID
      *
      * @throws CorrelationAttributeNormalizationException if the data was not a
-     *                                                    valid SSID
+     * valid SSID
      */
     private static String verifySsid(String data) throws CorrelationAttributeNormalizationException {
         if (data.length() <= 32) {
@@ -223,10 +243,10 @@ final public class CorrelationAttributeNormalizer {
      * @param data The string to normalize and validate
      *
      * @return the data with common number seperators removed and lower cased if
-     *         the data was determined to be a possible ICCID
+     * the data was determined to be a possible ICCID
      *
      * @throws CorrelationAttributeNormalizationException if the data was not a
-     *                                                    valid ICCID
+     * valid ICCID
      */
     private static String normalizeIccid(String data) throws CorrelationAttributeNormalizationException {
         final String validIccidRegex = "^89[f0-9]{17,22}$";
@@ -250,10 +270,10 @@ final public class CorrelationAttributeNormalizer {
      * @param data The string to normalize and validate
      *
      * @return the data with common number seperators removed if the data was
-     *         determined to be a possible IMSI
+     * determined to be a possible IMSI
      *
      * @throws CorrelationAttributeNormalizationException if the data was not a
-     *                                                    valid IMSI
+     * valid IMSI
      */
     private static String normalizeImsi(String data) throws CorrelationAttributeNormalizationException {
         final String validImsiRegex = "^[0-9]{14,15}$";
@@ -274,10 +294,10 @@ final public class CorrelationAttributeNormalizer {
      * @param data The string to normalize and validate
      *
      * @return the data with common number seperators removed and lowercased if
-     *         the data was determined to be a possible MAC
+     * the data was determined to be a possible MAC
      *
      * @throws CorrelationAttributeNormalizationException if the data was not a
-     *                                                    valid MAC
+     * valid MAC
      */
     private static String normalizeMac(String data) throws CorrelationAttributeNormalizationException {
         final String validMacRegex = "^([a-f0-9]{12}|[a-f0-9]{16})$";
@@ -303,10 +323,10 @@ final public class CorrelationAttributeNormalizer {
      * @param data The string to normalize and validate
      *
      * @return the data with common number seperators removed if the data was
-     *         determined to be a possible IMEI
+     * determined to be a possible IMEI
      *
      * @throws CorrelationAttributeNormalizationException if the data was not a
-     *                                                    valid IMEI
+     * valid IMEI
      */
     private static String normalizeImei(String data) throws CorrelationAttributeNormalizationException {
         final String validImeiRegex = "^[0-9]{14,16}$";
@@ -318,6 +338,58 @@ final public class CorrelationAttributeNormalizer {
         }
     }
 
+    // These symbols are allowed in written form of phone numbers.
+    // A '+' is allowed only as a leading digit and hence not inlcuded here.
+    // While a dialed sequence may have additonal special characters, such as #, * or ',',
+    // CR attributes represent accounts and hence those chatracter are not allowed.
+    private static final Set<String> PHONENUMBER_CHARS = new HashSet<>(Arrays.asList(
+            "-", "(", ")"
+    ));
+
+    private static final int MIN_PHONENUMBER_LEN = 5;
+
+    /**
+     * Checks if the given string is a valid phone number.
+     *
+     * @param phoneNumber String to check.
+     *
+     * @return True if the given string is a valid phone number, false
+     * otherwise.
+     */
+    static boolean isValidPhoneNumber(String phoneNumber) {
+
+        // A phone number may have a leading '+', special telephony chars, or digits.
+        // Anything else implies an invalid phone number.
+        for (int i = 0; i < phoneNumber.length(); i++) {
+            if ( !((i == 0 && phoneNumber.charAt(i) == '+')
+                    || Character.isSpaceChar(phoneNumber.charAt(i))
+                    || Character.isDigit(phoneNumber.charAt(i))
+                    || PHONENUMBER_CHARS.contains(String.valueOf(phoneNumber.charAt(i))))) {
+                return false;
+            } 
+        }
+
+        // ensure a min length
+        return phoneNumber.length() >= MIN_PHONENUMBER_LEN;
+    }
+
+    /**
+     * Checks if the given string is a valid email address.
+     *
+     * @param emailAddress String to check.
+     *
+     * @return True if the given string is a valid email address, false
+     * otherwise.
+     */
+    static boolean isValidEmailAddress(String emailAddress) {
+        if (!StringUtils.isEmpty(emailAddress)) {
+            EmailValidator validator = EmailValidator.getInstance(true, true);
+            return validator.isValid(emailAddress);
+        }
+
+        return false;
+    }
+
     /**
      * This is a utility class - no need for constructing or subclassing, etc...
      */

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java

@@ -34,8 +34,8 @@ 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.CommunicationsUtils;
 import org.sleuthkit.datamodel.HashUtility;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
@@ -184,7 +184,15 @@ public class CorrelationAttributeUtil {
                     makeCorrAttrsFromCommunicationArtifacts(correlationAttrs, sourceArtifact);
                 }
             }
-        } catch (CentralRepoException ex) {
+        } catch (CorrelationAttributeNormalizationException ex) {
+            logger.log(Level.WARNING, String.format("Error normalizing correlation attribute (%s)", artifact), ex); // NON-NLS
+            return correlationAttrs;
+        } 
+        catch (InvalidAccountIDException ex) {
+            logger.log(Level.WARNING, String.format("Invalid account identifier (artifactID: %d)", artifact.getId())); // NON-NLS
+            return correlationAttrs;
+        } 
+        catch (CentralRepoException ex) {
             logger.log(Level.SEVERE, String.format("Error querying central repository (%s)", artifact), ex); // NON-NLS
             return correlationAttrs;
         } catch (TskCoreException ex) {
@@ -198,18 +206,19 @@ public class CorrelationAttributeUtil {
     }
 
     /**
-     * Makes a correlation attribute instance from a phone number attribute of an
-     * artifact.
+     * Makes a correlation attribute instance from a phone number attribute of
+     * an artifact.
      *
      * @param corrAttrInstances Correlation attributes will be added to this.
      * @param artifact An artifact with a phone number attribute.
      *
-     * @throws TskCoreException     If there is an error querying the case
-     *                              database.
+     * @throws TskCoreException If there is an error querying the case database.
      * @throws CentralRepoException If there is an error querying the central
-     *                              repository.
+     * repository.
+     * @throws CorrelationAttributeNormalizationException If there is an error
+     * in normalizing the attribute.
      */
-    private static void makeCorrAttrsFromCommunicationArtifacts(List<CorrelationAttributeInstance> corrAttrInstances, BlackboardArtifact artifact) throws TskCoreException, CentralRepoException {
+    private static void makeCorrAttrsFromCommunicationArtifacts(List<CorrelationAttributeInstance> corrAttrInstances, BlackboardArtifact artifact) throws TskCoreException, CentralRepoException, CorrelationAttributeNormalizationException {
         CorrelationAttributeInstance corrAttr = null;
 
         /*
@@ -227,13 +236,13 @@ public class CorrelationAttributeUtil {
         /*
          * Normalize the phone number.
          */
-        if (value != null) {
-            if(CommunicationsUtils.isValidPhoneNumber(value)) {
-                value = CommunicationsUtils.normalizePhoneNum(value);
-                corrAttr = makeCorrAttr(artifact, CentralRepository.getInstance().getCorrelationTypeById(CorrelationAttributeInstance.PHONE_TYPE_ID), value);
-                if(corrAttr != null) {
-                    corrAttrInstances.add(corrAttr);
-                }
+        if (value != null
+                && CorrelationAttributeNormalizer.isValidPhoneNumber(value)) {
+
+            value = CorrelationAttributeNormalizer.normalizePhone(value);
+            corrAttr = makeCorrAttr(artifact, CentralRepository.getInstance().getCorrelationTypeById(CorrelationAttributeInstance.PHONE_TYPE_ID), value);
+            if (corrAttr != null) {
+                corrAttrInstances.add(corrAttr);
             }
         }
     }
@@ -277,7 +286,7 @@ public class CorrelationAttributeUtil {
      *
      * @return The correlation attribute instance.
      */
-    private static void makeCorrAttrFromAcctArtifact(List<CorrelationAttributeInstance> corrAttrInstances, BlackboardArtifact acctArtifact) throws TskCoreException, CentralRepoException {
+    private static void makeCorrAttrFromAcctArtifact(List<CorrelationAttributeInstance> corrAttrInstances, BlackboardArtifact acctArtifact) throws InvalidAccountIDException, TskCoreException, CentralRepoException {
 
         // Get the account type from the artifact
         BlackboardAttribute accountTypeAttribute = acctArtifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ACCOUNT_TYPE));

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java

@@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.TskDataException;
 
 /**
  *
- * Stores information about a Data Source in the correlation engine
+ * Stores information about a Data Source in the Central Repository
  *
  */
 public class CorrelationDataSource implements Serializable {

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java

@@ -24,11 +24,11 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle;
-import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
  * This class abstracts a persona.
@@ -42,11 +42,9 @@ public class Persona {
      * Defines level of confidence in assigning a persona to an account.
      */
     public enum Confidence {
-        UNKNOWN(1, "Unknown"),
-        LOW(2, "Low confidence"),
-        MEDIUM(3, "Medium confidence"),
-        HIGH(4, "High confidence"),
-        DERIVED(5, "Derived directly");
+        LOW(1, "Low confidence"),
+        MODERATE(2, "Moderate confidence"),
+        HIGH(3, "High confidence");
 
         private final String name;
         private final int level_id;
@@ -72,7 +70,7 @@ public class Persona {
                     return confidence;
                 }
             }
-            return Confidence.UNKNOWN;
+            return Confidence.LOW;
         }
 
     }
@@ -124,7 +122,7 @@ public class Persona {
     private final long modifiedDate;
     private final PersonaStatus status;
     private final CentralRepoExaminer examiner;
-    
+
     @NbBundle.Messages("Persona.defaultName=Unnamed")
     public static String getDefaultName() {
         return Bundle.Persona_defaultName();
@@ -202,16 +200,17 @@ public class Persona {
     /**
      * Creates a Persona and associates the specified account with it.
      *
-     * @param personaName Persona name.
-     * @param comment Comment to associate with persona, may be null.
-     * @param status Persona status
-     * @param account Account for which the persona is being created.
+     * @param personaName   Persona name.
+     * @param comment       Comment to associate with persona, may be null.
+     * @param status        Persona status
+     * @param account       Account for which the persona is being created.
      * @param justification Justification for why this account belongs to this
-     * persona, may be null.
-     * @param confidence Confidence level for this association of Persona &
-     * account.
+     *                      persona, may be null.
+     * @param confidence    Confidence level for this association of Persona &
+     *                      account.
      *
      * @return Persona Persona created.
+     *
      * @throws CentralRepoException If there is an error creating the Persona.
      */
     public static Persona createPersonaForAccount(String personaName, String comment, PersonaStatus status, CentralRepoAccount account, String justification, Persona.Confidence confidence) throws CentralRepoException {
@@ -223,83 +222,133 @@ public class Persona {
     /**
      * Inserts a row in the Persona tables.
      *
-     * @param name Persona name, may be null - default name is used in that
-     * case.
+     * @param name    Persona name, may be null - default name is used in that
+     *                case.
      * @param comment Comment to associate with persona, may be null.
-     * @param status Persona status.
+     * @param status  Persona status.
      *
      * @return Persona corresponding to the row inserted in the personas table.
      *
      * @throws CentralRepoException If there is an error in adding a row to
-     * personas table.
+     *                              personas table.
      */
     private static Persona createPersona(String name, String comment, PersonaStatus status) throws CentralRepoException {
         // generate a UUID for the persona
         String uuidStr = UUID.randomUUID().toString();
-        CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name"));
+        CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name"));
 
         Instant instant = Instant.now();
         Long timeStampMillis = instant.toEpochMilli();
-        String insertClause = " INTO personas (uuid, comment, name, created_date, modified_date, status_id, examiner_id ) "
-                + "VALUES ( '" + uuidStr + "', "
-                + "'" + ((StringUtils.isBlank(comment) ? "" : SleuthkitCase.escapeSingleQuotes(comment))) + "',"
-                + "'" + ((StringUtils.isBlank(name) ? getDefaultName() : SleuthkitCase.escapeSingleQuotes(name))) + "',"
-                + timeStampMillis.toString() + ","
-                + timeStampMillis.toString() + ","
-                + status.getStatusId() + ","
-                + examiner.getId()
-                + ")";
 
-        CentralRepository.getInstance().executeInsertSQL(insertClause);
+        String insertPersonaSQL = "INSERT INTO personas (uuid, comment, name, created_date, modified_date, status_id, examiner_id ) " //NON-NLS
+                + " VALUES (?, ?, ?, ?, ?, ?, ?)";
+        List<Object> params = new ArrayList<>();
+        params.add(uuidStr);
+        params.add(StringUtils.isBlank(comment) ? "" : comment);
+        params.add(StringUtils.isBlank(name) ? getDefaultName() : name);
+        params.add(timeStampMillis);
+        params.add(timeStampMillis);
+        params.add(status.getStatusId());
+        params.add(examiner.getId());
+
+        getCRInstance().executeCommand(insertPersonaSQL, params);
         return getPersonaByUUID(uuidStr);
     }
-    
+
+    /**
+     * Sets the comment of this persona.
+     *
+     * @param comment The new comment.
+     *
+     * @throws CentralRepoException If there is an error.
+     */
+    public void setComment(String comment) throws CentralRepoException {
+        String updateSQL = "UPDATE personas SET comment = ? WHERE id = ?";
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            List<Object> params = new ArrayList<>();
+            params.add(StringUtils.isBlank(comment) ? "" : comment);
+            params.add(id);
+
+            getCRInstance().executeCommand(updateSQL, params);
+        }
+    }
+
     /**
      * Sets the name of this persona
      *
      * @param name The new name.
-     * 
+     *
      * @throws CentralRepoException If there is an error.
      */
     public void setName(String name) throws CentralRepoException {
-        String updateClause = "UPDATE personas SET name = \"" + name + "\" WHERE id = " + id;
-        CentralRepository.getInstance().executeUpdateSQL(updateClause);
+        String updateSQL = "UPDATE personas SET name = ? WHERE id = ?";
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            List<Object> params = new ArrayList<>();
+            params.add(StringUtils.isBlank(name) ? getDefaultName() : name);
+            params.add(id);
+
+            getCRInstance().executeCommand(updateSQL, params);
+        }
     }
 
     /**
      * Associates an account with a persona by creating a row in the
      * PersonaAccounts table.
      *
-     * @param account Account to add to persona.
+     * @param account       Account to add to persona.
      * @param justification Reason for adding the account to persona, may be
-     * null.
-     * @param confidence Confidence level.
+     *                      null.
+     * @param confidence    Confidence level.
      *
      * @return PersonaAccount
+     *
      * @throws CentralRepoException If there is an error.
      */
     public PersonaAccount addAccount(CentralRepoAccount account, String justification, Persona.Confidence confidence) throws CentralRepoException {
         return PersonaAccount.addPersonaAccount(this, account, justification, confidence);
     }
-    
+
     /**
      * Removes the given PersonaAccount (persona/account association)
      *
      * @param account account to remove
      *
      * @throws CentralRepoException If there is an error in querying the
-     * Personas table.
+     *                              Personas table.
      */
     public void removeAccount(PersonaAccount account) throws CentralRepoException {
         PersonaAccount.removePersonaAccount(account.getId());
     }
-    
+
+    /**
+     * Modifies the confidence / justification of the given PersonaAccount
+     *
+     * @param account       Account to modify.
+     * @param confidence    Level of confidence.
+     * @param justification Justification.
+     *
+     * @throws CentralRepoException If there is an error in querying the
+     *                              Personas table.
+     */
+    public void modifyAccount(PersonaAccount account, Confidence confidence, String justification) throws CentralRepoException {
+        PersonaAccount.modifyPersonaAccount(account.getId(), confidence, justification);
+    }
+
     /**
      * Marks this persona as deleted
      */
     public void delete() throws CentralRepoException {
-        String deleteSQL = "UPDATE personas SET status_id = " + PersonaStatus.DELETED.status_id + " WHERE id = " + this.id;
-        CentralRepository.getInstance().executeUpdateSQL(deleteSQL);
+        String deleteSQL = "UPDATE personas SET status_id = ? WHERE id = ?";
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            List<Object> params = new ArrayList<>();
+            params.add(PersonaStatus.DELETED.getStatusId());
+            params.add(id);
+
+            getCRInstance().executeCommand(deleteSQL, params);
+        }
     }
 
     /**
@@ -307,7 +356,7 @@ public class Persona {
      */
     private static class PersonaQueryCallback implements CentralRepositoryDbQueryCallback {
 
-        private final Collection<Persona> personaList =  new ArrayList<>();
+        private final Collection<Persona> personaList = new ArrayList<>();
 
         @Override
         public void process(ResultSet rs) throws SQLException {
@@ -328,7 +377,7 @@ public class Persona {
                         status,
                         examiner
                 );
-                
+
                 personaList.add(persona);
             }
         }
@@ -340,86 +389,166 @@ public class Persona {
 
     // Partial query string to select from personas table, 
     // just supply the where clause.
-    private static final String PERSONA_QUERY = 
-                  "SELECT p.id, p.uuid, p.name, p.comment, p.created_date, p.modified_date, p.status_id, p.examiner_id, e.login_name, e.display_name "
-                + "FROM personas as p "
-                + "INNER JOIN examiners as e ON e.id = p.examiner_id ";
-              
-     
+    private static final String PERSONA_QUERY
+            = "SELECT p.id, p.uuid, p.name, p.comment, p.created_date, p.modified_date, p.status_id, p.examiner_id, e.login_name, e.display_name "
+            + "FROM personas as p "
+            + "INNER JOIN examiners as e ON e.id = p.examiner_id ";
+
     /**
      * Gets the row from the Personas table with the given UUID, creates and
      * returns the Persona from that data.
      *
      * @param uuid Persona UUID to match.
+     *
      * @return Persona matching the given UUID, may be null if no match is
-     * found.
+     *         found.
      *
      * @throws CentralRepoException If there is an error in querying the
-     * Personas table.
+     *                              Personas table.
      */
     private static Persona getPersonaByUUID(String uuid) throws CentralRepoException {
 
-        String queryClause = 
-                PERSONA_QUERY
-                + "WHERE p.uuid = '" + uuid + "'";
+        String queryClause
+                = PERSONA_QUERY
+                + "WHERE p.uuid = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(uuid);
 
         PersonaQueryCallback queryCallback = new PersonaQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        getCRInstance().executeQuery(queryClause, params, queryCallback);
 
         Collection<Persona> personas = queryCallback.getPersonas();
-        
+
         return personas.isEmpty() ? null : personas.iterator().next();
     }
 
     /**
-     * Gets the rows from the Personas table with matching name. 
-     * Persona marked as DELETED are not returned.
+     * Gets the rows from the Personas table with matching name. Persona marked
+     * as DELETED are not returned.
      *
      * @param partialName Name substring to match.
+     *
      * @return Collection of personas matching the given name substring, may be
-     * empty if no match is found.
+     *         empty if no match is found.
      *
      * @throws CentralRepoException If there is an error in querying the
-     * Personas table.
+     *                              Personas table.
      */
     public static Collection<Persona> getPersonaByName(String partialName) throws CentralRepoException {
 
         String queryClause = PERSONA_QUERY
-                + "WHERE p.status_id != " + PersonaStatus.DELETED.status_id + 
-                " AND LOWER(p.name) LIKE " + "LOWER('%" + partialName + "%')" ;
+                + "WHERE p.status_id != ? "
+                + " AND LOWER(p.name) LIKE LOWER(?) ESCAPE '!'";
+
+        List<Object> params = new ArrayList<>();
+        params.add(PersonaStatus.DELETED.getStatusId());
+        params.add("%" + getLikeEscaped(partialName) + "%"); // partial substring search
 
         PersonaQueryCallback queryCallback = new PersonaQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        getCRInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getPersonas();
     }
-    
+
+    /**
+     * Escapes string for use with like statements removing '%', '_', '\'. This
+     * uses '!' as the escape character and the sql should reflect this
+     * accordingly. See
+     * https://stackoverflow.com/questions/8247970/using-like-wildcard-in-prepared-statement,
+     * https://www.postgresql.org/docs/8.3/functions-matching.html and
+     * https://www.sqlite.org/lang_expr.html for more information.
+     *
+     * @param initial The initial string.
+     *
+     * @return The resulting string.
+     */
+    private static String getLikeEscaped(String initial) {
+        if (initial == null) {
+            return null;
+        }
+
+        return initial
+                .replace("!", "!!")
+                .replace("%", "!%")
+                .replace("_", "!_");
+    }
+
+    /**
+     * Gets the rows from the Personas table where persona accounts' names are
+     * similar to the given one. Persona marked as DELETED are not returned.
+     *
+     * @param partialName Name substring to match.
+     *
+     * @return Collection of personas matching the given name substring, may be
+     *         empty if no match is found.
+     *
+     * @throws CentralRepoException If there is an error in querying the
+     *                              Personas table.
+     */
+    public static Collection<Persona> getPersonaByAccountIdentifierLike(String partialName) throws CentralRepoException {
+        String queryClause = "SELECT p.id, p.uuid, p.name, p.comment, p.created_date, p.modified_date, p.status_id, p.examiner_id, e.login_name\n"
+                + "FROM personas p\n"
+                + "LEFT JOIN examiners e ON e.id = p.examiner_id\n"
+                + "WHERE p.status_id <> ?\n"
+                + "AND p.id IN (\n"
+                + "	SELECT pa.persona_id\n"
+                + "	FROM persona_accounts pa\n"
+                + "	INNER JOIN accounts a ON a.id = pa.account_id\n"
+                + "	WHERE LOWER(a.account_unique_identifier) LIKE LOWER(?) ESCAPE '!'\n"
+                + ")";
+
+        PersonaQueryCallback queryCallback = new PersonaQueryCallback();
+
+        List<Object> params = new ArrayList<>();
+        params.add(PersonaStatus.DELETED.getStatusId());
+        params.add("%" + getLikeEscaped(partialName) + "%"); // partial substring search
+
+        getCRInstance().executeQuery(queryClause, params, queryCallback);
+        return queryCallback.getPersonas();
+    }
+
     /**
      * Creates an alias for the Persona.
      *
-     * @param alias Alias name.
+     * @param alias         Alias name.
      * @param justification Reason for assigning the alias, may be null.
-     * @param confidence Confidence level.
+     * @param confidence    Confidence level.
      *
      * @return PersonaAlias
+     *
      * @throws CentralRepoException If there is an error in creating the alias.
      */
     public PersonaAlias addAlias(String alias, String justification, Persona.Confidence confidence) throws CentralRepoException {
         return PersonaAlias.addPersonaAlias(this, alias, justification, confidence);
     }
-    
+
     /**
-     * Removes the given alias
+     * Removes the given alias.
      *
      * @param alias alias to remove
      *
      * @throws CentralRepoException If there is an error in querying the
-     * Personas table.
+     *                              Personas table.
      */
     public void removeAlias(PersonaAlias alias) throws CentralRepoException {
         PersonaAlias.removePersonaAlias(alias);
     }
 
+    /**
+     * Modifies the given alias.
+     *
+     * @param key           Key for the alias to modify.
+     * @param confidence    Level of confidence.
+     * @param justification Justification.
+     *
+     * @throws CentralRepoException If there is an error in querying the
+     *                              Personas table.
+     */
+    public void modifyAlias(PersonaAlias key, Confidence confidence, String justification) throws CentralRepoException {
+        PersonaAlias.modifyPersonaAlias(key, confidence, justification);
+    }
+
     /**
      * Gets all aliases for the persona.
      *
@@ -434,30 +563,45 @@ public class Persona {
     /**
      * Adds specified metadata to the persona.
      *
-     * @param name Metadata name.
-     * @param value Metadata value.
+     * @param name          Metadata name.
+     * @param value         Metadata value.
      * @param justification Reason for adding the metadata, may be null.
-     * @param confidence Confidence level.
+     * @param confidence    Confidence level.
      *
      * @return PersonaMetadata
+     *
      * @throws CentralRepoException If there is an error in adding metadata.
      */
     public PersonaMetadata addMetadata(String name, String value, String justification, Persona.Confidence confidence) throws CentralRepoException {
         return PersonaMetadata.addPersonaMetadata(this.getId(), name, value, justification, confidence);
     }
-    
+
     /**
-     * Removes the given metadata from this persona
+     * Removes the given metadata from this persona.
      *
      * @param metadata metadata to remove
      *
      * @throws CentralRepoException If there is an error in querying the
-     * Personas table.
+     *                              Personas table.
      */
     public void removeMetadata(PersonaMetadata metadata) throws CentralRepoException {
         PersonaMetadata.removePersonaMetadata(metadata);
     }
 
+    /**
+     * Modifies the given metadata.
+     *
+     * @param key           Key for the metadata to modify.
+     * @param confidence    Level of confidence.
+     * @param justification Justification.
+     *
+     * @throws CentralRepoException If there is an error in querying the
+     *                              Personas table.
+     */
+    public void modifyMetadata(PersonaMetadata key, Confidence confidence, String justification) throws CentralRepoException {
+        PersonaMetadata.modifyPersonaMetadata(key, confidence, justification);
+    }
+
     /**
      * Gets all metadata for the persona.
      *
@@ -475,12 +619,12 @@ public class Persona {
      * @return Collection of PersonaAccounts, may be empty.
      *
      * @throws CentralRepoException If there is an error in getting the
-     * persona_account.
+     *                              persona_account.
      */
     public Collection<PersonaAccount> getPersonaAccounts() throws CentralRepoException {
         return PersonaAccount.getPersonaAccountsForPersona(this.getId());
     }
- 
+
     /**
      * Callback to process a query that gets cases for account instances of an
      * account
@@ -494,7 +638,7 @@ public class Persona {
 
             while (resultSet.next()) {
                 // get Case for case_id
-                CorrelationCase correlationCase = CentralRepository.getInstance().getCaseById(resultSet.getInt("case_id"));
+                CorrelationCase correlationCase = getCRInstance().getCaseById(resultSet.getInt("case_id"));
                 correlationCases.add(correlationCase);
             }
         }
@@ -508,8 +652,9 @@ public class Persona {
      * Gets a list of cases that the persona appears in.
      *
      * @return Collection of cases that the persona appears in, may be empty.
+     *
      * @throws CentralRepoException If there is an error in getting the cases
-     * from the database.
+     *                              from the database.
      */
     public Collection<CorrelationCase> getCases() throws CentralRepoException {
 
@@ -519,14 +664,17 @@ public class Persona {
         Collection<CentralRepoAccount> accounts = PersonaAccount.getAccountsForPersona(this.getId());
         for (CentralRepoAccount account : accounts) {
             int corrTypeId = account.getAccountType().getCorrelationTypeId();
-            CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId);
+            CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId);
 
             String tableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType);
             String querySql = "SELECT DISTINCT case_id FROM " + tableName
-                    + " WHERE account_id = " + account.getId();
+                    + " WHERE account_id = ?"; // param 1
+
+            List<Object> params = new ArrayList<>();
+            params.add(account.getId());
 
             CaseForAccountInstanceQueryCallback queryCallback = new CaseForAccountInstanceQueryCallback();
-            CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback);
+            getCRInstance().executeQuery(querySql, params, queryCallback);
 
             // Add any cases that aren't already on the list.
             for (CorrelationCase corrCase : queryCallback.getCases()) {
@@ -553,8 +701,8 @@ public class Persona {
             while (resultSet.next()) {
                 // get Case for case_id
 
-                CorrelationCase correlationCase = CentralRepository.getInstance().getCaseById(resultSet.getInt("case_id"));
-                CorrelationDataSource correlationDatasource = CentralRepository.getInstance().getDataSourceById(correlationCase, resultSet.getInt("data_source_id"));
+                CorrelationCase correlationCase = getCRInstance().getCaseById(resultSet.getInt("case_id"));
+                CorrelationDataSource correlationDatasource = getCRInstance().getDataSourceById(correlationCase, resultSet.getInt("data_source_id"));
 
                 // Add data source to list if not already on it.
                 if (!correlationDataSources.stream().anyMatch(p -> Objects.equals(p.getDataSourceObjectID(), correlationDatasource.getDataSourceObjectID()))) {
@@ -572,7 +720,7 @@ public class Persona {
      * Gets all data sources that the persona appears in.
      *
      * @return Collection of data sources that the persona appears in, may be
-     * empty.
+     *         empty.
      *
      * @throws CentralRepoException
      */
@@ -582,14 +730,17 @@ public class Persona {
         Collection<CentralRepoAccount> accounts = PersonaAccount.getAccountsForPersona(this.getId());
         for (CentralRepoAccount account : accounts) {
             int corrTypeId = account.getAccountType().getCorrelationTypeId();
-            CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId);
+            CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId);
 
             String tableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType);
             String querySql = "SELECT case_id, data_source_id FROM " + tableName
-                    + " WHERE account_id = " + account.getId();
+                    + " WHERE account_id = ?";  // param 1
+
+            List<Object> params = new ArrayList<>();
+            params.add(account.getId());
 
             DatasourceForAccountInstanceQueryCallback queryCallback = new DatasourceForAccountInstanceQueryCallback();
-            CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback);
+            getCRInstance().executeQuery(querySql, params, queryCallback);
 
             // Add any data sources that aren't already on the list.
             for (CorrelationDataSource correlationDatasource : queryCallback.getDataSources()) {
@@ -646,13 +797,15 @@ public class Persona {
      * the X_instance table for the given account type.
      *
      * @param crAccountType Account type to generate the query string for.
+     *
      * @return Query substring.
+     *
      * @throws CentralRepoException
      */
     private static String getPersonaFromInstanceTableQueryTemplate(CentralRepoAccount.CentralRepoAccountType crAccountType) throws CentralRepoException {
 
         int corrTypeId = crAccountType.getCorrelationTypeId();
-        CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId);
+        CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId);
 
         String instanceTableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType);
         return "SELECT " + instanceTableName + ".account_id, case_id, data_source_id, "
@@ -671,20 +824,25 @@ public class Persona {
      * @param correlationCase Case to look the persona in.
      *
      * @return Collection of personas, may be empty.
+     *
      * @throws CentralRepoException
      */
     public static Collection<Persona> getPersonasForCase(CorrelationCase correlationCase) throws CentralRepoException {
         Collection<Persona> personaList = new ArrayList<>();
 
-        Collection<CentralRepoAccount.CentralRepoAccountType> accountTypes = CentralRepository.getInstance().getAllAccountTypes();
+        Collection<CentralRepoAccount.CentralRepoAccountType> accountTypes = getCRInstance().getAllAccountTypes();
         for (CentralRepoAccount.CentralRepoAccountType crAccountType : accountTypes) {
 
             String querySql = getPersonaFromInstanceTableQueryTemplate(crAccountType)
-                    + " WHERE case_id = " + correlationCase.getID()
-                    + "AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
+                    + " WHERE case_id = ?" // param 1
+                    + " AND personas.status_id != ?"; // param 2
+
+            List<Object> params = new ArrayList<>();
+            params.add(correlationCase.getID());
+            params.add(Persona.PersonaStatus.DELETED.getStatusId());
 
             PersonaFromAccountInstanceQueryCallback queryCallback = new PersonaFromAccountInstanceQueryCallback();
-            CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback);
+            getCRInstance().executeQuery(querySql, params, queryCallback);
 
             // Add persona that aren't already on the list.
             for (Persona persona : queryCallback.getPersonasList()) {
@@ -703,20 +861,25 @@ public class Persona {
      * @param dataSource Data source to look the persona in.
      *
      * @return Collection of personas, may be empty.
+     *
      * @throws CentralRepoException
      */
     public static Collection<Persona> getPersonasForDataSource(CorrelationDataSource dataSource) throws CentralRepoException {
         Collection<Persona> personaList = new ArrayList<>();
 
-        Collection<CentralRepoAccount.CentralRepoAccountType> accountTypes = CentralRepository.getInstance().getAllAccountTypes();
+        Collection<CentralRepoAccount.CentralRepoAccountType> accountTypes = getCRInstance().getAllAccountTypes();
         for (CentralRepoAccount.CentralRepoAccountType crAccountType : accountTypes) {
 
             String querySql = getPersonaFromInstanceTableQueryTemplate(crAccountType)
-                    + " WHERE data_source_id = " + dataSource.getID()
-                    + "AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
+                    + " WHERE data_source_id = ?"
+                    + " AND personas.status_id != ?";
+
+            List<Object> params = new ArrayList<>();
+            params.add(dataSource.getID());
+            params.add(Persona.PersonaStatus.DELETED.getStatusId());
 
             PersonaFromAccountInstanceQueryCallback queryCallback = new PersonaFromAccountInstanceQueryCallback();
-            CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback);
+            getCRInstance().executeQuery(querySql, params, queryCallback);
 
             // Add persona that aren't already on the list.
             for (Persona persona : queryCallback.getPersonasList()) {
@@ -728,4 +891,22 @@ public class Persona {
         }
         return personaList;
     }
+
+    /**
+     * Wraps the call to CentralRepository.getInstance() throwing an exception
+     * if instance is null;
+     *
+     * @return Instance of CentralRepository
+     *
+     * @throws CentralRepoException
+     */
+    private static CentralRepository getCRInstance() throws CentralRepoException {
+        CentralRepository instance = CentralRepository.getInstance();
+
+        if (instance == null) {
+            throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null");
+        }
+
+        return instance;
+    }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java

@@ -24,9 +24,9 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.Account;
 
 /**
@@ -127,38 +127,41 @@ public class PersonaAccount {
      * @param confidence Confidence level.
      *
      * @return PersonaAccount
+     *
      * @throws CentralRepoException If there is an error in creating the
      * account.
      */
     static PersonaAccount addPersonaAccount(Persona persona, CentralRepoAccount account, String justification, Persona.Confidence confidence) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
-        
-        if(cr == null) {
-            throw new CentralRepoException("Failed to add Persona, Central Repository is not enable");
-        } 
-        
-        CentralRepoExaminer currentExaminer = cr.getOrInsertExaminer(System.getProperty("user.name"));
+        CentralRepoExaminer currentExaminer = getCRInstance().getOrInsertExaminer(System.getProperty("user.name"));
 
         Instant instant = Instant.now();
         Long timeStampMillis = instant.toEpochMilli();
-        String insertClause = " INTO persona_accounts (persona_id, account_id, justification, confidence_id, date_added, examiner_id ) "
-                + "VALUES ( "
-                + persona.getId() + ", "
-                + account.getId() + ", "
-                + "'" + ((StringUtils.isBlank(justification) ? "" : SleuthkitCase.escapeSingleQuotes(justification))) + "', "
-                + confidence.getLevelId() + ", "
-                + timeStampMillis.toString() + ", "
-                + currentExaminer.getId()
-                + ")";
 
-        CentralRepository.getInstance().executeInsertSQL(insertClause);
+        String insertSQL = "INSERT INTO persona_accounts (persona_id, account_id, justification, confidence_id, date_added, examiner_id ) "
+                + " VALUES ( ?, ?, ?, ?, ?, ?)";
+
+        List<Object> params = new ArrayList<>();
+        params.add(persona.getId());
+        params.add(account.getId());
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(confidence.getLevelId());
+        params.add(timeStampMillis);
+        params.add(currentExaminer.getId());
+
+        getCRInstance().executeCommand(insertSQL, params);
+
+        String querySQL = PERSONA_ACCOUNTS_QUERY_CLAUSE
+                + "WHERE persona_id = ? "
+                + " AND account_type_id = ?"
+                + " AND account_unique_identifier = ?";
+
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(persona.getId());
+        queryParams.add(account.getAccountType().getAccountTypeId());
+        queryParams.add(account.getIdentifier());
 
-        String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE
-                + "WHERE persona_id = " + persona.getId()
-                + " AND account_type_id = " + account.getAccountType().getAccountTypeId()
-                + " AND account_unique_identifier = \"" + account.getIdentifier() + "\"";
         PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        getCRInstance().executeQuery(querySQL, queryParams, queryCallback);
 
         Collection<PersonaAccount> accounts = queryCallback.getPersonaAccountsList();
         if (accounts.size() != 1) {
@@ -203,7 +206,7 @@ public class PersonaAccount {
                 );
 
                 // create account
-                CentralRepoAccount.CentralRepoAccountType crAccountType = CentralRepository.getInstance().getAccountTypeByName(rs.getString("type_name"));
+                CentralRepoAccount.CentralRepoAccountType crAccountType = getCRInstance().getAccountTypeByName(rs.getString("type_name"));
                 CentralRepoAccount account = new CentralRepoAccount(
                         rs.getInt("account_id"),
                         crAccountType,
@@ -226,7 +229,7 @@ public class PersonaAccount {
     };
 
     // Query clause  to select from persona_accounts table to create PersonaAccount(s)
-    private static final String PERSONA_ACCOUNTS_QUERY_CALUSE = "SELECT persona_accounts.id as persona_accounts_id, justification, confidence_id, date_added, persona_accounts.examiner_id as pa_examiner_id, pa_examiner.login_name as pa_examiner_login_name, pa_examiner.display_name as pa_examiner_display_name,"
+    private static final String PERSONA_ACCOUNTS_QUERY_CLAUSE = "SELECT persona_accounts.id as persona_accounts_id, justification, confidence_id, date_added, persona_accounts.examiner_id as pa_examiner_id, pa_examiner.login_name as pa_examiner_login_name, pa_examiner.display_name as pa_examiner_display_name,"
             + " personas.id as persona_id, personas.uuid, personas.name, personas.comment, personas.created_date, personas.modified_date, personas.status_id, "
             + " personas.examiner_id as persona_examiner_id, persona_examiner.login_name as persona_examiner_login_name, persona_examiner.display_name as persona_examiner_display_name, "
             + " accounts.id as account_id, account_type_id, account_unique_identifier,"
@@ -246,22 +249,19 @@ public class PersonaAccount {
      * @return Collection of PersonaAccounts, may be empty.
      *
      * @throws CentralRepoException If there is an error in getting the
-     *                              persona_account.
+     * persona_account.
      */
     static Collection<PersonaAccount> getPersonaAccountsForPersona(long personaId) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
+        String querySQL = PERSONA_ACCOUNTS_QUERY_CLAUSE
+                + " WHERE persona_accounts.persona_id = ?";
 
-        if (cr != null) {
-            String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE
-                    + " WHERE persona_accounts.persona_id = " + personaId;
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(personaId);
 
-            PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
+        getCRInstance().executeQuery(querySQL, queryParams, queryCallback);
 
-            return queryCallback.getPersonaAccountsList();
-        }
-
-        return new ArrayList<>();
+        return queryCallback.getPersonaAccountsList();
     }
 
     /**
@@ -272,23 +272,20 @@ public class PersonaAccount {
      * @return Collection of PersonaAccounts. may be empty.
      *
      * @throws CentralRepoException If there is an error in getting the
-     *                              persona_account.
+     * persona_account.
      */
     public static Collection<PersonaAccount> getPersonaAccountsForAccount(long accountId) throws CentralRepoException {
-        String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE
-                + " WHERE persona_accounts.account_id = " + accountId
-                + "AND p.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
+        String querySQL = PERSONA_ACCOUNTS_QUERY_CLAUSE
+                + " WHERE persona_accounts.account_id = ?"
+                + " AND personas.status_id != ?";
 
-        CentralRepository cr = CentralRepository.getInstance();
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(accountId);
+        queryParams.add(Persona.PersonaStatus.DELETED.getStatusId());
 
-        if (cr != null) {
-            PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
-
-            return queryCallback.getPersonaAccountsList();
-        }
-
-        return new ArrayList<>();
+        PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
+        getCRInstance().executeQuery(querySQL, queryParams, queryCallback);
+        return queryCallback.getPersonaAccountsList();
     }
 
     /**
@@ -296,27 +293,25 @@ public class PersonaAccount {
      * account identifier substring.
      *
      * @param accountIdentifierSubstring Account identifier substring to search
-     *                                   for.
+     * for.
      *
      * @return Collection of PersonaAccounts. may be empty.
      *
      * @throws CentralRepoException If there is an error in getting the
-     *                              persona_account.
+     * persona_account.
      */
     public static Collection<PersonaAccount> getPersonaAccountsForIdentifierLike(String accountIdentifierSubstring) throws CentralRepoException {
-        String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE
-                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + accountIdentifierSubstring + "%')"
-                + "AND p.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
+        String querySQL = PERSONA_ACCOUNTS_QUERY_CLAUSE
+                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER(?)"
+                + " AND personas.status_id != ?";
 
-        CentralRepository cr = CentralRepository.getInstance();
-        if (cr != null) {
-            PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add("%" + accountIdentifierSubstring + "%"); // substring match
+        queryParams.add(Persona.PersonaStatus.DELETED.getStatusId());
 
-            return queryCallback.getPersonaAccountsList();
-        }
-
-        return new ArrayList<>();
+        PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
+        getCRInstance().executeQuery(querySQL, queryParams, queryCallback);
+        return queryCallback.getPersonaAccountsList();
     }
 
     /**
@@ -325,22 +320,24 @@ public class PersonaAccount {
      * @param account Account to search for.
      *
      * @return Collection of PersonaAccounts, maybe empty if none were found or
-     *         CR is not enabled.
+     * CR is not enabled.
      *
      * @throws CentralRepoException
      */
     public static Collection<PersonaAccount> getPersonaAccountsForAccount(Account account) throws CentralRepoException {
-        String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE
-                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + account.getTypeSpecificID() + "%') AND type_name = '" + account.getAccountType().getTypeName() + "' ";
+        String querySQL = PERSONA_ACCOUNTS_QUERY_CLAUSE
+                + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER(?)"
+                + " AND type_name = ?"
+                + " AND personas.status_id != ?";
 
-        CentralRepository cr = CentralRepository.getInstance();
-        if (cr != null) {
-            PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
-            return queryCallback.getPersonaAccountsList();
-        }
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add("%" + account.getTypeSpecificID() + "%"); // substring match
+        queryParams.add(account.getAccountType().getTypeName());
+        queryParams.add(Persona.PersonaStatus.DELETED.getStatusId());
 
-        return new ArrayList<>();
+        PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
+        getCRInstance().executeQuery(querySQL, queryParams, queryCallback);
+        return queryCallback.getPersonaAccountsList();
     }
 
     /**
@@ -352,14 +349,30 @@ public class PersonaAccount {
      * account.
      */
     static void removePersonaAccount(long id) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
-        
-        if(cr == null) {
-            throw new CentralRepoException("Failed to remove persona account, Central Repo is not enabled");
-        }
-        
-        String deleteClause = " DELETE FROM persona_accounts WHERE id = " + id;
-        cr.executeDeleteSQL(deleteClause);
+        String deleteSQL = " DELETE FROM persona_accounts WHERE id = ?";
+        List<Object> params = new ArrayList<>();
+        params.add(id);
+
+        getCRInstance().executeCommand(deleteSQL, params);
+    }
+
+    /**
+     * Modifies the PersonaAccount row by the given id
+     *
+     * @param id row id for the account to be removed
+     *
+     * @throws CentralRepoException If there is an error in removing the
+     * account.
+     */
+    static void modifyPersonaAccount(long id, Persona.Confidence confidence, String justification) throws CentralRepoException {
+        String updateSQL = "UPDATE persona_accounts SET confidence_id = ?, justification = ? WHERE id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(confidence.getLevelId());
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(id);
+
+        getCRInstance().executeCommand(updateSQL, params);
     }
 
     /**
@@ -376,7 +389,7 @@ public class PersonaAccount {
             while (rs.next()) {
 
                 // create account
-                CentralRepoAccount.CentralRepoAccountType crAccountType = CentralRepository.getInstance().getAccountTypeByName(rs.getString("type_name"));
+                CentralRepoAccount.CentralRepoAccountType crAccountType = getCRInstance().getAccountTypeByName(rs.getString("type_name"));
                 CentralRepoAccount account = new CentralRepoAccount(
                         rs.getInt("account_id"),
                         crAccountType,
@@ -398,27 +411,43 @@ public class PersonaAccount {
      *
      * @return Collection of all accounts associated with the given persona, may
      * be empty.
+     *
      * @throws CentralRepoException If there is an error in getting the
      * accounts.
      */
     static Collection<CentralRepoAccount> getAccountsForPersona(long personaId) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
+        String queryClause = "SELECT account_id,  "
+                + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier,"
+                + " account_types.type_name as type_name "
+                + " FROM persona_accounts "
+                + " JOIN accounts as accounts on persona_accounts.account_id = accounts.id "
+                + " JOIN account_types as account_types on accounts.account_type_id = account_types.id "
+                + " WHERE persona_accounts.persona_id = ?";
 
-        if (cr != null) {
-            String queryClause = "SELECT account_id,  "
-                    + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier,"
-                    + " account_types.type_name as type_name "
-                    + " FROM persona_accounts "
-                    + " JOIN accounts as accounts on persona_accounts.account_id = accounts.id "
-                    + " JOIN account_types as account_types on accounts.account_type_id = account_types.id "
-                    + " WHERE persona_accounts.persona_id = " + personaId;
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(personaId);
 
-            AccountsForPersonaQueryCallback queryCallback = new AccountsForPersonaQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        AccountsForPersonaQueryCallback queryCallback = new AccountsForPersonaQueryCallback();
+        getCRInstance().executeQuery(queryClause, queryParams, queryCallback);
 
-            return queryCallback.getAccountsList();
+        return queryCallback.getAccountsList();
+    }
+
+    /**
+     * Wraps the call to CentralRepository.getInstance() throwing an exception
+     * if instance is null;
+     *
+     * @return Instance of CentralRepository
+     *
+     * @throws CentralRepoException
+     */
+    private static CentralRepository getCRInstance() throws CentralRepoException {
+        CentralRepository instance = CentralRepository.getInstance();
+
+        if (instance == null) {
+            throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null");
         }
 
-        return new ArrayList<>();
+        return instance;
     }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAlias.java

@@ -24,21 +24,21 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
- * This class abstracts an alias assigned to a Persona.
- * A Persona may have multiple aliases.
- * 
+ * This class abstracts an alias assigned to a Persona. A Persona may have
+ * multiple aliases.
+ *
  */
 public class PersonaAlias {
-    
-    private static final String SELECT_QUERY_BASE = 
-            "SELECT pa.id, pa.persona_id, pa.alias, pa.justification, pa.confidence_id, pa.date_added, pa.examiner_id, e.login_name, e.display_name "
-                + "FROM persona_alias as pa "
-                + "INNER JOIN examiners as e ON e.id = pa.examiner_id ";
-    
+
+    private static final String SELECT_QUERY_BASE
+            = "SELECT pa.id, pa.persona_id, pa.alias, pa.justification, pa.confidence_id, pa.date_added, pa.examiner_id, e.login_name, e.display_name "
+            + "FROM persona_alias as pa "
+            + "INNER JOIN examiners as e ON e.id = pa.examiner_id ";
+
     private final long id;
     private final long personaId;
     private final String alias;
@@ -46,7 +46,7 @@ public class PersonaAlias {
     private final Persona.Confidence confidence;
     private final long dateAdded;
     private final CentralRepoExaminer examiner;
-    
+
     public long getId() {
         return id;
     }
@@ -74,7 +74,7 @@ public class PersonaAlias {
     public CentralRepoExaminer getExaminer() {
         return examiner;
     }
-    
+
     public PersonaAlias(long id, long personaId, String alias, String justification, Persona.Confidence confidence, long dateAdded, CentralRepoExaminer examiner) {
         this.id = id;
         this.personaId = personaId;
@@ -84,8 +84,8 @@ public class PersonaAlias {
         this.dateAdded = dateAdded;
         this.examiner = examiner;
     }
-    
-     /**
+
+    /**
      * Creates an alias for the specified Persona.
      *
      * @param persona Persona for which the alias is being added.
@@ -98,40 +98,47 @@ public class PersonaAlias {
      */
     static PersonaAlias addPersonaAlias(Persona persona, String alias, String justification, Persona.Confidence confidence) throws CentralRepoException {
 
-        CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name"));
+        CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name"));
 
         Instant instant = Instant.now();
         Long timeStampMillis = instant.toEpochMilli();
 
-        String insertClause = " INTO persona_alias (persona_id, alias, justification, confidence_id, date_added, examiner_id ) "
-                + "VALUES ( "
-                + persona.getId() + ", "
-                + "'" + alias + "', "
-                + "'" + ((StringUtils.isBlank(justification) ? "" : SleuthkitCase.escapeSingleQuotes(justification))) + "', "
-                + confidence.getLevelId() + ", "
-                + timeStampMillis.toString() + ", "
-                + examiner.getId()
-                + ")";
+        String insertSQL = "INSERT INTO persona_alias (persona_id, alias, justification, confidence_id, date_added, examiner_id ) "
+                + " VALUES ( ?, ?, ?, ?, ?, ?)";
+
+        List<Object> params = new ArrayList<>();
+        params.add(persona.getId());
+        params.add(alias);
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(confidence.getLevelId());
+        params.add(timeStampMillis);
+        params.add(examiner.getId());
+
+        getCRInstance().executeCommand(insertSQL, params);
 
-        CentralRepository.getInstance().executeInsertSQL(insertClause);
-        
         String queryClause = SELECT_QUERY_BASE
-                + "WHERE pa.persona_id = " + persona.getId()
-                + " AND pa.alias = \"" + alias + "\""
-                + " AND pa.date_added = " + timeStampMillis
-                + " AND pa.examiner_id = " + examiner.getId();
-        
+                + "WHERE pa.persona_id = ?"
+                + " AND pa.alias = ?"
+                + " AND pa.date_added = ?"
+                + " AND pa.examiner_id = ?";
+
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(persona.getId());
+        queryParams.add(alias);
+        queryParams.add(timeStampMillis);
+        queryParams.add(examiner.getId());
+
         PersonaAliasesQueryCallback queryCallback = new PersonaAliasesQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
-        
+        getCRInstance().executeQuery(queryClause, queryParams, queryCallback);
+
         Collection<PersonaAlias> aliases = queryCallback.getAliases();
         if (aliases.size() != 1) {
             throw new CentralRepoException("Alias add query failed");
         }
-        
+
         return aliases.iterator().next();
     }
-    
+
     /**
      * Removes a PersonaAlias.
      *
@@ -140,11 +147,39 @@ public class PersonaAlias {
      * @throws CentralRepoException If there is an error in removing the alias.
      */
     static void removePersonaAlias(PersonaAlias alias) throws CentralRepoException {
-        String deleteClause = " DELETE FROM persona_alias WHERE id = " + alias.getId();
-        CentralRepository.getInstance().executeDeleteSQL(deleteClause);
+        String deleteSQL = " DELETE FROM persona_alias WHERE id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(alias.getId());
+
+        getCRInstance().executeCommand(deleteSQL, params);
     }
-    
-     /**
+
+    /**
+     * Modifies a PesronaAlias.
+     *
+     * @param alias Alias to modify.
+     *
+     * @throws CentralRepoException If there is an error in modifying the alias.
+     */
+    static void modifyPersonaAlias(PersonaAlias alias, Persona.Confidence confidence, String justification) throws CentralRepoException {
+        CentralRepository cr = CentralRepository.getInstance();
+
+        if (cr == null) {
+            throw new CentralRepoException("Failed to modify persona alias, Central Repo is not enabled");
+        }
+
+        String updateClause = "UPDATE persona_alias SET confidence_id = ?, justification = ? WHERE id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(confidence.getLevelId());
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(alias.getId());
+
+        cr.executeCommand(updateClause, params);
+    }
+
+    /**
      * Callback to process a Persona aliases query.
      */
     static class PersonaAliasesQueryCallback implements CentralRepositoryDbQueryCallback {
@@ -176,7 +211,7 @@ public class PersonaAlias {
             return Collections.unmodifiableCollection(personaAliases);
         }
     };
-    
+
     /**
      * Gets all aliases for the persona with specified id.
      *
@@ -186,12 +221,33 @@ public class PersonaAlias {
      * @throws CentralRepoException If there is an error in retrieving aliases.
      */
     public static Collection<PersonaAlias> getPersonaAliases(long personaId) throws CentralRepoException {
-        String queryClause = SELECT_QUERY_BASE + "WHERE pa.persona_id = " + personaId;
+        String queryClause = SELECT_QUERY_BASE
+                + "WHERE pa.persona_id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(personaId);
 
         PersonaAliasesQueryCallback queryCallback = new PersonaAliasesQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        getCRInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getAliases();
     }
-    
+
+    /**
+     * Wraps the call to CentralRepository.getInstance() throwing an exception
+     * if instance is null;
+     *
+     * @return Instance of CentralRepository
+     *
+     * @throws CentralRepoException
+     */
+    private static CentralRepository getCRInstance() throws CentralRepoException {
+        CentralRepository instance = CentralRepository.getInstance();
+
+        if (instance == null) {
+            throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null");
+        }
+
+        return instance;
+    }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaMetadata.java

@@ -24,23 +24,23 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
- * This class abstracts metadata associated with a Persona.
- * Metadata is in the form of a name/value pair.
- * 
+ * This class abstracts metadata associated with a Persona. Metadata is in the
+ * form of a name/value pair.
+ *
  * A Persona may have zero or more metadata.
- * 
+ *
  */
 public class PersonaMetadata {
-    
-    private static final String SELECT_QUERY_BASE = 
-            "SELECT pmd.id, pmd.persona_id, pmd.name, pmd.value, pmd.justification, pmd.confidence_id, pmd.date_added, pmd.examiner_id, e.login_name, e.display_name "
-                + "FROM persona_metadata as pmd "
-                + "INNER JOIN examiners as e ON e.id = pmd.examiner_id ";
-    
+
+    private static final String SELECT_QUERY_BASE
+            = "SELECT pmd.id, pmd.persona_id, pmd.name, pmd.value, pmd.justification, pmd.confidence_id, pmd.date_added, pmd.examiner_id, e.login_name, e.display_name "
+            + "FROM persona_metadata as pmd "
+            + "INNER JOIN examiners as e ON e.id = pmd.examiner_id ";
+
     private final long id;
     private final long personaId;
     private final String name;
@@ -49,7 +49,7 @@ public class PersonaMetadata {
     private final Persona.Confidence confidence;
     private final long dateAdded;
     private final CentralRepoExaminer examiner;
-    
+
     public long getId() {
         return id;
     }
@@ -81,7 +81,7 @@ public class PersonaMetadata {
     public CentralRepoExaminer getExaminer() {
         return examiner;
     }
-    
+
     public PersonaMetadata(long id, long personaId, String name, String value, String justification, Persona.Confidence confidence, long dateAdded, CentralRepoExaminer examiner) {
         this.id = id;
         this.personaId = personaId;
@@ -92,8 +92,8 @@ public class PersonaMetadata {
         this.dateAdded = dateAdded;
         this.examiner = examiner;
     }
-    
-     /**
+
+    /**
      * Adds specified metadata to the given persona.
      *
      * @param personaId Id of persona to add metadata for.
@@ -107,54 +107,92 @@ public class PersonaMetadata {
      */
     static PersonaMetadata addPersonaMetadata(long personaId, String name, String value, String justification, Persona.Confidence confidence) throws CentralRepoException {
 
-        CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name"));
+        CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name"));
 
         Instant instant = Instant.now();
         Long timeStampMillis = instant.toEpochMilli();
 
-        String insertClause = " INTO persona_metadata (persona_id, name, value, justification, confidence_id, date_added, examiner_id ) "
-                + "VALUES ( "
-                + personaId + ", "
-                + "'" + name + "', "
-                + "'" + value + "', "
-                + "'" + ((StringUtils.isBlank(justification) ? "" : SleuthkitCase.escapeSingleQuotes(justification))) + "', "
-                + confidence.getLevelId() + ", "
-                + timeStampMillis.toString() + ", "
-                + examiner.getId()
-                + ")";
+        String insertSQL = "INSERT INTO persona_metadata (persona_id, name, value, justification, confidence_id, date_added, examiner_id ) "
+                + "VALUES ( ?, ?, ?, ?, ?, ?, ?)";
+
+        List<Object> params = new ArrayList<>();
+        params.add(personaId);
+        params.add(name);
+        params.add(value);
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(confidence.getLevelId());
+        params.add(timeStampMillis);
+        params.add(examiner.getId());
+
+        getCRInstance().executeCommand(insertSQL, params);
 
-        CentralRepository.getInstance().executeInsertSQL(insertClause);
-        
         String queryClause = SELECT_QUERY_BASE
-                + "WHERE pmd.persona_id = " + personaId
-                + " AND pmd.name = \"" + name + "\""
-                + " AND pmd.value = \"" + value + "\""
-                + " AND pmd.date_added = " + timeStampMillis
-                + " AND pmd.examiner_id = " + examiner.getId();
-        
+                + "WHERE pmd.persona_id = ?"
+                + " AND pmd.name = ?"
+                + " AND pmd.value = ?"
+                + " AND pmd.date_added = ?"
+                + " AND pmd.examiner_id = ?";
+
+        List<Object> queryParams = new ArrayList<>();
+        queryParams.add(personaId);
+        queryParams.add(name);
+        queryParams.add(value);
+        queryParams.add(timeStampMillis);
+        queryParams.add(examiner.getId());
+
         PersonaMetadataQueryCallback queryCallback = new PersonaMetadataQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
-        
+        getCRInstance().executeQuery(queryClause, queryParams, queryCallback);
+
         Collection<PersonaMetadata> metadata = queryCallback.getMetadataList();
         if (metadata.size() != 1) {
             throw new CentralRepoException("Metadata add query failed");
         }
-        
+
         return metadata.iterator().next();
     }
-    
+
     /**
      * Removes the given PersonaMetadata
      *
      * @param metadata Metadata to remove.
      *
-     * @throws CentralRepoException If there is an error in removing the metadata.
+     * @throws CentralRepoException If there is an error in removing the
+     * metadata.
      */
     static void removePersonaMetadata(PersonaMetadata metadata) throws CentralRepoException {
-        String deleteClause = " DELETE FROM persona_metadata WHERE id = " + metadata.getId();
-        CentralRepository.getInstance().executeDeleteSQL(deleteClause);
+        String deleteSql = " DELETE FROM persona_metadata WHERE id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(metadata.getId());
+
+        getCRInstance().executeCommand(deleteSql, params);
     }
-    
+
+    /**
+     * Modifies the given PersonaMetadata
+     *
+     * @param metadata Metadata to modify.
+     *
+     * @throws CentralRepoException If there is an error in modifying the
+     * metadata.
+     */
+    static void modifyPersonaMetadata(PersonaMetadata metadata, Persona.Confidence confidence, String justification) throws CentralRepoException {
+        CentralRepository cr = CentralRepository.getInstance();
+
+        if (cr == null) {
+            throw new CentralRepoException("Failed to modify persona metadata, Central Repo is not enabled");
+        }
+
+        String updateSql = "UPDATE persona_metadata SET confidence_id = ?, justification = ? WHERE id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(confidence.getLevelId());
+        params.add(StringUtils.isBlank(justification) ? "" : justification);
+        params.add(metadata.id);
+
+        getCRInstance().executeCommand(updateSql, params);
+    }
+
     /**
      * Callback to process a Persona metadata query.
      */
@@ -188,8 +226,8 @@ public class PersonaMetadata {
             return Collections.unmodifiableCollection(personaMetadataList);
         }
     };
-    
-     /**
+
+    /**
      * Gets all metadata for the persona with specified id.
      *
      * @param personaId Id of the persona for which to get the metadata.
@@ -198,13 +236,34 @@ public class PersonaMetadata {
      * @throws CentralRepoException If there is an error in retrieving aliases.
      */
     static Collection<PersonaMetadata> getPersonaMetadata(long personaId) throws CentralRepoException {
-        String queryClause = SELECT_QUERY_BASE + "WHERE pmd.persona_id = " + personaId;
-        
+        String queryClause = SELECT_QUERY_BASE
+                + "WHERE pmd.persona_id = ?";
+
+        List<Object> params = new ArrayList<>();
+        params.add(personaId);
+
         PersonaMetadataQueryCallback queryCallback = new PersonaMetadataQueryCallback();
-        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
+        getCRInstance().executeQuery(queryClause, params, queryCallback);
 
         return queryCallback.getMetadataList();
 
     }
-    
+
+    /**
+     * Wraps the call to CentralRepository.getInstance() throwing an exception
+     * if instance is null;
+     *
+     * @return Instance of CentralRepository
+     *
+     * @throws CentralRepoException
+     */
+    private static CentralRepository getCRInstance() throws CentralRepoException {
+        CentralRepository instance = CentralRepository.getInstance();
+
+        if (instance == null) {
+            throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null");
+        }
+
+        return instance;
+    }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepo.java

@@ -41,7 +41,6 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -53,6 +52,7 @@ import org.sleuthkit.autopsy.healthmonitor.TimingMetric;
 import org.sleuthkit.datamodel.Account;
 import org.sleuthkit.datamodel.CaseDbSchemaVersionNumber;
 import org.sleuthkit.datamodel.HashHitInfo;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskData;
 
@@ -1081,29 +1081,37 @@ abstract class RdbmsCentralRepo implements CentralRepository {
      *                          within TSK core
      */
     @Override
-    public CentralRepoAccount getOrCreateAccount(CentralRepoAccountType crAccountType, String accountUniqueID) throws CentralRepoException {
+    public CentralRepoAccount getOrCreateAccount(CentralRepoAccountType crAccountType, String accountUniqueID) throws InvalidAccountIDException, CentralRepoException {
         // Get the account fom the accounts table
-        CentralRepoAccount account = getAccount(crAccountType, accountUniqueID);
+        String normalizedAccountID = CentralRepoAccount.normalizeAccountIdentifier(crAccountType, accountUniqueID);
 
-        // account not found in the table, create it
-        if (null == account) {
-
-            String query = "INSERT INTO accounts (account_type_id, account_unique_identifier) "
-                    + "VALUES ( " + crAccountType.getAccountTypeId() + ", '"
-                    + accountUniqueID + "' )";
-
-            try (Connection connection = connect();
-                    Statement s = connection.createStatement();) {
-
-                s.execute(query);
-                // get the account from the db - should exist now.
-                account = getAccount(crAccountType, accountUniqueID);
-            } catch (SQLException ex) {
-                throw new CentralRepoException("Error adding an account to CR database.", ex);
-            }
+        // insert the account.  If there is a conflict, ignore it.
+        String insertSQL;
+        switch (CentralRepoDbManager.getSavedDbChoice().getDbPlatform()) {
+            case POSTGRESQL:
+                insertSQL =  "INSERT INTO accounts (account_type_id, account_unique_identifier) VALUES (?, ?) " + getConflictClause();  //NON-NLS
+                break;
+            case SQLITE:
+                insertSQL = "INSERT OR IGNORE INTO accounts (account_type_id, account_unique_identifier) VALUES (?, ?) "; //NON-NLS
+                break;
+            default:
+                throw new CentralRepoException(String.format("Cannot add account to currently selected CR database platform %s", CentralRepoDbManager.getSavedDbChoice().getDbPlatform())); //NON-NLS
         }
+        
 
-        return account;
+        try (Connection connection = connect();
+                PreparedStatement preparedStatement = connection.prepareStatement(insertSQL);) {
+
+            preparedStatement.setInt(1, crAccountType.getAccountTypeId());
+            preparedStatement.setString(2, normalizedAccountID);
+
+            preparedStatement.executeUpdate();
+
+            // get the account from the db - should exist now.
+            return getAccount(crAccountType, normalizedAccountID);
+        } catch (SQLException ex) {
+            throw new CentralRepoException("Error adding an account to CR database.", ex);
+        }
     }
 
     @Override
@@ -1183,15 +1191,17 @@ abstract class RdbmsCentralRepo implements CentralRepository {
      * @return CentralRepoAccount for the give type/id. May return null if not
      *         found.
      *
-     * @throws CentralRepoException
+     * @throws CentralRepoException  If there is an error accessing Central Repository.
+     * @throws InvalidAccountIDException If the account identifier is not valid.
      */
-    private CentralRepoAccount getAccount(CentralRepoAccountType crAccountType, String accountUniqueID) throws CentralRepoException {
-
-        CentralRepoAccount crAccount = accountsCache.getIfPresent(Pair.of(crAccountType, accountUniqueID));
+    @Override
+    public CentralRepoAccount getAccount(CentralRepoAccountType crAccountType, String accountUniqueID) throws InvalidAccountIDException, CentralRepoException {
+        String normalizedAccountID = CentralRepoAccount.normalizeAccountIdentifier(crAccountType, accountUniqueID);
+        CentralRepoAccount crAccount = accountsCache.getIfPresent(Pair.of(crAccountType, normalizedAccountID));
         if (crAccount == null) {
-            crAccount = getCRAccountFromDb(crAccountType, accountUniqueID);
+            crAccount = getCRAccountFromDb(crAccountType, normalizedAccountID);
             if (crAccount != null) {
-                accountsCache.put(Pair.of(crAccountType, accountUniqueID), crAccount);
+                accountsCache.put(Pair.of(crAccountType, normalizedAccountID), crAccount);
             }
         }
 
@@ -1679,7 +1689,7 @@ abstract class RdbmsCentralRepo implements CentralRepository {
                     bulkArtifacts.get(tableName).clear();
                 }
 
-                TimingMetric timingMetric = HealthMonitor.getTimingMetric("Correlation Engine: Bulk insert");
+                TimingMetric timingMetric = HealthMonitor.getTimingMetric("Central Repository: Bulk insert");
                 HealthMonitor.submitTimingMetric(timingMetric);
 
                 // Reset state
@@ -2543,89 +2553,52 @@ abstract class RdbmsCentralRepo implements CentralRepository {
     }
 
     @Override
-    public void executeInsertSQL(String insertClause) throws CentralRepoException {
-
-        if (insertClause == null) {
-            throw new CentralRepoException("Insert SQL is null");
-        }
-
-        String sql = getPlatformSpecificInsertSQL(insertClause);
-        try (Connection conn = connect();
-                PreparedStatement preparedStatement = conn.prepareStatement(sql);) {
+    public void executeCommand(String sql, List<Object> params) throws CentralRepoException {
+      
+        try (Connection conn = connect();) {
+            
+            PreparedStatement preparedStatement = conn.prepareStatement(sql);
+                
+             // Fill in the params
+             if (params != null) {
+                int paramIndex = 1;
+                for (Object param : params) {
+                    preparedStatement.setObject(paramIndex, param);
+                    paramIndex += 1;
+                }
+            }
+            // execute the prepared statement
             preparedStatement.executeUpdate();
         } catch (SQLException ex) {
-            throw new CentralRepoException(String.format("Error running SQL %s, exception = %s", sql, ex.getMessage()), ex);
+            throw new CentralRepoException(String.format("Error executing prepared statement for SQL %s", sql), ex);
         }
     }
 
     @Override
-    public void executeSelectSQL(String selectSQL, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException {
+    public void executeQuery(String sql, List<Object> params, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException {
         if (queryCallback == null) {
             throw new CentralRepoException("Query callback is null");
         }
 
-        if (selectSQL == null) {
-            throw new CentralRepoException("Select SQL is null");
-        }
-
-        StringBuilder sqlSb = new StringBuilder(QUERY_STR_MAX_LEN);
-        if (selectSQL.trim().toUpperCase().startsWith("SELECT") == false) {
-            sqlSb.append("SELECT ");
-        }
-
-        sqlSb.append(selectSQL);
-
-        try (Connection conn = connect();
-                PreparedStatement preparedStatement = conn.prepareStatement(sqlSb.toString());
-                ResultSet resultSet = preparedStatement.executeQuery();) {
-            queryCallback.process(resultSet);
+       
+        try ( Connection conn = connect();)   {
+             PreparedStatement preparedStatement = conn.prepareStatement(sql);
+             
+            // fill in the params
+            if (params != null) {
+                int paramIndex = 1;
+                for (Object param : params) {
+                    preparedStatement.setObject(paramIndex, param);
+                    paramIndex += 1;
+                }
+            }
+            // execute query, and the callback to process result
+            try (ResultSet resultSet = preparedStatement.executeQuery();) {
+                queryCallback.process(resultSet);
+            }
         } catch (SQLException ex) {
-            throw new CentralRepoException(String.format("Error running SQL %s, exception = %s", selectSQL, ex.getMessage()), ex);
-        }
-    }
-    
-    @Override
-    public void executeUpdateSQL(String updateSQL) throws CentralRepoException {
-
-        if (updateSQL == null) {
-            throw new CentralRepoException("Update SQL is null");
-        }
-
-        StringBuilder sqlSb = new StringBuilder(QUERY_STR_MAX_LEN);
-        if (updateSQL.trim().toUpperCase().startsWith("UPDATE") == false) {
-            sqlSb.append("UPDATE ");
-        }
-        
-        sqlSb.append(updateSQL);
-        
-        try (Connection conn = connect();
-                PreparedStatement preparedStatement = conn.prepareStatement(sqlSb.toString());) {
-            preparedStatement.executeUpdate();
-        } catch (SQLException ex) {
-            throw new CentralRepoException(String.format("Error running SQL %s, exception = %s", updateSQL, ex.getMessage()), ex);
-        }
-    }
-    
-    @Override
-    public void executeDeleteSQL(String deleteSQL) throws CentralRepoException {
-        
-        if (deleteSQL == null) {
-            throw new CentralRepoException("Delete SQL is null");
-        }
-
-        StringBuilder sqlSb = new StringBuilder(QUERY_STR_MAX_LEN);
-        if (deleteSQL.trim().toUpperCase().startsWith("DELETE") == false) {
-            sqlSb.append("DELETE ");
-        }
-
-        sqlSb.append(deleteSQL);
-
-        try (Connection conn = connect();
-                PreparedStatement preparedStatement = conn.prepareStatement(sqlSb.toString());) {
-            preparedStatement.executeUpdate();
-        } catch (SQLException ex) {
-            throw new CentralRepoException(String.format("Error running SQL %s, exception = %s", deleteSQL, ex.getMessage()), ex);
-        }
+            throw new CentralRepoException(String.format("Error executing prepared statement for SQL query %s", sql), ex);
+        } 
     }
 
     @Override

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteCentralRepo.java

@@ -832,48 +832,27 @@ final class SqliteCentralRepo extends RdbmsCentralRepo {
             releaseSharedLock();
         }        
     }      
-
+    
     @Override
-    public void executeInsertSQL(String insertSQL) throws CentralRepoException {
+    public void executeCommand(String sql, List<Object> params) throws CentralRepoException {
         try {
-            acquireSharedLock();
-            super.executeInsertSQL(insertSQL);
+            acquireExclusiveLock();
+            super.executeCommand(sql, params);
         } finally {
-            releaseSharedLock();
+            releaseExclusiveLock();
         }
     }
     
     @Override
-    public void executeSelectSQL(String selectSQL, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException {
+    public void executeQuery(String sql, List<Object> params, CentralRepositoryDbQueryCallback queryCallback) throws CentralRepoException {
         try {
             acquireSharedLock();
-            super.executeSelectSQL(selectSQL, queryCallback);
+            super.executeQuery(sql, params, queryCallback);
         } finally {
             releaseSharedLock();
         }
     }
     
-    @Override
-    public void executeUpdateSQL(String updateSQL) throws CentralRepoException {
-        try {
-            acquireSharedLock();
-            super.executeUpdateSQL(updateSQL);
-        } finally {
-            releaseSharedLock();
-        }
-    }
-    
-    @Override
-    public void executeDeleteSQL(String deleteSQL) throws CentralRepoException {
-        try {
-            acquireSharedLock();
-            super.executeDeleteSQL(deleteSQL);
-        } finally {
-            releaseSharedLock();
-        }
-    }
-    
-    
     /**
      * Check whether a reference set with the given name/version is in the
      * central repo. Used to check for name collisions when creating reference

Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED

@@ -1,5 +1,5 @@
 caseeventlistener.evidencetag=Evidence
-IngestEventsListener.ingestmodule.name=Correlation Engine
+IngestEventsListener.ingestmodule.name=Central Repository
 IngestEventsListener.prevCaseComment.text=Previous Case: 
 # {0} - typeName
 # {1} - count

Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java

@@ -73,7 +73,7 @@ import org.sleuthkit.datamodel.CommunicationsUtils;
  * Listen for ingest events and update entries in the Central Repository
  * database accordingly
  */
-@NbBundle.Messages({"IngestEventsListener.ingestmodule.name=Correlation Engine"})
+@NbBundle.Messages({"IngestEventsListener.ingestmodule.name=Central Repository"})
 public class IngestEventsListener {
 
     private static final Logger LOGGER = Logger.getLogger(CorrelationAttributeInstance.class.getName());
@@ -116,24 +116,24 @@ public class IngestEventsListener {
 
     /**
      * Increase the number of IngestEventsListeners adding contents to the
-     * Correlation Engine.
+     * Central Repository.
      */
     public synchronized static void incrementCorrelationEngineModuleCount() {
-        correlationModuleInstanceCount++;  //Should be called once in the Correlation Engine module's startup method.
+        correlationModuleInstanceCount++;  //Should be called once in the Central Repository module's startup method.
     }
 
     /**
      * Decrease the number of IngestEventsListeners adding contents to the
-     * Correlation Engine.
+     * Central Repository.
      */
     public synchronized static void decrementCorrelationEngineModuleCount() {
         if (getCeModuleInstanceCount() > 0) {  //prevent it ingestJobCounter from going negative
-            correlationModuleInstanceCount--;  //Should be called once in the Correlation Engine module's shutdown method.
+            correlationModuleInstanceCount--;  //Should be called once in the Central Repository module's shutdown method.
         }
     }
 
     /**
-     * Reset the counter which keeps track of if the Correlation Engine Module
+     * Reset the counter which keeps track of if the Central Repository Module
      * is being run during injest to 0.
      */
     synchronized static void resetCeModuleInstanceCount() {
@@ -141,10 +141,10 @@ public class IngestEventsListener {
     }
 
     /**
-     * Whether or not the Correlation Engine Module is enabled for any of the
+     * Whether or not the Central Repository Module is enabled for any of the
      * currently running ingest jobs.
      *
-     * @return boolean True for Correlation Engine enabled, False for disabled
+     * @return boolean True for Central Repository enabled, False for disabled
      */
     public synchronized static int getCeModuleInstanceCount() {
         return correlationModuleInstanceCount;
@@ -282,7 +282,7 @@ public class IngestEventsListener {
 
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
-            //if ingest is running we want there to check if there is a Correlation Engine module running 
+            //if ingest is running we want there to check if there is a Central Repository module running 
             //sometimes artifacts are generated by DSPs or other sources while ingest is not running
             //in these cases we still want to create correlation attributesForNewArtifact for those artifacts when appropriate
             if (!IngestManager.getInstance().isIngestRunning() || getCeModuleInstanceCount() > 0) {
@@ -349,7 +349,7 @@ public class IngestEventsListener {
             if (getCeModuleInstanceCount() == 0) {
                 recentlyAddedCeArtifacts.clear();
             }
-            //else another instance of the Correlation Engine Module is still being run.
+            //else another instance of the Central Repository Module is still being run.
 
             /*
              * Ensure the data source in the Central Repository has hash values

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED

@@ -1,6 +1,6 @@
 CentralRepoIngestModel_name_header=Name:<br>
 CentralRepoIngestModel_previous_case_header=<br>Previous Cases:<br>
-CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module.
+CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Central Repository ingest module.
 CentralRepoIngestModule.notfyBubble.title=Central Repository Not Initialized
 CentralRepoIngestModule.prevCaseComment.text=Previous Case: 
 CentralRepoIngestModule.prevTaggedSet.text=Previously Tagged As Notable (Central Repository)
@@ -8,7 +8,7 @@ CentralRepoIngestModule_notable_message_header=<html>A file in this data source
 # {0} - Name of file that is Notable
 CentralRepoIngestModule_postToBB_knownBadMsg=Notable: {0}
 CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central repository for later correlation
-CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine
+CentralRepoIngestModuleFactory.ingestmodule.name=Central Repository
 IngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings
 IngestSettingsPanel.flagTaggedNotableItemsCheckbox.text=Flag items previously tagged as notable
 IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag devices previously seen in other cases

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java

@@ -85,7 +85,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
     private final boolean createCorrelationProperties;
 
     /**
-     * Instantiate the Correlation Engine ingest module.
+     * Instantiate the Central Repository ingest module.
      *
      * @param settings The ingest settings for the module instance.
      */
@@ -147,7 +147,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
          */
         if (abstractFile.getKnown() != TskData.FileKnown.KNOWN && flagTaggedNotableItems) {
             try {
-                TimingMetric timingMetric = HealthMonitor.getTimingMetric("Correlation Engine: Notable artifact query");
+                TimingMetric timingMetric = HealthMonitor.getTimingMetric("Central Repository: Notable artifact query");
                 List<String> caseDisplayNamesList = dbManager.getListCasesHavingArtifactInstancesKnownBad(filesType, md5);
                 HealthMonitor.submitTimingMetric(timingMetric);
                 if (!caseDisplayNamesList.isEmpty()) {
@@ -220,7 +220,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
     // see ArtifactManagerTimeTester for details
     @Messages({
         "CentralRepoIngestModule.notfyBubble.title=Central Repository Not Initialized",
-        "CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module."
+        "CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Central Repository ingest module."
     })
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
@@ -235,7 +235,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
          * posited.
          *
          * Note: Flagging cannot be disabled if any other instances of the
-         * Correlation Engine module are running. This restriction is to prevent
+         * Central Repository module are running. This restriction is to prevent
          * missing results in the case where the first module is flagging
          * notable items, and the proceeding module (with flagging disabled)
          * causes the first to stop flagging.
@@ -276,7 +276,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
         // Don't allow sqlite central repo databases to be used for multi user cases
         if ((autopsyCase.getCaseType() == Case.CaseType.MULTI_USER_CASE)
                 && (CentralRepoDbManager.getSavedDbChoice().getDbPlatform() == CentralRepoPlatforms.SQLITE)) {
-            logger.log(Level.SEVERE, "Cannot run correlation engine on a multi-user case with a SQLite central repository.");
+            logger.log(Level.SEVERE, "Cannot run Central Repository ingest module on a multi-user case with a SQLite central repository.");
             throw new IngestModuleException("Cannot run on a multi-user case with a SQLite central repository."); // NON-NLS
         }
         jobId = context.getJobId();

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java

@@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.ingest.NoIngestModuleIngestJobSettings;
  * Factory for Central Repository ingest modules
  */
 @ServiceProvider(service = org.sleuthkit.autopsy.ingest.IngestModuleFactory.class)
-@NbBundle.Messages({"CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine",
+@NbBundle.Messages({"CentralRepoIngestModuleFactory.ingestmodule.name=Central Repository",
                     "CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central repository for later correlation"})
 public class CentralRepoIngestModuleFactory extends IngestModuleFactoryAdapter {
 

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java

@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.centralrepository.ingestmodule;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 
 /**
- * Ingest job settings for the Correlation Engine module.
+ * Ingest job settings for the Central Repository module.
  */
 final class IngestSettings implements IngestModuleIngestJobSettings {
 

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java

@@ -22,7 +22,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
 
 /**
- * Ingest job settings panel for the Correlation Engine module.
+ * Ingest job settings panel for the Central Repository module.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 final class IngestSettingsPanel extends IngestModuleIngestJobSettingsPanel {

Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java

@@ -43,6 +43,7 @@ import javax.swing.event.DocumentListener;
 import javax.swing.filechooser.FileFilter;
 import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
+import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoDbChoice;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoDbManager;
@@ -660,6 +661,8 @@ public class EamDbSettingsDialog extends JDialog {
      *         found.
      */
     private static boolean testStatusAndCreate(Component parent, CentralRepoDbManager manager, EamDbSettingsDialog dialog) {
+        closePersonasTopComponent();
+        
         parent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         manager.testStatus();
 
@@ -690,6 +693,21 @@ public class EamDbSettingsDialog extends JDialog {
         parent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         return true;
     }
+    
+        
+    
+    /**
+     * Closes Personas top component if it exists.
+     */
+    private static void closePersonasTopComponent() {
+        SwingUtilities.invokeLater(() -> {
+            TopComponent personasWindow = WindowManager.getDefault().findTopComponent("PersonasTopComponent");
+            if (personasWindow != null && personasWindow.isOpened()) {
+                personasWindow.close();   
+            }
+        });
+    }
+    
 
     /**
      * This method returns if changes to the central repository configuration

Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties

@@ -1,21 +1,8 @@
-CTL_OpenPersonaManager=Persona Manager
-CTL_PersonaManagerTopComponentAction=Persona Manager
+CTL_OpenPersonas=Personas
+CTL_PersonasTopComponentAction=Personas
 CTL_PersonaDetailsTopComponent=Persona Details
-PersonaManagerTopComponent.createBtn.text=New Persona
-PersonaManagerTopComponent.searchBtn.text=Search
-PersonaManagerTopComponent.resultsTable.columnModel.title1=Name
-PersonaManagerTopComponent.resultsTable.columnModel.title0=ID
-PersonaManagerTopComponent.resultsTable.toolTipText=
-PersonaManagerTopComponent.searchAccountRadio.text=Account
-PersonaManagerTopComponent.searchNameRadio.text=Name
-PersonaManagerTopComponent.searchField.text=
-AddAccountDialog.cancelBtn.text=Cancel
-AddAccountDialog.okBtn.text=OK
-PersonaManagerTopComponent.editBtn.text=Edit Persona
 PersonaDetailsDialog.cancelBtn.text=Cancel
 PersonaDetailsDialog.okBtn.text=OK
-PersonaDetailsPanel.deleteCaseBtn.text=Delete
-PersonaDetailsPanel.addCaseBtn.text=Add
 PersonaDetailsPanel.casesLbl.text=Cases found in:
 PersonaDetailsPanel.deleteAliasBtn.text=Delete
 PersonaDetailsPanel.addAliasBtn.text=Add
@@ -31,26 +18,66 @@ PersonaDetailsPanel.nameLbl.text=Name:
 AddAliasDialog.accountsLbl.text=Account:
 AddAliasDialog.okBtn.text=OK
 AddAliasDialog.cancelBtn.text=Cancel
-AddMetadataDialog.cancelBtn.text=Cancel
-AddMetadataDialog.okBtn.text=OK
-AddMetadataDialog.nameLbl.text=Name:
-AddMetadataDialog.nameTextField.text=
-AddMetadataDialog.valueLbl.text=Value:
-AddMetadataDialog.valueTextField.text=
-AddMetadataDialog.justificationLbl.text=Justification:
-AddMetadataDialog.justificationTextField.text=
-AddMetadataDialog.confidenceLbl.text=Confidence:
-AddAliasDialog.justificationLbl.text=Justification:
-AddAliasDialog.okBtn.text_1=OK
-AddAliasDialog.cancelBtn.text_1=Cancel
-AddAliasDialog.confidenceLbl.text=Confidence:
-AddAliasDialog.justificationTextField.text=
-AddAliasDialog.aliasLbl.text=Alias:
-AddAliasDialog.aliasTextField.text=
-AddAccountDialog.justificationTextField.text=
-AddAccountDialog.justificationLbl.text=Justification:
-AddAccountDialog.confidenceLbl.text=Confidence:
-AddAccountDialog.typeLbl.text=Type:
-AddAccountDialog.identiferLbl.text=Identifier:
-AddAccountDialog.identifierTextField.text=
-PersonaManagerTopComponent.deleteBtn.text=Delete Persona
+PersonaDetailsPanel.casesLbl.text=Cases found in:
+PersonaDetailsPanel.deleteAliasBtn.text=Delete
+PersonaDetailsPanel.addAliasBtn.text=Add
+PersonaDetailsPanel.aliasesLabel.text=Aliases:
+PersonaDetailsPanel.deleteMetadataBtn.text=Delete
+PersonaDetailsPanel.addMetadataBtn.text=Add
+PersonaDetailsPanel.metadataLabel.text=Metadata:
+PersonaDetailsPanel.deleteAccountBtn.text=Delete
+PersonaDetailsPanel.addAccountBtn.text=Add
+PersonaDetailsPanel.accountsLbl.text=Accounts:
+PersonaDetailsPanel.commentField.text=
+PersonaDetailsPanel.commentLbl.text=Comment:
+PersonaDetailsPanel.nameField.text=
+PersonaDetailsPanel.nameLbl.text=Name:
+PersonaDetailsPanel.examinerLbl.text=Created by:
+PersonaDetailsPanel.examinerField.text=
+PersonaDetailsPanel.creationDateLbl.text=Created on:
+PersonaDetailsPanel.creationDateField.text=
+PersonaAccountDialog.confidenceLbl.text=Confidence:
+PersonaAccountDialog.justificationTextField.text=
+PersonaAccountDialog.justificationLbl.text=Justification:
+PersonaAccountDialog.typeLbl.text=Type:
+PersonaAccountDialog.identifierTextField.text=
+PersonaAccountDialog.identiferLbl.text=Identifier:
+PersonaAccountDialog.okBtn.text=OK
+PersonaAccountDialog.cancelBtn.text=Cancel
+PersonaAliasDialog.cancelBtn.text_1=Cancel
+PersonaAliasDialog.confidenceLbl.text=Confidence:
+PersonaAliasDialog.justificationTextField.text=
+PersonaAliasDialog.justificationLbl.text=Justification:
+PersonaAliasDialog.aliasTextField.text=
+PersonaAliasDialog.aliasLbl.text=Alias:
+PersonaAliasDialog.okBtn.text_1=OK
+PersonaMetadataDialog.confidenceLbl.text=Confidence:
+PersonaMetadataDialog.justificationTextField.text=
+PersonaMetadataDialog.justificationLbl.text=Justification:
+PersonaMetadataDialog.valueTextField.text=
+PersonaMetadataDialog.valueLbl.text=Value:
+PersonaMetadataDialog.nameTextField.text=
+PersonaMetadataDialog.nameLbl.text=Name:
+PersonaMetadataDialog.okBtn.text=OK
+PersonaMetadataDialog.cancelBtn.text=Cancel
+PersonaDetailsPanel.editAccountBtn.text=Edit
+PersonaDetailsPanel.editMetadataBtn.text=Edit
+PersonaDetailsPanel.editAliasBtn.text=Edit
+PersonasTopComponent.searchAccountRadio.text=Account
+PersonasTopComponent.searchNameRadio.text=Name
+PersonasTopComponent.searchField.text=
+PersonasTopComponent.deleteBtn.text=Delete Persona
+PersonasTopComponent.editBtn.text=Edit Persona
+PersonasTopComponent.createBtn.text=New Persona
+PersonasTopComponent.createAccountBtn.text=Create Account
+PersonasTopComponent.searchBtn.text=Show
+PersonasTopComponent.resultsTable.columnModel.title1=Name
+PersonasTopComponent.resultsTable.columnModel.title0=ID
+PersonasTopComponent.resultsTable.toolTipText=
+CreatePersonaAccountDialog.cancelBtn.text=Cancel
+CreatePersonaAccountDialog.typeLbl.text=Type:
+CreatePersonaAccountDialog.identifierTextField.text=
+CreatePersonaAccountDialog.identiferLbl.text=Identifier:
+CreatePersonaAccountDialog.okBtn.text=OK
+PersonasTopComponent.introText.text=Personas represent an online identity. They span cases and are stored in the Central Repository based on accounts that were found in artifacts. You can create, edit, and delete personas here.
+PersonasTopComponent.cbFilterByKeyword.text=Filter personas by keyword

Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED

@@ -1,52 +1,42 @@
-AddAccountDialog.title.text=Add Account
-AddAccountDialog_dup_msg=This account is already added to the persona
-AddAccountDialog_dup_Title=Account add failure
-AddAccountDialog_empty_msg=The identifier field cannot be empty
-AddAccountDialog_empty_Title=Empty identifier
-AddAccountDialog_get_types_exception_msg=Failed to access central repository
-AddAccountDialog_get_types_exception_Title=Central Repository failure
-AddAccountDialog_search_empty_msg=Account not found for given identifier and type
-AddAccountDialog_search_empty_Title=Account not found
-AddAccountDialog_search_failure_msg=Central Repository account search failed
-AddAccountDialog_search_failure_Title=Account add failure
-AddAliasDialog.title.text=Add Alias
-AddAliasDialog_dup_msg=This alias has already been added to this persona
-AddAliasDialog_dup_Title=Alias add failure
 AddMetadataDialog.title.text=Add Metadata
-AddMetadataDialog_dup_msg=A metadata entry with this name has already been added to this persona
+AddMetadataDialog_dup_msg=A metadata entry with this name has already been added to this persona.
 AddMetadataDialog_dup_Title=Metadata add failure
-CTL_OpenPersonaManager=Persona Manager
-CTL_PersonaManagerTopComponentAction=Persona Manager
+AddMetadataDialog_empty_name_msg=A metadata entry cannot have an empty name or value.
+AddMetadataDialog_empty_name_Title=Missing field(s)
+CreatePersonaAccountDialog.title.text=Create Account
+CreatePersonaAccountDialog_error_msg=Failed to create account.
+CreatePersonaAccountDialog_error_title=Account failure
+CreatePersonaAccountDialog_invalid_account_msg=Account identifier is not valid.
+CreatePersonaAccountDialog_invalid_account_Title=Invalid account identifier
+CreatePersonaAccountDialog_success_msg=Account added.
+CreatePersonaAccountDialog_success_title=Account added
+CTL_OpenPersonas=Personas
+CTL_PersonasTopComponentAction=Personas
 CTL_PersonaDetailsTopComponent=Persona Details
-OpenPersonasAction.displayName=Persona Manager
-PersonaDetailsDialogCreateTitle=Create Persona
-PersonaDetailsDialogEditTitle=Edit Persona
-PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository
-PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure
-PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty
-PersonaDetailsPanel_EmptyName_Title=Empty persona name
-PersonaDetailsPanel_load_exception_msg=Failed to load persona
-PersonaDetailsPanel_load_exception_Title=Initialization failure
-PersonaDetailsPanel_NameCreate=Create Persona
-PersonaDetailsPanel_NameEdit=Edit Persona
-PersonaDetailsPanel_NameView=View Persona
-PersonaDetailsPanel_NotEnoughAccounts_msg=Two or more accounts are necessary to create a persona
-PersonaDetailsPanel_NotEnoughAccounts_Title=Not enough accounts
-PersonaManagerTopComponent.createBtn.text=New Persona
-PersonaManagerTopComponent.searchBtn.text=Search
-PersonaManagerTopComponent.resultsTable.columnModel.title1=Name
-PersonaManagerTopComponent.resultsTable.columnModel.title0=ID
-PersonaManagerTopComponent.resultsTable.toolTipText=
-PersonaManagerTopComponent.searchAccountRadio.text=Account
-PersonaManagerTopComponent.searchNameRadio.text=Name
-PersonaManagerTopComponent.searchField.text=
-AddAccountDialog.cancelBtn.text=Cancel
-AddAccountDialog.okBtn.text=OK
-PersonaManagerTopComponent.editBtn.text=Edit Persona
+OpenPersonasAction.displayName=Personas
+PersonaAccountDialog.title.text=Add Account
+PersonaAccountDialog_dup_msg=This account is already added to the persona.
+PersonaAccountDialog_dup_Title=Account add failure
+PersonaAccountDialog_get_types_exception_msg=Failed to access central repository.
+PersonaAccountDialog_get_types_exception_Title=Central Repository failure
+PersonaAccountDialog_identifier_empty_msg=The identifier field cannot be empty.
+PersonaAccountDialog_identifier_empty_Title=Empty identifier
+PersonaAccountDialog_invalid_account_msg=Account identifier is not valid.
+PersonaAccountDialog_invalid_account_Title=Invalid account identifier
+PersonaAccountDialog_search_empty_msg=Account not found for given identifier and type.
+PersonaAccountDialog_search_empty_Title=Account not found
+PersonaAccountDialog_search_failure_msg=Central Repository account search failed.
+PersonaAccountDialog_search_failure_Title=Account add failure
+PersonaAliasDialog.title.text=Add Alias
+PersonaAliasDialog_dup_msg=This alias has already been added to this persona.
+PersonaAliasDialog_dup_Title=Alias add failure
+PersonaAliasDialog_empty_msg=An alias cannot be empty.
+PersonaAliasDialog_empty_Title=Empty alias
 PersonaDetailsDialog.cancelBtn.text=Cancel
 PersonaDetailsDialog.okBtn.text=OK
-PersonaDetailsPanel.deleteCaseBtn.text=Delete
-PersonaDetailsPanel.addCaseBtn.text=Add
+PersonaDetailsDialogCreateTitle=Create Persona
+PersonaDetailsDialogEditTitle=Edit Persona
+PersonaDetailsDialogViewTitle=View Persona
 PersonaDetailsPanel.casesLbl.text=Cases found in:
 PersonaDetailsPanel.deleteAliasBtn.text=Delete
 PersonaDetailsPanel.addAliasBtn.text=Add
@@ -62,28 +52,86 @@ PersonaDetailsPanel.nameLbl.text=Name:
 AddAliasDialog.accountsLbl.text=Account:
 AddAliasDialog.okBtn.text=OK
 AddAliasDialog.cancelBtn.text=Cancel
-AddMetadataDialog.cancelBtn.text=Cancel
-AddMetadataDialog.okBtn.text=OK
-AddMetadataDialog.nameLbl.text=Name:
-AddMetadataDialog.nameTextField.text=
-AddMetadataDialog.valueLbl.text=Value:
-AddMetadataDialog.valueTextField.text=
-AddMetadataDialog.justificationLbl.text=Justification:
-AddMetadataDialog.justificationTextField.text=
-AddMetadataDialog.confidenceLbl.text=Confidence:
-AddAliasDialog.justificationLbl.text=Justification:
-AddAliasDialog.okBtn.text_1=OK
-AddAliasDialog.cancelBtn.text_1=Cancel
-AddAliasDialog.confidenceLbl.text=Confidence:
-AddAliasDialog.justificationTextField.text=
-AddAliasDialog.aliasLbl.text=Alias:
-AddAliasDialog.aliasTextField.text=
-AddAccountDialog.justificationTextField.text=
-AddAccountDialog.justificationLbl.text=Justification:
-AddAccountDialog.confidenceLbl.text=Confidence:
-AddAccountDialog.typeLbl.text=Type:
-AddAccountDialog.identiferLbl.text=Identifier:
-AddAccountDialog.identifierTextField.text=
-PMTopComponent_Name=Persona Manager
-PMTopComponent_search_exception_msg=Failed to search personas
-PMTopComponent_search_exception_Title=Search failure
+PersonaDetailsPanel.casesLbl.text=Cases found in:
+PersonaDetailsPanel.deleteAliasBtn.text=Delete
+PersonaDetailsPanel.addAliasBtn.text=Add
+PersonaDetailsPanel.aliasesLabel.text=Aliases:
+PersonaDetailsPanel.deleteMetadataBtn.text=Delete
+PersonaDetailsPanel.addMetadataBtn.text=Add
+PersonaDetailsPanel.metadataLabel.text=Metadata:
+PersonaDetailsPanel.deleteAccountBtn.text=Delete
+PersonaDetailsPanel.addAccountBtn.text=Add
+PersonaDetailsPanel.accountsLbl.text=Accounts:
+PersonaDetailsPanel.commentField.text=
+PersonaDetailsPanel.commentLbl.text=Comment:
+PersonaDetailsPanel.nameField.text=
+PersonaDetailsPanel.nameLbl.text=Name:
+PersonaDetailsPanel.examinerLbl.text=Created by:
+PersonaDetailsPanel.examinerField.text=
+PersonaDetailsPanel.creationDateLbl.text=Created on:
+PersonaDetailsPanel.creationDateField.text=
+PersonaAccountDialog.confidenceLbl.text=Confidence:
+PersonaAccountDialog.justificationTextField.text=
+PersonaAccountDialog.justificationLbl.text=Justification:
+PersonaAccountDialog.typeLbl.text=Type:
+PersonaAccountDialog.identifierTextField.text=
+PersonaAccountDialog.identiferLbl.text=Identifier:
+PersonaAccountDialog.okBtn.text=OK
+PersonaAccountDialog.cancelBtn.text=Cancel
+PersonaAliasDialog.cancelBtn.text_1=Cancel
+PersonaAliasDialog.confidenceLbl.text=Confidence:
+PersonaAliasDialog.justificationTextField.text=
+PersonaAliasDialog.justificationLbl.text=Justification:
+PersonaAliasDialog.aliasTextField.text=
+PersonaAliasDialog.aliasLbl.text=Alias:
+PersonaAliasDialog.okBtn.text_1=OK
+PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository.
+PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure
+PersonaDetailsPanel_empty_justification_msg=The justification field cannot be empty
+PersonaDetailsPanel_empty_justification_Title=Empty justification
+PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty.
+PersonaDetailsPanel_EmptyComment_Title=Empty persona comment
+PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty.
+PersonaDetailsPanel_EmptyName_Title=Empty persona name
+PersonaDetailsPanel_load_exception_msg=Failed to load persona.
+PersonaDetailsPanel_load_exception_Title=Initialization failure
+PersonaDetailsPanel_NotEnoughAccounts_msg=A persona needs at least one account.
+PersonaDetailsPanel_NotEnoughAccounts_Title=Missing account
+PersonaMetadataDialog.confidenceLbl.text=Confidence:
+PersonaMetadataDialog.justificationTextField.text=
+PersonaMetadataDialog.justificationLbl.text=Justification:
+PersonaMetadataDialog.valueTextField.text=
+PersonaMetadataDialog.valueLbl.text=Value:
+PersonaMetadataDialog.nameTextField.text=
+PersonaMetadataDialog.nameLbl.text=Name:
+PersonaMetadataDialog.okBtn.text=OK
+PersonaMetadataDialog.cancelBtn.text=Cancel
+PersonaDetailsPanel.editAccountBtn.text=Edit
+PersonaDetailsPanel.editMetadataBtn.text=Edit
+PersonaDetailsPanel.editAliasBtn.text=Edit
+PersonasTopComponent.searchAccountRadio.text=Account
+PersonasTopComponent.searchNameRadio.text=Name
+PersonasTopComponent.searchField.text=
+PersonasTopComponent.deleteBtn.text=Delete Persona
+PersonasTopComponent.editBtn.text=Edit Persona
+PersonasTopComponent.createBtn.text=New Persona
+PersonasTopComponent.createAccountBtn.text=Create Account
+PersonasTopComponent.searchBtn.text=Show
+PersonasTopComponent.resultsTable.columnModel.title1=Name
+PersonasTopComponent.resultsTable.columnModel.title0=ID
+PersonasTopComponent.resultsTable.toolTipText=
+CreatePersonaAccountDialog.cancelBtn.text=Cancel
+CreatePersonaAccountDialog.typeLbl.text=Type:
+CreatePersonaAccountDialog.identifierTextField.text=
+CreatePersonaAccountDialog.identiferLbl.text=Identifier:
+CreatePersonaAccountDialog.okBtn.text=OK
+PersonasTopComponent.introText.text=Personas represent an online identity. They span cases and are stored in the Central Repository based on accounts that were found in artifacts. You can create, edit, and delete personas here.
+PersonasTopComponent.cbFilterByKeyword.text=Filter personas by keyword
+PersonasTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?
+PersonasTopComponent_delete_confirmation_Title=Are you sure?
+PersonasTopComponent_delete_exception_msg=Failed to delete persona.
+PersonasTopComponent_delete_exception_Title=Delete failure
+PersonasTopComponent_Name=Personas
+PersonasTopComponent_noCR_msg=Central Repository is not enabled.
+PersonasTopComponent_search_exception_msg=Failed to search personas.
+PersonasTopComponent_search_exception_Title=There was a failure during the search.  Try opening a case to fully initialize the central repository database.

Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle_ja.properties

@@ -1,10 +1,12 @@
-AddAccountDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
-AddAccountDialog.okBtn.text=OK
 PersonaDetailsDialog.okBtn.text=OK
 PersonaDetailsDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
 AddAliasDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
 AddAliasDialog.okBtn.text=OK
-AddMetadataDialog.okBtn.text=OK
-AddMetadataDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
-AddAliasDialog.cancelBtn.text_1=\u53d6\u308a\u6d88\u3057
-AddAliasDialog.okBtn.text_1=OK
+PersonaAccountDialog.okBtn.text=OK
+PersonaAccountDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
+PersonaAliasDialog.cancelBtn.text_1=\u53d6\u308a\u6d88\u3057
+PersonaAliasDialog.okBtn.text_1=OK
+PersonaMetadataDialog.okBtn.text=OK
+PersonaMetadataDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057
+CreatePersonaAccountDialog.okBtn.text=OK
+CreatePersonaAccountDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057

Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.form

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <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" attributes="0">
+              <EmptySpace pref="194" max="32767" attributes="0"/>
+              <Component id="okBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="cancelBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+          <Component id="settingsPanel" alignment="0" max="32767" attributes="0"/>
+      </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="settingsPanel" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="okBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="cancelBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Container class="javax.swing.JPanel" name="settingsPanel">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
+            <EtchetBorder/>
+          </Border>
+        </Property>
+      </Properties>
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="typeLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="typeComboBox" max="32767" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="identiferLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="identifierTextField" pref="281" max="32767" attributes="0"/>
+                      </Group>
+                  </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 max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="identiferLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="identifierTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="typeComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="typeLbl" alignment="3" min="-2" pref="9" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="identiferLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="CreatePersonaAccountDialog.identiferLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="identifierTextField">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="CreatePersonaAccountDialog.identifierTextField.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="identifierTextFieldActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JLabel" name="typeLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="CreatePersonaAccountDialog.typeLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="typeComboBox">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="new javax.swing.DefaultComboBoxModel&lt;&gt;(getAllAccountTypes())" type="code"/>
+            </Property>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType&gt;"/>
+          </AuxValues>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Component class="javax.swing.JButton" name="cancelBtn">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="CreatePersonaAccountDialog.cancelBtn.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="[79, 23]"/>
+        </Property>
+        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[79, 23]"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[79, 23]"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelBtnActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JButton" name="okBtn">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="CreatePersonaAccountDialog.okBtn.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="okBtnActionPerformed"/>
+      </Events>
+    </Component>
+  </SubComponents>
+</Form>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.java

@@ -0,0 +1,290 @@
+/*
+ * Central Repository
+ *
+ * Copyright 2020 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.centralrepository.persona;
+
+import java.awt.Component;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.logging.Level;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+import org.apache.commons.lang3.StringUtils;
+import org.openide.util.NbBundle.Messages;
+import org.openide.windows.WindowManager;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
+
+/**
+ * Configuration dialog for creating an account.
+ */
+@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
+public class CreatePersonaAccountDialog extends JDialog {
+
+    private static final Logger logger = Logger.getLogger(CreatePersonaAccountDialog.class.getName());
+
+    private static final long serialVersionUID = 1L;
+
+    private final TypeChoiceRenderer TYPE_CHOICE_RENDERER = new TypeChoiceRenderer();
+
+    /**
+     * Creates new create account dialog.
+     */
+    @Messages({"CreatePersonaAccountDialog.title.text=Create Account",})
+    public CreatePersonaAccountDialog(PersonaDetailsPanel pdp) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.PersonaAccountDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
+
+        initComponents();
+        typeComboBox.setRenderer(TYPE_CHOICE_RENDERER);
+        display();
+    }
+
+    /**
+     * This class handles displaying and rendering drop down menu for account
+     * choices.
+     */
+    private class TypeChoiceRenderer extends JLabel implements ListCellRenderer<CentralRepoAccountType>, Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Component getListCellRendererComponent(
+                JList<? extends CentralRepoAccountType> list, CentralRepoAccountType value,
+                int index, boolean isSelected, boolean cellHasFocus) {
+            setText(value.getAcctType().getDisplayName());
+            return this;
+        }
+    }
+
+    private CentralRepoAccountType[] getAllAccountTypes() {
+        Collection<CentralRepoAccountType> allAccountTypes;
+        try {
+            allAccountTypes = CentralRepository.getInstance().getAllAccountTypes();
+        } catch (CentralRepoException e) {
+            logger.log(Level.SEVERE, "Failed to access central repository", e);
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaAccountDialog_get_types_exception_Title(),
+                    Bundle.PersonaAccountDialog_get_types_exception_msg(),
+                    JOptionPane.ERROR_MESSAGE);
+            return new CentralRepoAccountType[0];
+        }
+        return allAccountTypes.toArray(new CentralRepoAccountType[0]);
+    }
+
+    /**
+     * 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() {
+
+        settingsPanel = new javax.swing.JPanel();
+        identiferLbl = new javax.swing.JLabel();
+        identifierTextField = new javax.swing.JTextField();
+        typeLbl = new javax.swing.JLabel();
+        typeComboBox = new javax.swing.JComboBox<>();
+        cancelBtn = new javax.swing.JButton();
+        okBtn = new javax.swing.JButton();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setResizable(false);
+
+        settingsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
+        org.openide.awt.Mnemonics.setLocalizedText(identiferLbl, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.identiferLbl.text")); // NOI18N
+
+        identifierTextField.setText(org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.identifierTextField.text")); // NOI18N
+        identifierTextField.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                identifierTextFieldActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(typeLbl, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.typeLbl.text")); // NOI18N
+
+        typeComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(getAllAccountTypes()));
+
+        javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel);
+        settingsPanel.setLayout(settingsPanelLayout);
+        settingsPanelLayout.setHorizontalGroup(
+            settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(settingsPanelLayout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(settingsPanelLayout.createSequentialGroup()
+                        .addComponent(typeLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(typeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addGroup(settingsPanelLayout.createSequentialGroup()
+                        .addComponent(identiferLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(identifierTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 281, Short.MAX_VALUE)))
+                .addContainerGap())
+        );
+        settingsPanelLayout.setVerticalGroup(
+            settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(settingsPanelLayout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(identiferLbl)
+                    .addComponent(identifierTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(typeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(typeLbl, javax.swing.GroupLayout.PREFERRED_SIZE, 9, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
+        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.cancelBtn.text")); // NOI18N
+        cancelBtn.setMaximumSize(new java.awt.Dimension(79, 23));
+        cancelBtn.setMinimumSize(new java.awt.Dimension(79, 23));
+        cancelBtn.setPreferredSize(new java.awt.Dimension(79, 23));
+        cancelBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                cancelBtnActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.okBtn.text")); // NOI18N
+        okBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                okBtnActionPerformed(evt);
+            }
+        });
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap(194, Short.MAX_VALUE)
+                .addComponent(okBtn)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap())
+            .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+        );
+
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {cancelBtn, okBtn});
+
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(settingsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(okBtn)
+                    .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void display() {
+        this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
+        setVisible(true);
+    }
+    
+    @Messages({
+        "CreatePersonaAccountDialog_error_title=Account failure",
+        "CreatePersonaAccountDialog_error_msg=Failed to create account.",
+        "CreatePersonaAccountDialog_invalid_account_Title=Invalid account identifier",
+        "CreatePersonaAccountDialog_invalid_account_msg=Account identifier is not valid.",})
+    private CentralRepoAccount createAccount(CentralRepoAccount.CentralRepoAccountType type, String identifier) {
+        CentralRepoAccount ret = null;
+        try {
+            CentralRepository cr = CentralRepository.getInstance();
+            if (cr != null) {
+                ret = cr.getOrCreateAccount(type, identifier);
+            }
+        } catch (CentralRepoException e) {
+            logger.log(Level.SEVERE, "Failed to create account", e);
+            JOptionPane.showMessageDialog(this,
+                    Bundle.CreatePersonaAccountDialog_error_msg(),
+                    Bundle.CreatePersonaAccountDialog_error_title(),
+                    JOptionPane.ERROR_MESSAGE);
+        } catch (InvalidAccountIDException e) {
+            logger.log(Level.WARNING, "Invalid account identifier", e);
+            JOptionPane.showMessageDialog(this,
+                    Bundle.CreatePersonaAccountDialog_invalid_account_msg(),
+                    Bundle.CreatePersonaAccountDialog_invalid_account_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+        }
+        return ret;
+    }
+
+    @Messages({
+        "CreatePersonaAccountDialog_success_title=Account added",
+        "CreatePersonaAccountDialog_success_msg=Account added.",
+    })
+    private void okBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okBtnActionPerformed
+        if (StringUtils.isBlank(identifierTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaAccountDialog_identifier_empty_msg(),
+                    Bundle.PersonaAccountDialog_identifier_empty_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        
+        CentralRepoAccount.CentralRepoAccountType type = 
+                (CentralRepoAccount.CentralRepoAccountType) typeComboBox.getSelectedItem();
+        String identifier = identifierTextField.getText();
+
+        if (createAccount(type, identifier) != null) {
+            // show account created message
+            JOptionPane.showMessageDialog(this,
+                    Bundle.CreatePersonaAccountDialog_success_msg(),
+                    Bundle.CreatePersonaAccountDialog_success_title(),
+                    JOptionPane.INFORMATION_MESSAGE);
+
+            dispose();
+        }
+    }//GEN-LAST:event_okBtnActionPerformed
+
+    private void cancelBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelBtnActionPerformed
+        dispose();
+    }//GEN-LAST:event_cancelBtnActionPerformed
+
+    private void identifierTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_identifierTextFieldActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_identifierTextFieldActionPerformed
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton cancelBtn;
+    private javax.swing.JLabel identiferLbl;
+    private javax.swing.JTextField identifierTextField;
+    private javax.swing.JButton okBtn;
+    private javax.swing.JPanel settingsPanel;
+    private javax.swing.JComboBox<org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType> typeComboBox;
+    private javax.swing.JLabel typeLbl;
+    // End of variables declaration//GEN-END:variables
+}

Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonasAction.java

@@ -35,18 +35,18 @@ import org.sleuthkit.autopsy.coreutils.ThreadConfined;
  * An Action that opens the Persona Search window.
  */
 
-@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.centralrepository.persona.OpenPersonaManagerAction")
-@ActionRegistration(displayName = "#CTL_OpenPersonaManager", lazy = false)
+@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.centralrepository.persona.OpenPersonasAction")
+@ActionRegistration(displayName = "#CTL_OpenPersonas", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 105)
 })
-public final class OpenPersonaManagerAction extends CallableSystemAction {
+public final class OpenPersonasAction extends CallableSystemAction {
 
     private static final long serialVersionUID = 1L;
 
     private final JMenuItem menuItem;
 
-    public OpenPersonaManagerAction() {
+    public OpenPersonasAction() {
         menuItem = super.getMenuPresenter();
         this.setEnabled(CentralRepository.isEnabled());
     }
@@ -54,7 +54,7 @@ public final class OpenPersonaManagerAction extends CallableSystemAction {
     @Override
     @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
     public void performAction() {
-        final TopComponent topComponent = WindowManager.getDefault().findTopComponent("PersonaManagerTopComponent");
+        final TopComponent topComponent = WindowManager.getDefault().findTopComponent("PersonasTopComponent");
         if (topComponent != null) {
             if (topComponent.isOpened() == false) {
                 topComponent.open();
@@ -65,7 +65,7 @@ public final class OpenPersonaManagerAction extends CallableSystemAction {
     }
 
     @Override
-    @NbBundle.Messages("OpenPersonasAction.displayName=Persona Manager")
+    @NbBundle.Messages("OpenPersonasAction.displayName=Personas")
     public String getName() {
         return Bundle.OpenPersonasAction_displayName();
     }

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaAccountDialog.form

@@ -25,24 +25,21 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" attributes="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="settingsPanel" alignment="0" max="32767" attributes="0"/>
-                  <Group type="102" attributes="0">
-                      <EmptySpace pref="202" max="32767" attributes="0"/>
-                      <Component id="okBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="cancelBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
-                  </Group>
-              </Group>
+              <EmptySpace pref="194" max="32767" attributes="0"/>
+              <Component id="okBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="cancelBtn" linkSize="2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
+          <Component id="settingsPanel" alignment="0" max="32767" attributes="0"/>
       </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="settingsPanel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="okBtn" alignment="1" min="-2" max="-2" attributes="0"/>
                   <Component id="cancelBtn" alignment="1" min="-2" max="-2" attributes="0"/>
@@ -81,12 +78,12 @@
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="confidenceLbl" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="confidenceComboBox" pref="269" max="32767" attributes="0"/>
+                          <Component id="confidenceComboBox" max="32767" attributes="0"/>
                       </Group>
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="justificationLbl" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="justificationTextField" pref="264" max="32767" attributes="0"/>
+                          <Component id="justificationTextField" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -101,21 +98,21 @@
                       <Component id="identiferLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="identifierTextField" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="typeComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="typeLbl" alignment="3" min="-2" pref="9" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="confidenceLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="confidenceComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
@@ -125,14 +122,14 @@
         <Component class="javax.swing.JLabel" name="identiferLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.identiferLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.identiferLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="identifierTextField">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.identifierTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.identifierTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -142,7 +139,7 @@
         <Component class="javax.swing.JLabel" name="typeLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.typeLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.typeLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -156,24 +153,10 @@
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType&gt;"/>
           </AuxValues>
         </Component>
-        <Component class="javax.swing.JLabel" name="justificationLbl">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="justificationTextField">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
         <Component class="javax.swing.JLabel" name="confidenceLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -187,12 +170,26 @@
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence&gt;"/>
           </AuxValues>
         </Component>
+        <Component class="javax.swing.JLabel" name="justificationLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="justificationTextField">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JButton" name="cancelBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.cancelBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.cancelBtn.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="[79, 23]"/>
@@ -211,7 +208,7 @@
     <Component class="javax.swing.JButton" name="okBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAccountDialog.okBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAccountDialog.okBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaAccountDialog.java

@@ -23,11 +23,12 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.logging.Level;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+import org.apache.commons.lang.StringUtils;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount;
@@ -36,37 +37,61 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 
 /**
  * Configuration dialog for adding an account to a persona.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class AddAccountDialog extends JDialog {
+public class PersonaAccountDialog extends JDialog {
 
-    private static final Logger logger = Logger.getLogger(AddAccountDialog.class.getName());
+    private static final Logger logger = Logger.getLogger(PersonaAccountDialog.class.getName());
 
     private static final long serialVersionUID = 1L;
-    
+
     private final TypeChoiceRenderer TYPE_CHOICE_RENDERER = new TypeChoiceRenderer();
     private final PersonaDetailsPanel pdp;
-    
+
+    private PersonaDetailsPanel.PAccount currentAccount = null;
+
     /**
      * Creates new add account dialog
      */
-    @Messages({"AddAccountDialog.title.text=Add Account",})
-    public AddAccountDialog(PersonaDetailsPanel pdp) {
-        super((JFrame) WindowManager.getDefault().getMainWindow(),
-                Bundle.AddAccountDialog_title_text(),
-                true);
+    @Messages({"PersonaAccountDialog.title.text=Add Account",})
+    public PersonaAccountDialog(PersonaDetailsPanel pdp) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.PersonaAccountDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
         this.pdp = pdp;
 
         initComponents();
         typeComboBox.setRenderer(TYPE_CHOICE_RENDERER);
         display();
     }
-    
+
+    PersonaAccountDialog(PersonaDetailsPanel pdp, PersonaDetailsPanel.PAccount acc) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.PersonaAccountDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
+        this.pdp = pdp;
+
+        initComponents();
+        currentAccount = acc;
+        confidenceComboBox.setSelectedItem(acc.confidence);
+        justificationTextField.setText(acc.justification);
+        typeComboBox.setSelectedItem(acc.account.getAccountType());
+        identifierTextField.setText(acc.account.getIdentifier());
+
+        typeComboBox.setEnabled(false);
+        identifierTextField.setEnabled(false);
+
+        typeComboBox.setRenderer(TYPE_CHOICE_RENDERER);
+        display();
+    }
+
     /**
-     * This class handles displaying and rendering drop down menu for account choices
+     * This class handles displaying and rendering drop down menu for account
+     * choices
      */
     private class TypeChoiceRenderer extends JLabel implements ListCellRenderer<CentralRepoAccountType>, Serializable {
 
@@ -80,11 +105,10 @@ public class AddAccountDialog extends JDialog {
             return this;
         }
     }
-    
+
     @Messages({
-        "AddAccountDialog_get_types_exception_Title=Central Repository failure",
-        "AddAccountDialog_get_types_exception_msg=Failed to access central repository",
-    })
+        "PersonaAccountDialog_get_types_exception_Title=Central Repository failure",
+        "PersonaAccountDialog_get_types_exception_msg=Failed to access central repository.",})
     private CentralRepoAccountType[] getAllAccountTypes() {
         Collection<CentralRepoAccountType> allAccountTypes;
         try {
@@ -92,9 +116,9 @@ public class AddAccountDialog extends JDialog {
         } catch (CentralRepoException e) {
             logger.log(Level.SEVERE, "Failed to access central repository", e);
             JOptionPane.showMessageDialog(this,
-                                    Bundle.AddAccountDialog_get_types_exception_Title(),
-                                    Bundle.AddAccountDialog_get_types_exception_msg(),
-                                    JOptionPane.ERROR_MESSAGE);
+                    Bundle.PersonaAccountDialog_get_types_exception_Title(),
+                    Bundle.PersonaAccountDialog_get_types_exception_msg(),
+                    JOptionPane.ERROR_MESSAGE);
             return new CentralRepoAccountType[0];
         }
         return allAccountTypes.toArray(new CentralRepoAccountType[0]);
@@ -114,10 +138,10 @@ public class AddAccountDialog extends JDialog {
         identifierTextField = new javax.swing.JTextField();
         typeLbl = new javax.swing.JLabel();
         typeComboBox = new javax.swing.JComboBox<>();
-        justificationLbl = new javax.swing.JLabel();
-        justificationTextField = new javax.swing.JTextField();
         confidenceLbl = new javax.swing.JLabel();
         confidenceComboBox = new javax.swing.JComboBox<>();
+        justificationLbl = new javax.swing.JLabel();
+        justificationTextField = new javax.swing.JTextField();
         cancelBtn = new javax.swing.JButton();
         okBtn = new javax.swing.JButton();
 
@@ -126,27 +150,27 @@ public class AddAccountDialog extends JDialog {
 
         settingsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        org.openide.awt.Mnemonics.setLocalizedText(identiferLbl, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.identiferLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(identiferLbl, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.identiferLbl.text")); // NOI18N
 
-        identifierTextField.setText(org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.identifierTextField.text")); // NOI18N
+        identifierTextField.setText(org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.identifierTextField.text")); // NOI18N
         identifierTextField.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 identifierTextFieldActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(typeLbl, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.typeLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(typeLbl, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.typeLbl.text")); // NOI18N
 
         typeComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(getAllAccountTypes()));
 
-        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.justificationLbl.text")); // NOI18N
-
-        justificationTextField.setText(org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.justificationTextField.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.confidenceLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.confidenceLbl.text")); // NOI18N
 
         confidenceComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence.values()));
 
+        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.justificationLbl.text")); // NOI18N
+
+        justificationTextField.setText(org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.justificationTextField.text")); // NOI18N
+
         javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel);
         settingsPanel.setLayout(settingsPanelLayout);
         settingsPanelLayout.setHorizontalGroup(
@@ -165,11 +189,11 @@ public class AddAccountDialog extends JDialog {
                     .addGroup(settingsPanelLayout.createSequentialGroup()
                         .addComponent(confidenceLbl)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(confidenceComboBox, 0, 269, Short.MAX_VALUE))
+                        .addComponent(confidenceComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addGroup(settingsPanelLayout.createSequentialGroup()
                         .addComponent(justificationLbl)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(justificationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 264, Short.MAX_VALUE)))
+                        .addComponent(justificationTextField)))
                 .addContainerGap())
         );
         settingsPanelLayout.setVerticalGroup(
@@ -179,22 +203,22 @@ public class AddAccountDialog extends JDialog {
                 .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(identiferLbl)
                     .addComponent(identifierTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(typeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(typeLbl, javax.swing.GroupLayout.PREFERRED_SIZE, 9, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(justificationLbl)
-                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(confidenceLbl)
                     .addComponent(confidenceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(justificationLbl)
+                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.cancelBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.cancelBtn.text")); // NOI18N
         cancelBtn.setMaximumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setMinimumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setPreferredSize(new java.awt.Dimension(79, 23));
@@ -204,7 +228,7 @@ public class AddAccountDialog extends JDialog {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(AddAccountDialog.class, "AddAccountDialog.okBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(PersonaAccountDialog.class, "PersonaAccountDialog.okBtn.text")); // NOI18N
         okBtn.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 okBtnActionPerformed(evt);
@@ -216,14 +240,12 @@ public class AddAccountDialog extends JDialog {
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(layout.createSequentialGroup()
-                        .addContainerGap(202, Short.MAX_VALUE)
-                        .addComponent(okBtn)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap(194, Short.MAX_VALUE)
+                .addComponent(okBtn)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
+            .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
 
         layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {cancelBtn, okBtn});
@@ -231,8 +253,9 @@ public class AddAccountDialog extends JDialog {
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
                 .addComponent(settingsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(okBtn, javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(cancelBtn, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -248,19 +271,29 @@ public class AddAccountDialog extends JDialog {
     }
 
     @Messages({
-        "AddAccountDialog_dup_Title=Account add failure",
-        "AddAccountDialog_dup_msg=This account is already added to the persona",
-        "AddAccountDialog_empty_Title=Empty identifier",
-        "AddAccountDialog_empty_msg=The identifier field cannot be empty",
-        "AddAccountDialog_search_failure_Title=Account add failure",
-        "AddAccountDialog_search_failure_msg=Central Repository account search failed",
-        "AddAccountDialog_search_empty_Title=Account not found",
-        "AddAccountDialog_search_empty_msg=Account not found for given identifier and type",})
+        "PersonaAccountDialog_dup_Title=Account add failure",
+        "PersonaAccountDialog_dup_msg=This account is already added to the persona.",
+        "PersonaAccountDialog_identifier_empty_Title=Empty identifier",
+        "PersonaAccountDialog_identifier_empty_msg=The identifier field cannot be empty.",
+        "PersonaAccountDialog_search_failure_Title=Account add failure",
+        "PersonaAccountDialog_search_failure_msg=Central Repository account search failed.",
+        "PersonaAccountDialog_search_empty_Title=Account not found",
+        "PersonaAccountDialog_search_empty_msg=Account not found for given identifier and type.",
+        "PersonaAccountDialog_invalid_account_Title=Invalid account identifier",
+        "PersonaAccountDialog_invalid_account_msg=Account identifier is not valid.",
+    })
     private void okBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okBtnActionPerformed
-        if (identifierTextField.getText().isEmpty()) {
+        if (StringUtils.isBlank(identifierTextField.getText())) {
             JOptionPane.showMessageDialog(this,
-                    Bundle.AddAccountDialog_empty_msg(),
-                    Bundle.AddAccountDialog_empty_Title(),
+                    Bundle.PersonaAccountDialog_identifier_empty_msg(),
+                    Bundle.PersonaAccountDialog_identifier_empty_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (StringUtils.isBlank(justificationTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaDetailsPanel_empty_justification_msg(),
+                    Bundle.PersonaDetailsPanel_empty_justification_Title(),
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -270,15 +303,23 @@ public class AddAccountDialog extends JDialog {
         } catch (CentralRepoException e) {
             logger.log(Level.SEVERE, "Failed to access central repository", e);
             JOptionPane.showMessageDialog(this,
-                    Bundle.AddAccountDialog_search_failure_msg(),
-                    Bundle.AddAccountDialog_search_failure_Title(),
+                    Bundle.PersonaAccountDialog_search_failure_msg(),
+                    Bundle.PersonaAccountDialog_search_failure_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        catch (InvalidAccountIDException e) {
+            logger.log(Level.SEVERE, "Invalid account identifier", e);
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaAccountDialog_invalid_account_msg(),
+                    Bundle.PersonaAccountDialog_invalid_account_Title(),
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
         if (candidates.isEmpty()) {
             JOptionPane.showMessageDialog(this,
-                    Bundle.AddAccountDialog_search_empty_msg(),
-                    Bundle.AddAccountDialog_search_empty_Title(),
+                    Bundle.PersonaAccountDialog_search_empty_msg(),
+                    Bundle.PersonaAccountDialog_search_empty_Title(),
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -292,22 +333,28 @@ public class AddAccountDialog extends JDialog {
         }
         if (result == null) {
             JOptionPane.showMessageDialog(this,
-                    Bundle.AddAccountDialog_search_empty_msg(),
-                    Bundle.AddAccountDialog_search_empty_Title(),
+                    Bundle.PersonaAccountDialog_search_empty_msg(),
+                    Bundle.PersonaAccountDialog_search_empty_Title(),
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
-        
-        if (pdp.addAccount(
-                result,
-                justificationTextField.getText(),
-                (Persona.Confidence) confidenceComboBox.getSelectedItem())) {
+
+        Persona.Confidence confidence = (Persona.Confidence) confidenceComboBox.getSelectedItem();
+        String justification = justificationTextField.getText();
+
+        if (currentAccount != null) {
+            currentAccount.confidence = confidence;
+            currentAccount.justification = justification;
             dispose();
         } else {
-            JOptionPane.showMessageDialog(this,
-                    Bundle.AddAccountDialog_dup_msg(),
-                    Bundle.AddAccountDialog_dup_Title(),
-                    JOptionPane.ERROR_MESSAGE);
+            if (pdp.addAccount(result, justification, confidence)) {
+                dispose();
+            } else {
+                JOptionPane.showMessageDialog(this,
+                        Bundle.PersonaAccountDialog_dup_msg(),
+                        Bundle.PersonaAccountDialog_dup_Title(),
+                        JOptionPane.ERROR_MESSAGE);
+            }
         }
     }//GEN-LAST:event_okBtnActionPerformed
 
@@ -318,7 +365,7 @@ public class AddAccountDialog extends JDialog {
     private void identifierTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_identifierTextFieldActionPerformed
         // TODO add your handling code here:
     }//GEN-LAST:event_identifierTextFieldActionPerformed
-    
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton cancelBtn;
     private javax.swing.JComboBox<org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence> confidenceComboBox;

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaAliasDialog.form

@@ -38,7 +38,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <Component id="settingsPanel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="okBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="cancelBtn" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -92,17 +92,17 @@
                       <Component id="aliasLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="aliasTextField" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="confidenceComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="confidenceLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -111,35 +111,21 @@
         <Component class="javax.swing.JLabel" name="aliasLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.aliasLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.aliasLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="aliasTextField">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.aliasTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="justificationLbl">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="justificationTextField">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.aliasTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="confidenceLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -153,12 +139,26 @@
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence&gt;"/>
           </AuxValues>
         </Component>
+        <Component class="javax.swing.JLabel" name="justificationLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="justificationTextField">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JButton" name="cancelBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.cancelBtn.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.cancelBtn.text_1" 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="[79, 23]"/>
@@ -177,7 +177,7 @@
     <Component class="javax.swing.JButton" name="okBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddAliasDialog.okBtn.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaAliasDialog.okBtn.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaAliasDialog.java

@@ -19,8 +19,9 @@
 package org.sleuthkit.autopsy.centralrepository.persona;
 
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import org.apache.commons.lang.StringUtils;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
@@ -29,26 +30,45 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
  * Configuration dialog for adding aliases to a persona.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class AddAliasDialog extends JDialog {
+public class PersonaAliasDialog extends JDialog {
 
     private static final long serialVersionUID = 1L;
 
     private final PersonaDetailsPanel pdp;
 
+    private PersonaDetailsPanel.PAlias currentAlias = null;
+
     /**
      * Creates new add alias dialog
      */
-    @Messages({"AddAliasDialog.title.text=Add Alias",})
-    public AddAliasDialog(PersonaDetailsPanel pdp) {
-        super((JFrame) WindowManager.getDefault().getMainWindow(),
-                Bundle.AddAliasDialog_title_text(),
-                true);
+    @Messages({"PersonaAliasDialog.title.text=Add Alias",})
+    public PersonaAliasDialog(PersonaDetailsPanel pdp) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.PersonaAliasDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
         this.pdp = pdp;
 
         initComponents();
         display();
     }
 
+    PersonaAliasDialog(PersonaDetailsPanel pdp, PersonaDetailsPanel.PAlias pa) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.PersonaAliasDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
+        this.pdp = pdp;
+
+        initComponents();
+        currentAlias = pa;
+        confidenceComboBox.setSelectedItem(pa.confidence);
+        justificationTextField.setText(pa.justification);
+        aliasTextField.setText(pa.alias);
+
+        aliasTextField.setEnabled(false);
+
+        display();
+    }
+
     /**
      * 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
@@ -61,10 +81,10 @@ public class AddAliasDialog extends JDialog {
         settingsPanel = new javax.swing.JPanel();
         aliasLbl = new javax.swing.JLabel();
         aliasTextField = new javax.swing.JTextField();
-        justificationLbl = new javax.swing.JLabel();
-        justificationTextField = new javax.swing.JTextField();
         confidenceLbl = new javax.swing.JLabel();
         confidenceComboBox = new javax.swing.JComboBox<>();
+        justificationLbl = new javax.swing.JLabel();
+        justificationTextField = new javax.swing.JTextField();
         cancelBtn = new javax.swing.JButton();
         okBtn = new javax.swing.JButton();
 
@@ -73,18 +93,18 @@ public class AddAliasDialog extends JDialog {
 
         settingsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        org.openide.awt.Mnemonics.setLocalizedText(aliasLbl, org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.aliasLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(aliasLbl, org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.aliasLbl.text")); // NOI18N
 
-        aliasTextField.setText(org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.aliasTextField.text")); // NOI18N
+        aliasTextField.setText(org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.aliasTextField.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.justificationLbl.text")); // NOI18N
-
-        justificationTextField.setText(org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.justificationTextField.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.confidenceLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.confidenceLbl.text")); // NOI18N
 
         confidenceComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence.values()));
 
+        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.justificationLbl.text")); // NOI18N
+
+        justificationTextField.setText(org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.justificationTextField.text")); // NOI18N
+
         javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel);
         settingsPanel.setLayout(settingsPanelLayout);
         settingsPanelLayout.setHorizontalGroup(
@@ -114,17 +134,17 @@ public class AddAliasDialog extends JDialog {
                     .addComponent(aliasLbl)
                     .addComponent(aliasTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(justificationLbl))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(confidenceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(confidenceLbl))
-                .addContainerGap())
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(justificationLbl))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.cancelBtn.text_1")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.cancelBtn.text_1")); // NOI18N
         cancelBtn.setMaximumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setMinimumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setPreferredSize(new java.awt.Dimension(79, 23));
@@ -134,7 +154,7 @@ public class AddAliasDialog extends JDialog {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(AddAliasDialog.class, "AddAliasDialog.okBtn.text_1")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(PersonaAliasDialog.class, "PersonaAliasDialog.okBtn.text_1")); // NOI18N
         okBtn.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 okBtnActionPerformed(evt);
@@ -176,19 +196,42 @@ public class AddAliasDialog extends JDialog {
     }
 
     @Messages({
-        "AddAliasDialog_dup_Title=Alias add failure",
-        "AddAliasDialog_dup_msg=This alias has already been added to this persona",})
+        "PersonaAliasDialog_empty_Title=Empty alias",
+        "PersonaAliasDialog_empty_msg=An alias cannot be empty.",
+        "PersonaAliasDialog_dup_Title=Alias add failure",
+        "PersonaAliasDialog_dup_msg=This alias has already been added to this persona.",})
     private void okBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okBtnActionPerformed
-        if (pdp.addAlias(
-                aliasTextField.getText(),
-                justificationTextField.getText(),
-                (Persona.Confidence) confidenceComboBox.getSelectedItem())) {
+        if (StringUtils.isBlank(aliasTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaAliasDialog_empty_msg(),
+                    Bundle.PersonaAliasDialog_empty_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (StringUtils.isBlank(justificationTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaDetailsPanel_empty_justification_msg(),
+                    Bundle.PersonaDetailsPanel_empty_justification_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        Persona.Confidence confidence = (Persona.Confidence) confidenceComboBox.getSelectedItem();
+        String justification = justificationTextField.getText();
+
+        if (currentAlias != null) {
+            currentAlias.confidence = confidence;
+            currentAlias.justification = justification;
             dispose();
         } else {
-            JOptionPane.showMessageDialog(this,
-                        Bundle.AddAliasDialog_dup_msg(),
-                        Bundle.AddAliasDialog_dup_Title(),
+            if (pdp.addAlias(aliasTextField.getText(), justification, confidence)) {
+                dispose();
+            } else {
+                JOptionPane.showMessageDialog(this,
+                        Bundle.PersonaAliasDialog_dup_msg(),
+                        Bundle.PersonaAliasDialog_dup_Title(),
                         JOptionPane.ERROR_MESSAGE);
+            }
         }
     }//GEN-LAST:event_okBtnActionPerformed
 

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaDetailsDialog.java

@@ -44,6 +44,10 @@ public class PersonaDetailsDialog extends JDialog {
         "PersonaDetailsDialogEditTitle=Edit Persona",
         "PersonaDetailsDialogViewTitle=View Persona",})
     public PersonaDetailsDialog(Component parent, PersonaDetailsMode mode, Persona persona, PersonaDetailsDialogCallback callback) {
+        // by default, display the dialog right away
+        this(parent, mode, persona, callback, true);
+    }
+    public PersonaDetailsDialog(Component parent, PersonaDetailsMode mode, Persona persona, PersonaDetailsDialogCallback callback, boolean displayDialog) {
         super((JFrame) WindowManager.getDefault().getMainWindow(),
                 getTitle(mode),
                 true);
@@ -53,7 +57,9 @@ public class PersonaDetailsDialog extends JDialog {
 
         pdp.setMode(parent, mode, persona);
 
-        display();
+        if (displayDialog) {
+            display();
+        }
     }
 
     private static String getTitle(PersonaDetailsMode mode) {
@@ -136,7 +142,7 @@ public class PersonaDetailsDialog extends JDialog {
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    private void display() {
+    public final void display() {
         this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
         setVisible(true);
     }
@@ -153,6 +159,10 @@ public class PersonaDetailsDialog extends JDialog {
         dispose();
     }//GEN-LAST:event_cancelBtnActionPerformed
 
+    public PersonaDetailsPanel getDetailsPanel() {
+        return this.pdp;
+    }
+    
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton cancelBtn;
     private javax.swing.JButton okBtn;

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaDetailsPanel.form

@@ -37,17 +37,20 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <EmptySpace min="0" pref="561" max="32767" attributes="0"/>
+          <Component id="detailsPanel" alignment="1" max="32767" attributes="0"/>
           <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
-              <Component id="detailsPanel" alignment="0" max="32767" attributes="0"/>
+              <EmptySpace min="0" pref="617" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <EmptySpace min="0" pref="559" max="32767" attributes="0"/>
+          <EmptySpace min="0" pref="521" max="32767" attributes="0"/>
           <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
-              <Component id="detailsPanel" alignment="0" max="32767" attributes="0"/>
+              <Group type="102" alignment="0" attributes="0">
+                  <Component id="detailsPanel" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+              </Group>
           </Group>
       </Group>
     </DimensionLayout>
@@ -61,12 +64,7 @@
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="accountsTablePane" alignment="1" pref="549" max="32767" attributes="0"/>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="nameLbl" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="nameField" max="32767" attributes="0"/>
-                      </Group>
+                      <Component id="accountsTablePane" alignment="1" pref="605" max="32767" attributes="0"/>
                       <Component id="accountsLbl" alignment="0" max="32767" attributes="0"/>
                       <Component id="metadataLabel" alignment="0" max="32767" attributes="0"/>
                       <Component id="metadataTablePane" alignment="1" max="32767" attributes="0"/>
@@ -74,31 +72,51 @@
                       <Component id="aliasesTablePane" alignment="0" max="32767" attributes="0"/>
                       <Component id="casesLbl" alignment="0" max="32767" attributes="0"/>
                       <Component id="casesTablePane" max="32767" attributes="0"/>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="commentLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="commentField" max="32767" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="nameLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="nameField" max="32767" attributes="0"/>
+                      </Group>
                       <Group type="102" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Group type="102" alignment="0" attributes="0">
-                                  <Component id="addCaseBtn" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace type="separate" max="-2" attributes="0"/>
-                                  <Component id="deleteCaseBtn" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" attributes="0">
                                   <Component id="addAccountBtn" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="editAccountBtn" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Component id="deleteAccountBtn" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="addMetadataBtn" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="editMetadataBtn" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Component id="deleteMetadataBtn" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="addAliasBtn" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="editAliasBtn" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Component id="deleteAliasBtn" min="-2" max="-2" attributes="0"/>
                               </Group>
                           </Group>
                           <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                       </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="examinerLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="examinerField" min="-2" pref="161" max="-2" attributes="0"/>
+                          <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
+                          <Component id="creationDateLbl" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="creationDateField" max="32767" attributes="0"/>
+                      </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -107,7 +125,19 @@
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="32767" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="examinerLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="examinerField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="creationDateLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="creationDateField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="commentField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="commentLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="nameLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="nameField" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -120,40 +150,83 @@
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="addAccountBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="deleteAccountBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="editAccountBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="metadataLabel" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="metadataTablePane" min="-2" pref="66" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="deleteMetadataBtn" min="-2" max="-2" attributes="0"/>
-                      <Component id="addMetadataBtn" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="addMetadataBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="deleteMetadataBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="editMetadataBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="aliasesLabel" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="aliasesTablePane" min="-2" pref="74" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="deleteAliasBtn" min="-2" max="-2" attributes="0"/>
-                      <Component id="addAliasBtn" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="addAliasBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="deleteAliasBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="editAliasBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="casesLbl" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="casesTablePane" min="-2" pref="63" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="addCaseBtn" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="deleteCaseBtn" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
       </Layout>
       <SubComponents>
+        <Component class="javax.swing.JLabel" name="examinerLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.examinerLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="examinerField">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.examinerField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="creationDateLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.creationDateLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="creationDateField">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.creationDateField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="commentLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.commentLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="commentField">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.commentField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
         <Component class="javax.swing.JLabel" name="nameLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -168,9 +241,6 @@
               <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.nameField.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="nameFieldActionPerformed"/>
-          </Events>
         </Component>
         <Component class="javax.swing.JLabel" name="accountsLbl">
           <Properties>
@@ -203,6 +273,14 @@
             <Property name="enabled" type="boolean" value="false"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JButton" name="editAccountBtn">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.editAccountBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+            <Property name="enabled" type="boolean" value="false"/>
+          </Properties>
+        </Component>
         <Component class="javax.swing.JButton" name="deleteAccountBtn">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -242,6 +320,14 @@
             <Property name="enabled" type="boolean" value="false"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JButton" name="editMetadataBtn">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.editMetadataBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+            <Property name="enabled" type="boolean" value="false"/>
+          </Properties>
+        </Component>
         <Component class="javax.swing.JButton" name="deleteMetadataBtn">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -281,6 +367,14 @@
             <Property name="enabled" type="boolean" value="false"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JButton" name="editAliasBtn">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.editAliasBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+            <Property name="enabled" type="boolean" value="false"/>
+          </Properties>
+        </Component>
         <Component class="javax.swing.JButton" name="deleteAliasBtn">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -312,22 +406,6 @@
             </Component>
           </SubComponents>
         </Container>
-        <Component class="javax.swing.JButton" name="addCaseBtn">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.addCaseBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-            <Property name="enabled" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="deleteCaseBtn">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaDetailsPanel.deleteCaseBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-            <Property name="enabled" type="boolean" value="false"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaDetailsPanel.java

@@ -20,9 +20,13 @@ package org.sleuthkit.autopsy.centralrepository.persona;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
@@ -30,11 +34,14 @@ import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.table.DefaultTableModel;
+import org.apache.commons.lang.StringUtils;
 import org.openide.windows.TopComponent;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.RetainLocation;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoExaminer;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
 import org.sleuthkit.autopsy.centralrepository.datamodel.PersonaAccount;
@@ -65,6 +72,10 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     private final List<PersonaMetadata> metadataToRemove = new ArrayList<>();
     private final List<PersonaAlias> aliasesToRemove = new ArrayList<>();
 
+    private final Map<PersonaAccount, PAccount> accountsToEdit = new HashMap<>();
+    private final Map<PersonaMetadata, PMetadata> metadataToEdit = new HashMap<>();
+    private final Map<PersonaAlias, PAlias> aliasesToEdit = new HashMap<>();
+
     private Persona currentPersona;
     private List<PersonaAccount> currentAccounts = new ArrayList<>();
     private List<PersonaMetadata> currentMetadata = new ArrayList<>();
@@ -76,13 +87,29 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     private PersonaDetailsTableModel aliasesModel;
     private PersonaDetailsTableModel casesModel;
 
+    @Messages({
+        "PersonaDetailsPanel_empty_justification_Title=Empty justification",
+        "PersonaDetailsPanel_empty_justification_msg=The justification field cannot be empty",})
     public PersonaDetailsPanel() {
         initComponents();
         clear();
 
         // Accounts
         addAccountBtn.addActionListener((ActionEvent e) -> {
-            new AddAccountDialog(this);
+            new PersonaAccountDialog(this);
+        });
+        editAccountBtn.addActionListener((ActionEvent e) -> {
+            int selectedRow = accountsTable.getSelectedRow();
+            if (selectedRow != -1) {
+                if (selectedRow >= currentAccounts.size()) {
+                    PAccount acc = accountsToAdd.get(selectedRow - currentAccounts.size());
+                    new PersonaAccountDialog(this, acc);
+                } else {
+                    PersonaAccount personaAccount = currentAccounts.get(selectedRow);
+                    accountsToEdit.putIfAbsent(personaAccount, new PAccount(personaAccount.getAccount(), personaAccount.getJustification(), personaAccount.getConfidence()));
+                    new PersonaAccountDialog(this, accountsToEdit.get(personaAccount));
+                }
+            }
         });
         deleteAccountBtn.addActionListener((ActionEvent e) -> {
             int selectedRow = accountsTable.getSelectedRow();
@@ -91,20 +118,35 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 if (selectedRow >= currentAccounts.size()) {
                     accountsToAdd.remove(selectedRow - currentAccounts.size());
                 } else {
-                    accountsToRemove.add(currentAccounts.get(selectedRow));
-                    currentAccounts.remove(selectedRow);
+                    PersonaAccount toRemove = currentAccounts.get(selectedRow);
+                    accountsToEdit.remove(toRemove);
+                    accountsToRemove.add(toRemove);
+                    currentAccounts.remove(toRemove);
                 }
                 updateAccountsTable();
             }
         });
         accountsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         accountsTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> {
-            handleSelectionChange(e, deleteAccountBtn, accountsTable);
+            handleSelectionChange(e, editAccountBtn, deleteAccountBtn, accountsTable);
         });
 
         // Metadata
         addMetadataBtn.addActionListener((ActionEvent e) -> {
-            new AddMetadataDialog(this);
+            new PersonaMetadataDialog(this);
+        });
+        editMetadataBtn.addActionListener((ActionEvent e) -> {
+            int selectedRow = metadataTable.getSelectedRow();
+            if (selectedRow != -1) {
+                if (selectedRow >= currentMetadata.size()) {
+                    PMetadata md = metadataToAdd.get(selectedRow - currentMetadata.size());
+                    new PersonaMetadataDialog(this, md);
+                } else {
+                    PersonaMetadata personaMetadata = currentMetadata.get(selectedRow);
+                    metadataToEdit.putIfAbsent(personaMetadata, new PMetadata(personaMetadata.getName(), personaMetadata.getValue(), personaMetadata.getJustification(), personaMetadata.getConfidence()));
+                    new PersonaMetadataDialog(this, metadataToEdit.get(personaMetadata));
+                }
+            }
         });
         deleteMetadataBtn.addActionListener((ActionEvent e) -> {
             int selectedRow = metadataTable.getSelectedRow();
@@ -113,20 +155,35 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 if (selectedRow >= currentMetadata.size()) {
                     metadataToAdd.remove(selectedRow - currentMetadata.size());
                 } else {
-                    metadataToRemove.add(currentMetadata.get(selectedRow));
-                    currentMetadata.remove(selectedRow);
+                    PersonaMetadata toRemove = currentMetadata.get(selectedRow);
+                    metadataToEdit.remove(toRemove);
+                    metadataToRemove.add(toRemove);
+                    currentMetadata.remove(toRemove);
                 }
                 updateMetadataTable();
             }
         });
         metadataTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         metadataTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> {
-            handleSelectionChange(e, deleteMetadataBtn, metadataTable);
+            handleSelectionChange(e, editMetadataBtn, deleteMetadataBtn, metadataTable);
         });
 
         // Aliases
         addAliasBtn.addActionListener((ActionEvent e) -> {
-            new AddAliasDialog(this);
+            new PersonaAliasDialog(this);
+        });
+        editAliasBtn.addActionListener((ActionEvent e) -> {
+            int selectedRow = aliasesTable.getSelectedRow();
+            if (selectedRow != -1) {
+                if (selectedRow >= currentAliases.size()) {
+                    PAlias pa = aliasesToAdd.get(selectedRow - currentAliases.size());
+                    new PersonaAliasDialog(this, pa);
+                } else {
+                    PersonaAlias personaAlias = currentAliases.get(selectedRow);
+                    aliasesToEdit.putIfAbsent(personaAlias, new PAlias(personaAlias.getAlias(), personaAlias.getJustification(), personaAlias.getConfidence()));
+                    new PersonaAliasDialog(this, aliasesToEdit.get(personaAlias));
+                }
+            }
         });
         deleteAliasBtn.addActionListener((ActionEvent e) -> {
             int selectedRow = aliasesTable.getSelectedRow();
@@ -135,33 +192,48 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 if (selectedRow >= currentAliases.size()) {
                     aliasesToAdd.remove(selectedRow - currentAliases.size());
                 } else {
-                    aliasesToRemove.add(currentAliases.get(selectedRow));
-                    currentAliases.remove(selectedRow);
+                    PersonaAlias toRemove = currentAliases.get(selectedRow);
+                    aliasesToEdit.remove(toRemove);
+                    aliasesToRemove.add(toRemove);
+                    currentAliases.remove(toRemove);
                 }
                 updateAliasesTable();
             }
         });
         aliasesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         aliasesTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> {
-            handleSelectionChange(e, deleteAliasBtn, aliasesTable);
+            handleSelectionChange(e, editAliasBtn, deleteAliasBtn, aliasesTable);
         });
     }
 
-    private void handleSelectionChange(ListSelectionEvent e, JButton btn, JTable table) {
+    private void handleSelectionChange(ListSelectionEvent e, JButton editBtn, JButton deleteBtn, JTable table) {
         if (e.getValueIsAdjusting()) {
             return;
         }
-        btn.setEnabled(mode != PersonaDetailsMode.VIEW && table.getSelectedRow() != -1);
+        editBtn.setEnabled(mode != PersonaDetailsMode.VIEW && table.getSelectedRow() != -1);
+        deleteBtn.setEnabled(mode != PersonaDetailsMode.VIEW && table.getSelectedRow() != -1);
+    }
+
+    void addEditExistingAccount(PersonaAccount account, String justification, Persona.Confidence confidence) {
+        accountsToEdit.put(account, new PAccount(account.getAccount(), justification, confidence));
+    }
+
+    void addEditExistingMetadata(PersonaMetadata metadata, String justification, Persona.Confidence confidence) {
+        metadataToEdit.put(metadata, new PMetadata(metadata.getName(), metadata.getValue(), justification, confidence));
+    }
+
+    void addEditExistingAlias(PersonaAlias alias, String justification, Persona.Confidence confidence) {
+        aliasesToEdit.put(alias, new PAlias(alias.getAlias(), justification, confidence));
     }
 
     /**
      * A data bucket class for yet-to-be-created PersonaAccount
      */
-    private class PAccount {
+    class PAccount {
 
-        private final CentralRepoAccount account;
-        private final String justification;
-        private final Persona.Confidence confidence;
+        CentralRepoAccount account;
+        String justification;
+        Persona.Confidence confidence;
 
         PAccount(CentralRepoAccount account, String justification, Persona.Confidence confidence) {
             this.account = account;
@@ -182,9 +254,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
             }
         }
         return false;
-    } 
+    }
 
-    boolean addAccount(CentralRepoAccount account, String justification, Persona.Confidence confidence) {
+    public boolean addAccount(CentralRepoAccount account, String justification, Persona.Confidence confidence) {
         if (!accountExists(account)) {
             accountsToAdd.add(new PAccount(account, justification, confidence));
             updateAccountsTable();
@@ -196,12 +268,12 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     /**
      * A data bucket class for yet-to-be-created PersonaMetadata
      */
-    private class PMetadata {
+    class PMetadata {
 
-        private final String name;
-        private final String value;
-        private final String justification;
-        private final Persona.Confidence confidence;
+        String name;
+        String value;
+        String justification;
+        Persona.Confidence confidence;
 
         PMetadata(String name, String value, String justification, Persona.Confidence confidence) {
             this.name = name;
@@ -237,11 +309,11 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     /**
      * A data bucket class for yet-to-be-created PersonaAlias
      */
-    private class PAlias {
+    class PAlias {
 
-        private final String alias;
-        private final String justification;
-        private final Persona.Confidence confidence;
+        String alias;
+        String justification;
+        Persona.Confidence confidence;
 
         PAlias(String alias, String justification, Persona.Confidence confidence) {
             this.alias = alias;
@@ -282,38 +354,55 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     private void initComponents() {
 
         detailsPanel = new javax.swing.JPanel();
+        examinerLbl = new javax.swing.JLabel();
+        examinerField = new javax.swing.JTextField();
+        creationDateLbl = new javax.swing.JLabel();
+        creationDateField = new javax.swing.JTextField();
+        commentLbl = new javax.swing.JLabel();
+        commentField = new javax.swing.JTextField();
         nameLbl = new javax.swing.JLabel();
         nameField = new javax.swing.JTextField();
         accountsLbl = new javax.swing.JLabel();
         accountsTablePane = new javax.swing.JScrollPane();
         accountsTable = new javax.swing.JTable();
         addAccountBtn = new javax.swing.JButton();
+        editAccountBtn = new javax.swing.JButton();
         deleteAccountBtn = new javax.swing.JButton();
         metadataLabel = new javax.swing.JLabel();
         metadataTablePane = new javax.swing.JScrollPane();
         metadataTable = new javax.swing.JTable();
         addMetadataBtn = new javax.swing.JButton();
+        editMetadataBtn = new javax.swing.JButton();
         deleteMetadataBtn = new javax.swing.JButton();
         aliasesLabel = new javax.swing.JLabel();
         aliasesTablePane = new javax.swing.JScrollPane();
         aliasesTable = new javax.swing.JTable();
         addAliasBtn = new javax.swing.JButton();
+        editAliasBtn = new javax.swing.JButton();
         deleteAliasBtn = new javax.swing.JButton();
         casesLbl = new javax.swing.JLabel();
         casesTablePane = new javax.swing.JScrollPane();
         casesTable = new javax.swing.JTable();
-        addCaseBtn = new javax.swing.JButton();
-        deleteCaseBtn = new javax.swing.JButton();
+
+        org.openide.awt.Mnemonics.setLocalizedText(examinerLbl, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.examinerLbl.text")); // NOI18N
+
+        examinerField.setEditable(false);
+        examinerField.setText(org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.examinerField.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(creationDateLbl, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.creationDateLbl.text")); // NOI18N
+
+        creationDateField.setEditable(false);
+        creationDateField.setText(org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.creationDateField.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(commentLbl, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.commentLbl.text")); // NOI18N
+
+        commentField.setEditable(false);
+        commentField.setText(org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.commentField.text")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(nameLbl, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.nameLbl.text")); // NOI18N
 
         nameField.setEditable(false);
         nameField.setText(org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.nameField.text")); // NOI18N
-        nameField.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                nameFieldActionPerformed(evt);
-            }
-        });
 
         org.openide.awt.Mnemonics.setLocalizedText(accountsLbl, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.accountsLbl.text")); // NOI18N
 
@@ -333,6 +422,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(addAccountBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.addAccountBtn.text")); // NOI18N
         addAccountBtn.setEnabled(false);
 
+        org.openide.awt.Mnemonics.setLocalizedText(editAccountBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.editAccountBtn.text")); // NOI18N
+        editAccountBtn.setEnabled(false);
+
         org.openide.awt.Mnemonics.setLocalizedText(deleteAccountBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.deleteAccountBtn.text")); // NOI18N
         deleteAccountBtn.setEnabled(false);
 
@@ -354,6 +446,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(addMetadataBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.addMetadataBtn.text")); // NOI18N
         addMetadataBtn.setEnabled(false);
 
+        org.openide.awt.Mnemonics.setLocalizedText(editMetadataBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.editMetadataBtn.text")); // NOI18N
+        editMetadataBtn.setEnabled(false);
+
         org.openide.awt.Mnemonics.setLocalizedText(deleteMetadataBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.deleteMetadataBtn.text")); // NOI18N
         deleteMetadataBtn.setEnabled(false);
 
@@ -375,6 +470,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(addAliasBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.addAliasBtn.text")); // NOI18N
         addAliasBtn.setEnabled(false);
 
+        org.openide.awt.Mnemonics.setLocalizedText(editAliasBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.editAliasBtn.text")); // NOI18N
+        editAliasBtn.setEnabled(false);
+
         org.openide.awt.Mnemonics.setLocalizedText(deleteAliasBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.deleteAliasBtn.text")); // NOI18N
         deleteAliasBtn.setEnabled(false);
 
@@ -393,12 +491,6 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         ));
         casesTablePane.setViewportView(casesTable);
 
-        org.openide.awt.Mnemonics.setLocalizedText(addCaseBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.addCaseBtn.text")); // NOI18N
-        addCaseBtn.setEnabled(false);
-
-        org.openide.awt.Mnemonics.setLocalizedText(deleteCaseBtn, org.openide.util.NbBundle.getMessage(PersonaDetailsPanel.class, "PersonaDetailsPanel.deleteCaseBtn.text")); // NOI18N
-        deleteCaseBtn.setEnabled(false);
-
         javax.swing.GroupLayout detailsPanelLayout = new javax.swing.GroupLayout(detailsPanel);
         detailsPanel.setLayout(detailsPanelLayout);
         detailsPanelLayout.setHorizontalGroup(
@@ -406,11 +498,7 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
             .addGroup(detailsPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(accountsTablePane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 549, Short.MAX_VALUE)
-                    .addGroup(detailsPanelLayout.createSequentialGroup()
-                        .addComponent(nameLbl)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(nameField))
+                    .addComponent(accountsTablePane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 605, Short.MAX_VALUE)
                     .addComponent(accountsLbl, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(metadataLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(metadataTablePane, javax.swing.GroupLayout.Alignment.TRAILING)
@@ -418,31 +506,59 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                     .addComponent(aliasesTablePane)
                     .addComponent(casesLbl, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(casesTablePane)
+                    .addGroup(detailsPanelLayout.createSequentialGroup()
+                        .addComponent(commentLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(commentField))
+                    .addGroup(detailsPanelLayout.createSequentialGroup()
+                        .addComponent(nameLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(nameField))
                     .addGroup(detailsPanelLayout.createSequentialGroup()
                         .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(detailsPanelLayout.createSequentialGroup()
-                                .addComponent(addCaseBtn)
-                                .addGap(18, 18, 18)
-                                .addComponent(deleteCaseBtn))
                             .addGroup(detailsPanelLayout.createSequentialGroup()
                                 .addComponent(addAccountBtn)
                                 .addGap(18, 18, 18)
+                                .addComponent(editAccountBtn)
+                                .addGap(18, 18, 18)
                                 .addComponent(deleteAccountBtn))
                             .addGroup(detailsPanelLayout.createSequentialGroup()
                                 .addComponent(addMetadataBtn)
                                 .addGap(18, 18, 18)
+                                .addComponent(editMetadataBtn)
+                                .addGap(18, 18, 18)
                                 .addComponent(deleteMetadataBtn))
                             .addGroup(detailsPanelLayout.createSequentialGroup()
                                 .addComponent(addAliasBtn)
                                 .addGap(18, 18, 18)
+                                .addComponent(editAliasBtn)
+                                .addGap(18, 18, 18)
                                 .addComponent(deleteAliasBtn)))
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                        .addGap(0, 0, Short.MAX_VALUE))
+                    .addGroup(detailsPanelLayout.createSequentialGroup()
+                        .addComponent(examinerLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(examinerField, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(18, 18, 18)
+                        .addComponent(creationDateLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(creationDateField)))
                 .addContainerGap())
         );
         detailsPanelLayout.setVerticalGroup(
             detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(detailsPanelLayout.createSequentialGroup()
-                .addContainerGap()
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(examinerLbl)
+                    .addComponent(examinerField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(creationDateLbl)
+                    .addComponent(creationDateField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(commentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(commentLbl))
+                .addGap(20, 20, 20)
                 .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(nameLbl)
                     .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -453,61 +569,57 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(addAccountBtn)
-                    .addComponent(deleteAccountBtn))
+                    .addComponent(deleteAccountBtn)
+                    .addComponent(editAccountBtn))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(metadataLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(metadataTablePane, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(addMetadataBtn)
                     .addComponent(deleteMetadataBtn)
-                    .addComponent(addMetadataBtn))
+                    .addComponent(editMetadataBtn))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(aliasesLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(aliasesTablePane, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(addAliasBtn)
                     .addComponent(deleteAliasBtn)
-                    .addComponent(addAliasBtn))
+                    .addComponent(editAliasBtn))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(casesLbl)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(casesTablePane, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(detailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(addCaseBtn)
-                    .addComponent(deleteCaseBtn))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap())
         );
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 561, Short.MAX_VALUE)
+            .addComponent(detailsPanel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .addComponent(detailsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGap(0, 617, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 559, Short.MAX_VALUE)
+            .addGap(0, 521, Short.MAX_VALUE)
             .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .addComponent(detailsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGroup(layout.createSequentialGroup()
+                    .addComponent(detailsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addGap(0, 0, Short.MAX_VALUE)))
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void nameFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_nameFieldActionPerformed
-
-    }//GEN-LAST:event_nameFieldActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel accountsLbl;
     private javax.swing.JTable accountsTable;
     private javax.swing.JScrollPane accountsTablePane;
     private javax.swing.JButton addAccountBtn;
     private javax.swing.JButton addAliasBtn;
-    private javax.swing.JButton addCaseBtn;
     private javax.swing.JButton addMetadataBtn;
     private javax.swing.JLabel aliasesLabel;
     private javax.swing.JTable aliasesTable;
@@ -515,11 +627,19 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     private javax.swing.JLabel casesLbl;
     private javax.swing.JTable casesTable;
     private javax.swing.JScrollPane casesTablePane;
+    private javax.swing.JTextField commentField;
+    private javax.swing.JLabel commentLbl;
+    private javax.swing.JTextField creationDateField;
+    private javax.swing.JLabel creationDateLbl;
     private javax.swing.JButton deleteAccountBtn;
     private javax.swing.JButton deleteAliasBtn;
-    private javax.swing.JButton deleteCaseBtn;
     private javax.swing.JButton deleteMetadataBtn;
     private javax.swing.JPanel detailsPanel;
+    private javax.swing.JButton editAccountBtn;
+    private javax.swing.JButton editAliasBtn;
+    private javax.swing.JButton editMetadataBtn;
+    private javax.swing.JTextField examinerField;
+    private javax.swing.JLabel examinerLbl;
     private javax.swing.JLabel metadataLabel;
     private javax.swing.JTable metadataTable;
     private javax.swing.JScrollPane metadataTablePane;
@@ -529,14 +649,24 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
 
     @Messages({
         "PersonaDetailsPanel_load_exception_Title=Initialization failure",
-        "PersonaDetailsPanel_load_exception_msg=Failed to load persona",})
+        "PersonaDetailsPanel_load_exception_msg=Failed to load persona.",})
     private void loadPersona(Component parent, Persona persona) {
+        String examiner;
+        String creationDate;
+        String comment;
         String name;
         Collection<PersonaAccount> accounts;
         Collection<PersonaMetadata> metadata;
         Collection<PersonaAlias> aliases;
         Collection<CorrelationCase> cases;
         try {
+            examiner = persona.getExaminer().getLoginName();
+            
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+            Date cDate = new Date(persona.getCreatedDate());
+            creationDate = dateFormat.format(cDate);
+            
+            comment = persona.getComment();
             name = persona.getName();
             accounts = persona.getPersonaAccounts();
             metadata = persona.getMetadata();
@@ -551,6 +681,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
             return;
         }
         this.currentPersona = persona;
+        this.examinerField.setText(examiner);
+        this.creationDateField.setText(creationDate);
+        this.commentField.setText(comment);
         this.nameField.setText(name);
         this.currentAccounts.addAll(accounts);
         this.currentMetadata.addAll(metadata);
@@ -560,6 +693,9 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
 
     void clear() {
         currentPersona = null;
+        examinerField.setText("");
+        creationDateField.setText("");
+        commentField.setText("");
         nameField.setText(mode == PersonaDetailsMode.CREATE ? Persona.getDefaultName() : "");
         currentAccounts = new ArrayList<>();
         currentMetadata = new ArrayList<>();
@@ -569,17 +705,19 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         metadataToAdd.clear();
         aliasesToAdd.clear();
         nameField.setEditable(false);
+        commentField.setEditable(false);
 
         initializeFields();
 
         addAccountBtn.setEnabled(false);
         addMetadataBtn.setEnabled(false);
         addAliasBtn.setEnabled(false);
-        addCaseBtn.setEnabled(false);
         deleteAccountBtn.setEnabled(false);
         deleteMetadataBtn.setEnabled(false);
         deleteAliasBtn.setEnabled(false);
-        deleteCaseBtn.setEnabled(false);
+        editAccountBtn.setEnabled(false);
+        editMetadataBtn.setEnabled(false);
+        editAliasBtn.setEnabled(false);
     }
 
     /**
@@ -677,15 +815,37 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         casesTable.setModel(casesModel);
     }
 
-    void enableEditUIComponents() {
-        nameField.setEditable(true);
-        addAccountBtn.setEnabled(true);
-        addMetadataBtn.setEnabled(true);
-        addAliasBtn.setEnabled(true);
-        //addCaseBtn.setEnabled(true); //todo
+    void configureEditComponents(boolean enabled) {
+        commentField.setEditable(enabled);
+        nameField.setEditable(enabled);
+        addAccountBtn.setEnabled(enabled);
+        addMetadataBtn.setEnabled(enabled);
+        addAliasBtn.setEnabled(enabled);
+
+        addAccountBtn.setVisible(enabled);
+        editAccountBtn.setVisible(enabled);
+        deleteAccountBtn.setVisible(enabled);
+        addMetadataBtn.setVisible(enabled);
+        editMetadataBtn.setVisible(enabled);
+        deleteMetadataBtn.setVisible(enabled);
+        addAliasBtn.setVisible(enabled);
+        editAliasBtn.setVisible(enabled);
+        deleteAliasBtn.setVisible(enabled);
     }
 
     void initializeFields() {
+        if (mode == PersonaDetailsMode.CREATE) {
+            try {
+                CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name"));
+                examinerField.setText(examiner.getLoginName());
+            } catch (CentralRepoException e) {
+                logger.log(Level.SEVERE, "Failed to access central repository", e);
+                JOptionPane.showMessageDialog(this,
+                        Bundle.PersonaDetailsPanel_CentralRepoErr_msg(),
+                        Bundle.PersonaDetailsPanel_CentralRepoErr_Title(),
+                        JOptionPane.ERROR_MESSAGE);
+            }
+        }
         updateAccountsTable();
         updateMetadataTable();
         updateAliasesTable();
@@ -697,14 +857,15 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
         this.mode = mode;
         switch (mode) {
             case CREATE:
-                enableEditUIComponents();
+                configureEditComponents(true);
                 break;
             case EDIT:
                 loadPersona(parent, persona);
-                enableEditUIComponents();
+                configureEditComponents(true);
                 break;
             case VIEW:
                 loadPersona(parent, persona);
+                configureEditComponents(false);
                 break;
             default:
                 logger.log(Level.WARNING, "Unsupported mode: {0}", mode);
@@ -714,12 +875,14 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
     }
 
     @Messages({
-        "PersonaDetailsPanel_NotEnoughAccounts_msg=A persona needs at least one account",
+        "PersonaDetailsPanel_NotEnoughAccounts_msg=A persona needs at least one account.",
         "PersonaDetailsPanel_NotEnoughAccounts_Title=Missing account",
-        "PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository",
+        "PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository.",
         "PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure",
-        "PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty",
-        "PersonaDetailsPanel_EmptyName_Title=Empty persona name",})
+        "PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty.",
+        "PersonaDetailsPanel_EmptyName_Title=Empty persona name",
+        "PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty.",
+        "PersonaDetailsPanel_EmptyComment_Title=Empty persona comment",})
     Persona okHandler() {
         if (accountsToAdd.size() + currentAccounts.size() < 1) {
             JOptionPane.showMessageDialog(this,
@@ -729,7 +892,14 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
             return null;
 
         }
-        if (nameField.getText().isEmpty()) {
+        if (StringUtils.isBlank(commentField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaDetailsPanel_EmptyComment_msg(),
+                    Bundle.PersonaDetailsPanel_EmptyComment_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return null;
+        }
+        if (StringUtils.isBlank(nameField.getText())) {
             JOptionPane.showMessageDialog(this,
                     Bundle.PersonaDetailsPanel_EmptyName_msg(),
                     Bundle.PersonaDetailsPanel_EmptyName_Title(),
@@ -743,7 +913,7 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 try {
                     PAccount firstAccount = accountsToAdd.get(0);
                     ret = Persona.createPersonaForAccount(nameField.getText(),
-                            "", Persona.PersonaStatus.ACTIVE, firstAccount.account,
+                            commentField.getText(), Persona.PersonaStatus.ACTIVE, firstAccount.account,
                             firstAccount.justification, firstAccount.confidence);
                     for (int i = 1; i < accountsToAdd.size(); i++) {
                         ret.addAccount(accountsToAdd.get(i).account,
@@ -768,6 +938,7 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
             case EDIT:
                 try {
                     ret = currentPersona;
+                    currentPersona.setComment(commentField.getText());
                     currentPersona.setName(nameField.getText());
                     for (PAccount acc : accountsToAdd) {
                         ret.addAccount(acc.account, acc.justification, acc.confidence);
@@ -775,18 +946,27 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                     for (PersonaAccount acc : accountsToRemove) {
                         ret.removeAccount(acc);
                     }
+                    for (HashMap.Entry<PersonaAccount, PAccount> entry : accountsToEdit.entrySet()) {
+                        ret.modifyAccount(entry.getKey(), entry.getValue().confidence, entry.getValue().justification);
+                    }
                     for (PMetadata md : metadataToAdd) {
                         ret.addMetadata(md.name, md.value, md.justification, md.confidence);
                     }
                     for (PersonaMetadata md : metadataToRemove) {
                         ret.removeMetadata(md);
                     }
+                    for (HashMap.Entry<PersonaMetadata, PMetadata> entry : metadataToEdit.entrySet()) {
+                        ret.modifyMetadata(entry.getKey(), entry.getValue().confidence, entry.getValue().justification);
+                    }
                     for (PAlias pa : aliasesToAdd) {
                         ret.addAlias(pa.alias, pa.justification, pa.confidence);
                     }
                     for (PersonaAlias pa : aliasesToRemove) {
                         ret.removeAlias(pa);
                     }
+                    for (HashMap.Entry<PersonaAlias, PAlias> entry : aliasesToEdit.entrySet()) {
+                        ret.modifyAlias(entry.getKey(), entry.getValue().confidence, entry.getValue().justification);
+                    }
                 } catch (CentralRepoException e) {
                     logger.log(Level.SEVERE, "Failed to access central repository", e);
                     JOptionPane.showMessageDialog(this,
@@ -797,10 +977,21 @@ public final class PersonaDetailsPanel extends javax.swing.JPanel {
                 }
                 break;
             case VIEW:
+                ret = currentPersona;
                 break;
             default:
                 logger.log(Level.SEVERE, "Unsupported mode: {0}", mode);
         }
         return ret;
     }
+
+    /**
+     * Sets the persona name field.
+     *
+     * @param name Persona name.
+     */
+    public void setPersonaName(String name) {
+        nameField.setText(name);
+    }
+
 }

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaMetadataDialog.form

@@ -103,16 +103,16 @@
                       <Component id="valueTextField" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="confidenceComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="confidenceLbl" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="justificationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="justificationLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -121,49 +121,35 @@
         <Component class="javax.swing.JLabel" name="nameLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.nameLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.nameLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="nameTextField">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.nameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.nameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="valueLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.valueLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.valueLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="valueTextField">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.valueTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="justificationLbl">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="justificationTextField">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.valueTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="confidenceLbl">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.confidenceLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -177,12 +163,26 @@
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence&gt;"/>
           </AuxValues>
         </Component>
+        <Component class="javax.swing.JLabel" name="justificationLbl">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.justificationLbl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="justificationTextField">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.justificationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JButton" name="cancelBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.cancelBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.cancelBtn.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="[79, 23]"/>
@@ -201,7 +201,7 @@
     <Component class="javax.swing.JButton" name="okBtn">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="AddMetadataDialog.okBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaMetadataDialog.okBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaMetadataDialog.java

@@ -19,8 +19,9 @@
 package org.sleuthkit.autopsy.centralrepository.persona;
 
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
@@ -29,26 +30,47 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
  * Configuration dialog for adding metadata to a persona.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class AddMetadataDialog extends JDialog {
+public class PersonaMetadataDialog extends JDialog {
 
     private static final long serialVersionUID = 1L;
 
     private final PersonaDetailsPanel pdp;
 
+    private PersonaDetailsPanel.PMetadata currentMetadata;
+
     /**
      * Creates new add metadata dialog
      */
     @Messages({"AddMetadataDialog.title.text=Add Metadata",})
-    public AddMetadataDialog(PersonaDetailsPanel pdp) {
-        super((JFrame) WindowManager.getDefault().getMainWindow(),
+    public PersonaMetadataDialog(PersonaDetailsPanel pdp) {
+        super(SwingUtilities.windowForComponent(pdp),
                 Bundle.AddMetadataDialog_title_text(),
-                true);
+                ModalityType.APPLICATION_MODAL);
         this.pdp = pdp;
 
         initComponents();
         display();
     }
 
+    PersonaMetadataDialog(PersonaDetailsPanel pdp, PersonaDetailsPanel.PMetadata md) {
+        super(SwingUtilities.windowForComponent(pdp),
+                Bundle.AddMetadataDialog_title_text(),
+                ModalityType.APPLICATION_MODAL);
+        this.pdp = pdp;
+
+        initComponents();
+        currentMetadata = md;
+        confidenceComboBox.setSelectedItem(md.confidence);
+        justificationTextField.setText(md.justification);
+        nameTextField.setText(md.name);
+        valueTextField.setText(md.value);
+
+        nameTextField.setEnabled(false);
+        valueTextField.setEnabled(false);
+
+        display();
+    }
+
     /**
      * 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
@@ -63,10 +85,10 @@ public class AddMetadataDialog extends JDialog {
         nameTextField = new javax.swing.JTextField();
         valueLbl = new javax.swing.JLabel();
         valueTextField = new javax.swing.JTextField();
-        justificationLbl = new javax.swing.JLabel();
-        justificationTextField = new javax.swing.JTextField();
         confidenceLbl = new javax.swing.JLabel();
         confidenceComboBox = new javax.swing.JComboBox<>();
+        justificationLbl = new javax.swing.JLabel();
+        justificationTextField = new javax.swing.JTextField();
         cancelBtn = new javax.swing.JButton();
         okBtn = new javax.swing.JButton();
 
@@ -75,22 +97,22 @@ public class AddMetadataDialog extends JDialog {
 
         settingsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        org.openide.awt.Mnemonics.setLocalizedText(nameLbl, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.nameLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(nameLbl, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.nameLbl.text")); // NOI18N
 
-        nameTextField.setText(org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.nameTextField.text")); // NOI18N
+        nameTextField.setText(org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.nameTextField.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(valueLbl, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.valueLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(valueLbl, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.valueLbl.text")); // NOI18N
 
-        valueTextField.setText(org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.valueTextField.text")); // NOI18N
+        valueTextField.setText(org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.valueTextField.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.justificationLbl.text")); // NOI18N
-
-        justificationTextField.setText(org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.justificationTextField.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.confidenceLbl.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(confidenceLbl, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.confidenceLbl.text")); // NOI18N
 
         confidenceComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(org.sleuthkit.autopsy.centralrepository.datamodel.Persona.Confidence.values()));
 
+        org.openide.awt.Mnemonics.setLocalizedText(justificationLbl, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.justificationLbl.text")); // NOI18N
+
+        justificationTextField.setText(org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.justificationTextField.text")); // NOI18N
+
         javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel);
         settingsPanel.setLayout(settingsPanelLayout);
         settingsPanelLayout.setHorizontalGroup(
@@ -128,17 +150,17 @@ public class AddMetadataDialog extends JDialog {
                     .addComponent(valueLbl)
                     .addComponent(valueTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(justificationLbl))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(confidenceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(confidenceLbl))
-                .addContainerGap())
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(justificationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(justificationLbl))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.cancelBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.cancelBtn.text")); // NOI18N
         cancelBtn.setMaximumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setMinimumSize(new java.awt.Dimension(79, 23));
         cancelBtn.setPreferredSize(new java.awt.Dimension(79, 23));
@@ -148,7 +170,7 @@ public class AddMetadataDialog extends JDialog {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(AddMetadataDialog.class, "AddMetadataDialog.okBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(PersonaMetadataDialog.class, "PersonaMetadataDialog.okBtn.text")); // NOI18N
         okBtn.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 okBtnActionPerformed(evt);
@@ -191,19 +213,41 @@ public class AddMetadataDialog extends JDialog {
 
     @Messages({
         "AddMetadataDialog_dup_Title=Metadata add failure",
-        "AddMetadataDialog_dup_msg=A metadata entry with this name has already been added to this persona",})
+        "AddMetadataDialog_dup_msg=A metadata entry with this name has already been added to this persona.",
+        "AddMetadataDialog_empty_name_Title=Missing field(s)",
+        "AddMetadataDialog_empty_name_msg=A metadata entry cannot have an empty name or value.",})
     private void okBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okBtnActionPerformed
-        if (pdp.addMetadata(
-                nameTextField.getText(),
-                valueTextField.getText(),
-                justificationTextField.getText(),
-                (Persona.Confidence) confidenceComboBox.getSelectedItem())) {
+        if (StringUtils.isBlank(nameTextField.getText()) || StringUtils.isBlank(valueTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.AddMetadataDialog_empty_name_msg(),
+                    Bundle.AddMetadataDialog_empty_name_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (StringUtils.isBlank(justificationTextField.getText())) {
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonaDetailsPanel_empty_justification_msg(),
+                    Bundle.PersonaDetailsPanel_empty_justification_Title(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        Persona.Confidence confidence = (Persona.Confidence) confidenceComboBox.getSelectedItem();
+        String justification = justificationTextField.getText();
+
+        if (currentMetadata != null) {
+            currentMetadata.confidence = confidence;
+            currentMetadata.justification = justification;
             dispose();
         } else {
-            JOptionPane.showMessageDialog(this,
+            if (pdp.addMetadata(nameTextField.getText(), valueTextField.getText(), justification, confidence)) {
+                dispose();
+            } else {
+                JOptionPane.showMessageDialog(this,
                         Bundle.AddMetadataDialog_dup_msg(),
                         Bundle.AddMetadataDialog_dup_Title(),
                         JOptionPane.ERROR_MESSAGE);
+            }
         }
     }//GEN-LAST:event_okBtnActionPerformed
 

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.form

@@ -1,35 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-
--->
-
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="searchButtonGroup">
     </Component>
   </NonVisualComponents>
   <Properties>
-    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[400, 400]"/>
-    </Property>
+    <Property name="name" type="java.lang.String" value="" noResource="true"/>
   </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
@@ -46,17 +23,52 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jSplitPane1" alignment="0" pref="692" max="32767" attributes="0"/>
+          <Component id="introTextScrollPane" alignment="0" max="32767" attributes="0"/>
+          <Component id="mainSplitPane" alignment="0" pref="724" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jSplitPane1" alignment="0" max="32767" attributes="0"/>
+          <Group type="102" alignment="1" attributes="0">
+              <Component id="introTextScrollPane" min="-2" pref="49" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="mainSplitPane" pref="489" max="32767" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Container class="javax.swing.JSplitPane" name="jSplitPane1">
+    <Container class="javax.swing.JScrollPane" name="introTextScrollPane">
+      <Properties>
+        <Property name="verticalScrollBarPolicy" type="int" value="21"/>
+      </Properties>
+      <AuxValues>
+        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+      </AuxValues>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JTextArea" name="introText">
+          <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection component="Form" name="getBackground" type="method"/>
+            </Property>
+            <Property name="columns" type="int" value="20"/>
+            <Property name="lineWrap" type="boolean" value="true"/>
+            <Property name="rows" type="int" value="5"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.introText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+            <Property name="wrapStyleWord" type="boolean" value="true"/>
+            <Property name="focusable" type="boolean" value="false"/>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Container class="javax.swing.JSplitPane" name="mainSplitPane">
+      <Properties>
+        <Property name="dividerLocation" type="int" value="400"/>
+      </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
@@ -73,13 +85,7 @@
                   <Group type="102" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="createBtn" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="editBtn" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="32767" attributes="0"/>
-                              <Component id="deleteBtn" min="-2" max="-2" attributes="0"/>
-                          </Group>
+                          <Component id="createButtonSeparator" max="32767" attributes="0"/>
                           <Component id="resultsPane" pref="0" max="32767" attributes="0"/>
                           <Component id="searchField" max="32767" attributes="0"/>
                           <Group type="102" attributes="0">
@@ -89,6 +95,20 @@
                               <EmptySpace max="32767" attributes="0"/>
                               <Component id="searchBtn" min="-2" max="-2" attributes="0"/>
                           </Group>
+                          <Group type="102" attributes="0">
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="createAccountBtn" min="-2" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Component id="createBtn" min="-2" max="-2" attributes="0"/>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="editBtn" min="-2" max="-2" attributes="0"/>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="deleteBtn" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                                  <Component id="cbFilterByKeyword" alignment="0" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace min="0" pref="50" max="32767" attributes="0"/>
+                          </Group>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
@@ -97,7 +117,8 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="cbFilterByKeyword" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
                       <Component id="searchField" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
@@ -106,7 +127,7 @@
                           <Component id="searchBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="resultsPane" pref="528" max="32767" attributes="0"/>
+                      <Component id="resultsPane" min="-2" pref="302" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="editBtn" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -114,6 +135,10 @@
                           <Component id="deleteBtn" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
+                      <Component id="createButtonSeparator" min="-2" pref="4" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="createAccountBtn" min="-2" pref="32" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -122,7 +147,7 @@
             <Component class="javax.swing.JTextField" name="searchField">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.searchField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.searchField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -133,7 +158,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/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.searchNameRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.searchNameRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -143,9 +168,15 @@
                   <ComponentRef name="searchButtonGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.searchAccountRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.searchAccountRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JButton" name="searchBtn">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.searchBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="enabled" type="boolean" value="false"/>
               </Properties>
             </Component>
             <Container class="javax.swing.JScrollPane" name="resultsPane">
@@ -158,20 +189,20 @@
                 <Component class="javax.swing.JTable" name="resultsTable">
                   <Properties>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.resultsTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.resultsTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
                       <TableColumnModel selectionModel="0">
                         <Column maxWidth="25" minWidth="-1" prefWidth="-1" resizable="true">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.resultsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                            <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.resultsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
                         </Column>
                         <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.resultsTable.columnModel.title1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                            <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.resultsTable.columnModel.title1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
@@ -185,48 +216,69 @@
                 </Component>
               </SubComponents>
             </Container>
-            <Component class="javax.swing.JButton" name="searchBtn">
+            <Component class="javax.swing.JButton" name="createAccountBtn">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.searchBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JButton" name="editBtn">
-              <Properties>
-                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.editBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-                <Property name="enabled" type="boolean" value="false"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JButton" name="createBtn">
-              <Properties>
-                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.createBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.createAccountBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <AuxValues>
                 <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
               </AuxValues>
             </Component>
-            <Component class="javax.swing.JButton" name="deleteBtn">
+            <Component class="javax.swing.JButton" name="editBtn">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.deleteBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.editBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="enabled" type="boolean" value="false"/>
               </Properties>
             </Component>
+            <Component class="javax.swing.JButton" name="deleteBtn">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.deleteBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+                <Property name="enabled" type="boolean" value="false"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JSeparator" name="createButtonSeparator">
+            </Component>
+            <Component class="javax.swing.JButton" name="createBtn">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.createBtn.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+              </Properties>
+              <AuxValues>
+                <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+              </AuxValues>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="cbFilterByKeyword">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.cbFilterByKeyword.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="cbFilterByKeywordActionPerformed"/>
+              </Events>
+            </Component>
           </SubComponents>
         </Container>
-        <Component class="org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel" name="detailsPanel">
+        <Container class="javax.swing.JScrollPane" name="detailsScrollPane">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="right"/>
             </Constraint>
           </Constraints>
-        </Component>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+          <SubComponents>
+            <Component class="org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel" name="detailsPanel">
+            </Component>
+          </SubComponents>
+        </Container>
       </SubComponents>
     </Container>
   </SubComponents>

Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.java

@@ -20,6 +20,8 @@ package org.sleuthkit.autopsy.centralrepository.persona;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -27,14 +29,19 @@ import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.AncestorListener;
+import javax.swing.event.AncestorEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.RetainLocation;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 import org.sleuthkit.autopsy.centralrepository.datamodel.Persona;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -42,26 +49,28 @@ import org.sleuthkit.autopsy.coreutils.Logger;
  * Top component for the Personas tool
  *
  */
-@TopComponent.Description(preferredID = "PersonaManagerTopComponent", persistenceType = TopComponent.PERSISTENCE_NEVER)
-@TopComponent.Registration(mode = "personamanager", openAtStartup = false)
-@RetainLocation("personamanager")
+@TopComponent.Description(preferredID = "PersonasTopComponent", persistenceType = TopComponent.PERSISTENCE_NEVER)
+@TopComponent.Registration(mode = "personas", openAtStartup = false)
+@RetainLocation("personas")
 @SuppressWarnings("PMD.SingularField")
-public final class PersonaManagerTopComponent extends TopComponent {
+public final class PersonasTopComponent extends TopComponent {
 
-    private static final Logger logger = Logger.getLogger(PersonaManagerTopComponent.class.getName());
+    private static final long serialVersionUID = 1L;
+
+    private static final Logger logger = Logger.getLogger(PersonasTopComponent.class.getName());
 
     private List<Persona> currentResults = null;
     private Persona selectedPersona = null;
 
     @Messages({
-        "PMTopComponent_Name=Persona Manager",
-        "PMTopComponent_delete_exception_Title=Delete failure",
-        "PMTopComponent_delete_exception_msg=Failed to delete persona",
-    })
-    public PersonaManagerTopComponent() {
+        "PersonasTopComponent_Name=Personas",
+        "PersonasTopComponent_delete_exception_Title=Delete failure",
+        "PersonasTopComponent_delete_exception_msg=Failed to delete persona.",
+        "PersonasTopComponent_delete_confirmation_Title=Are you sure?",
+        "PersonasTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?",})
+    public PersonasTopComponent() {
         initComponents();
-        setName(Bundle.PMTopComponent_Name());
-        executeSearch();
+        setName(Bundle.PersonasTopComponent_Name());
 
         searchBtn.addActionListener(new ActionListener() {
             @Override
@@ -73,7 +82,7 @@ public final class PersonaManagerTopComponent extends TopComponent {
         editBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                new PersonaDetailsDialog(PersonaManagerTopComponent.this,
+                new PersonaDetailsDialog(PersonasTopComponent.this,
                         PersonaDetailsMode.EDIT, selectedPersona, new CreateEditCallbackImpl());
             }
         });
@@ -81,27 +90,34 @@ public final class PersonaManagerTopComponent extends TopComponent {
         createBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                new PersonaDetailsDialog(PersonaManagerTopComponent.this,
+                new PersonaDetailsDialog(PersonasTopComponent.this,
                         PersonaDetailsMode.CREATE, selectedPersona, new CreateEditCallbackImpl());
             }
         });
-        
+
         deleteBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                try {
-                    if (selectedPersona != null) {
-                        selectedPersona.delete();
+                NotifyDescriptor confirm = new NotifyDescriptor.Confirmation(
+                        Bundle.PersonasTopComponent_delete_confirmation_msg(),
+                        Bundle.PersonasTopComponent_delete_confirmation_Title(),
+                        NotifyDescriptor.YES_NO_OPTION);
+                DialogDisplayer.getDefault().notify(confirm);
+                if (confirm.getValue().equals(NotifyDescriptor.YES_OPTION)) {
+                    try {
+                        if (selectedPersona != null) {
+                            selectedPersona.delete();
+                        }
+                    } catch (CentralRepoException ex) {
+                        logger.log(Level.SEVERE, "Failed to delete persona: " + selectedPersona.getName(), ex);
+                        JOptionPane.showMessageDialog(PersonasTopComponent.this,
+                                Bundle.PersonasTopComponent_delete_exception_msg(),
+                                Bundle.PersonasTopComponent_delete_exception_Title(),
+                                JOptionPane.ERROR_MESSAGE);
+                        return;
                     }
-                } catch (CentralRepoException ex) {
-                    logger.log(Level.SEVERE, "Failed to delete persona: " + selectedPersona.getName(), ex);
-                    JOptionPane.showMessageDialog(PersonaManagerTopComponent.this,
-                    Bundle.PMTopComponent_delete_exception_msg(),
-                    Bundle.PMTopComponent_delete_exception_Title(),
-                    JOptionPane.ERROR_MESSAGE);
-                    return;
+                    executeSearch();
                 }
-                executeSearch();
             }
         });
 
@@ -113,6 +129,33 @@ public final class PersonaManagerTopComponent extends TopComponent {
                 handleSelectionChange(e);
             }
         });
+
+        searchNameRadio.addActionListener((ActionEvent e) -> {
+            searchField.setText("");
+        });
+
+        searchAccountRadio.addActionListener((ActionEvent e) -> {
+            searchField.setText("");
+        });
+
+        createAccountBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                new CreatePersonaAccountDialog(detailsPanel);
+            }
+        });
+
+        /**
+         * Listens for when this component will be rendered and executes a
+         * search to update gui when it is displayed.
+         */
+        addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentShown(ComponentEvent e) {
+                resetSearchControls();
+                setKeywordSearchEnabled(false, true);
+            }
+        });
     }
 
     /**
@@ -133,6 +176,34 @@ public final class PersonaManagerTopComponent extends TopComponent {
         }
     }
 
+    /**
+     * Resets search controls to default state.
+     */
+    private void resetSearchControls() {
+        searchField.setText("");
+        searchNameRadio.setSelected(true);
+        searchAccountRadio.setSelected(false);
+    }
+
+    /**
+     * Sets up the GUI for appropriate state for keyword search enabled state.
+     *
+     * @param selected    Whether or not keyword search is enabled.
+     * @param setFilterCb Whether or not the filter checkbox should be
+     *                    manipulated as a part of this change.
+     */
+    private void setKeywordSearchEnabled(boolean selected, boolean setFilterCb) {
+        if (setFilterCb && cbFilterByKeyword.isSelected() != selected) {
+            cbFilterByKeyword.setSelected(selected);
+        }
+
+        searchField.setEnabled(selected);
+        searchNameRadio.setEnabled(selected);
+        searchAccountRadio.setEnabled(selected);
+
+        executeSearch();
+    }
+
     void setPersona(int index) {
         Persona persona = currentResults.get(index);
         selectedPersona = persona;
@@ -195,17 +266,36 @@ public final class PersonaManagerTopComponent extends TopComponent {
     }
 
     @Messages({
-        "PMTopComponent_search_exception_Title=Search failure",
-        "PMTopComponent_search_exception_msg=Failed to search personas",})
+        "PersonasTopComponent_search_exception_Title=There was a failure during the search.  Try opening a case to fully initialize the central repository database.",
+        "PersonasTopComponent_search_exception_msg=Failed to search personas.",
+        "PersonasTopComponent_noCR_msg=Central Repository is not enabled.",})
     private void executeSearch() {
+        // To prevent downstream failures, only execute search if central repository is enabled
+        if (!CentralRepository.isEnabled()) {
+            logger.log(Level.SEVERE, "Central Repository is not enabled, but execute search was called.");
+            JOptionPane.showMessageDialog(this,
+                    Bundle.PersonasTopComponent_search_exception_Title(),
+                    Bundle.PersonasTopComponent_noCR_msg(),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
         Collection<Persona> results;
         try {
-            results = Persona.getPersonaByName(searchField.getText());
+            if (cbFilterByKeyword.isSelected()) {
+                if (searchNameRadio.isSelected()) {
+                    results = Persona.getPersonaByName(searchField.getText());
+                } else {
+                    results = Persona.getPersonaByAccountIdentifierLike(searchField.getText());
+                }
+            } else {
+                results = Persona.getPersonaByName("");
+            }
         } catch (CentralRepoException ex) {
             logger.log(Level.SEVERE, "Failed to search personas", ex);
             JOptionPane.showMessageDialog(this,
-                    Bundle.PMTopComponent_search_exception_Title(),
-                    Bundle.PMTopComponent_search_exception_msg(),
+                    Bundle.PersonasTopComponent_search_exception_Title(),
+                    Bundle.PersonasTopComponent_search_exception_msg(),
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -231,50 +321,77 @@ public final class PersonaManagerTopComponent extends TopComponent {
     private void initComponents() {
 
         searchButtonGroup = new javax.swing.ButtonGroup();
-        jSplitPane1 = new javax.swing.JSplitPane();
+        introTextScrollPane = new javax.swing.JScrollPane();
+        introText = new javax.swing.JTextArea();
+        mainSplitPane = new javax.swing.JSplitPane();
         searchPanel = new javax.swing.JPanel();
         searchField = new javax.swing.JTextField();
         searchNameRadio = new javax.swing.JRadioButton();
         searchAccountRadio = new javax.swing.JRadioButton();
+        searchBtn = new javax.swing.JButton();
         resultsPane = new javax.swing.JScrollPane();
         resultsTable = new javax.swing.JTable();
-        searchBtn = new javax.swing.JButton();
+        createAccountBtn = new javax.swing.JButton();
         editBtn = new javax.swing.JButton();
-        createBtn = new javax.swing.JButton();
         deleteBtn = new javax.swing.JButton();
+        createButtonSeparator = new javax.swing.JSeparator();
+        createBtn = new javax.swing.JButton();
+        cbFilterByKeyword = new javax.swing.JCheckBox();
+        detailsScrollPane = new javax.swing.JScrollPane();
         detailsPanel = new org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel();
 
-        setMinimumSize(new java.awt.Dimension(400, 400));
+        setName(""); // NOI18N
 
-        searchField.setText(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchField.text")); // NOI18N
+        introTextScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+
+        introText.setBackground(getBackground());
+        introText.setColumns(20);
+        introText.setLineWrap(true);
+        introText.setRows(5);
+        introText.setText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.introText.text")); // NOI18N
+        introText.setWrapStyleWord(true);
+        introText.setFocusable(false);
+        introTextScrollPane.setViewportView(introText);
+
+        mainSplitPane.setDividerLocation(400);
+
+        searchField.setText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchField.text")); // NOI18N
 
         searchButtonGroup.add(searchNameRadio);
         searchNameRadio.setSelected(true);
-        org.openide.awt.Mnemonics.setLocalizedText(searchNameRadio, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchNameRadio.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(searchNameRadio, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchNameRadio.text")); // NOI18N
 
         searchButtonGroup.add(searchAccountRadio);
-        org.openide.awt.Mnemonics.setLocalizedText(searchAccountRadio, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchAccountRadio.text")); // NOI18N
-        searchAccountRadio.setEnabled(false);
+        org.openide.awt.Mnemonics.setLocalizedText(searchAccountRadio, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchAccountRadio.text")); // NOI18N
 
-        resultsTable.setToolTipText(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.toolTipText")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(searchBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchBtn.text")); // NOI18N
+
+        resultsTable.setToolTipText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.toolTipText")); // NOI18N
         resultsTable.getTableHeader().setReorderingAllowed(false);
         resultsPane.setViewportView(resultsTable);
         if (resultsTable.getColumnModel().getColumnCount() > 0) {
             resultsTable.getColumnModel().getColumn(0).setMaxWidth(25);
-            resultsTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.columnModel.title0")); // NOI18N
-            resultsTable.getColumnModel().getColumn(1).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.columnModel.title1")); // NOI18N
+            resultsTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.columnModel.title0")); // NOI18N
+            resultsTable.getColumnModel().getColumn(1).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.columnModel.title1")); // NOI18N
         }
 
-        org.openide.awt.Mnemonics.setLocalizedText(searchBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(createAccountBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.createAccountBtn.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(editBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.editBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(editBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.editBtn.text")); // NOI18N
         editBtn.setEnabled(false);
 
-        org.openide.awt.Mnemonics.setLocalizedText(createBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.createBtn.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(deleteBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.deleteBtn.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(deleteBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.deleteBtn.text")); // NOI18N
         deleteBtn.setEnabled(false);
 
+        org.openide.awt.Mnemonics.setLocalizedText(createBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.createBtn.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(cbFilterByKeyword, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.cbFilterByKeyword.text")); // NOI18N
+        cbFilterByKeyword.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                cbFilterByKeywordActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout searchPanelLayout = new javax.swing.GroupLayout(searchPanel);
         searchPanel.setLayout(searchPanelLayout);
         searchPanelLayout.setHorizontalGroup(
@@ -282,12 +399,7 @@ public final class PersonaManagerTopComponent extends TopComponent {
             .addGroup(searchPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(searchPanelLayout.createSequentialGroup()
-                        .addComponent(createBtn)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(editBtn)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(deleteBtn))
+                    .addComponent(createButtonSeparator)
                     .addComponent(resultsPane, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
                     .addComponent(searchField)
                     .addGroup(searchPanelLayout.createSequentialGroup()
@@ -295,13 +407,25 @@ public final class PersonaManagerTopComponent extends TopComponent {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(searchAccountRadio)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(searchBtn)))
+                        .addComponent(searchBtn))
+                    .addGroup(searchPanelLayout.createSequentialGroup()
+                        .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(createAccountBtn)
+                            .addGroup(searchPanelLayout.createSequentialGroup()
+                                .addComponent(createBtn)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(editBtn)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(deleteBtn))
+                            .addComponent(cbFilterByKeyword))
+                        .addGap(0, 50, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         searchPanelLayout.setVerticalGroup(
             searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(searchPanelLayout.createSequentialGroup()
-                .addContainerGap()
+                .addComponent(cbFilterByKeyword)
+                .addGap(1, 1, 1)
                 .addComponent(searchField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
@@ -309,36 +433,57 @@ public final class PersonaManagerTopComponent extends TopComponent {
                     .addComponent(searchAccountRadio)
                     .addComponent(searchBtn))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(resultsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 528, Short.MAX_VALUE)
+                .addComponent(resultsPane, javax.swing.GroupLayout.PREFERRED_SIZE, 302, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(editBtn)
                     .addComponent(createBtn)
                     .addComponent(deleteBtn))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(createButtonSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 4, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(createAccountBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
 
-        jSplitPane1.setLeftComponent(searchPanel);
-        jSplitPane1.setRightComponent(detailsPanel);
+        mainSplitPane.setLeftComponent(searchPanel);
+
+        detailsScrollPane.setViewportView(detailsPanel);
+
+        mainSplitPane.setRightComponent(detailsScrollPane);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 692, Short.MAX_VALUE)
+            .addComponent(introTextScrollPane)
+            .addComponent(mainSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 724, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jSplitPane1)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addComponent(introTextScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 49, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(mainSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
+    private void cbFilterByKeywordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbFilterByKeywordActionPerformed
+        setKeywordSearchEnabled(cbFilterByKeyword.isSelected(), false);
+    }//GEN-LAST:event_cbFilterByKeywordActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JCheckBox cbFilterByKeyword;
+    private javax.swing.JButton createAccountBtn;
     private javax.swing.JButton createBtn;
+    private javax.swing.JSeparator createButtonSeparator;
     private javax.swing.JButton deleteBtn;
     private org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel detailsPanel;
+    private javax.swing.JScrollPane detailsScrollPane;
     private javax.swing.JButton editBtn;
-    private javax.swing.JSplitPane jSplitPane1;
+    private javax.swing.JTextArea introText;
+    private javax.swing.JScrollPane introTextScrollPane;
+    private javax.swing.JSplitPane mainSplitPane;
     private javax.swing.JScrollPane resultsPane;
     private javax.swing.JTable resultsTable;
     private javax.swing.JRadioButton searchAccountRadio;

Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java

@@ -862,7 +862,7 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer
     /**
      * If the settings reflect that a inter-case search is being performed,
      * checks that the data sources in the current case have been processed with
-     * Correlation Engine enabled and exist in the central repository. Prompting
+     * Central Repository enabled and exist in the central repository. Prompting
      * the user as to whether they still want to perform the search in the case
      * any data sources are unprocessed. If the settings reflect that a
      * intra-case search is being performed, it just performs the search.
@@ -870,7 +870,7 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer
      * Notes: - Does not check that the data sources were processed into the
      * current central repository instead of another. - Does not check that the
      * appropriate modules to make all correlation types available were run. -
-     * Does not check if the correlation engine was run with any of the
+     * Does not check if the Central Repository was run with any of the
      * correlation properties properties disabled.
      */
     @Messages({"CommonAttributePanel.incompleteResults.introText=Results may be incomplete. Not all data sources in the current case were ingested into the current Central Repository. The following data sources have not been processed:",
@@ -902,14 +902,14 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer
                         //if the datasource was previously processed we do not need to perform this check
                         for (CorrelationDataSource correlatedDataSource : correlatedDataSources) {
                             if (deviceID.equals(correlatedDataSource.getDeviceID())) {
-                                //if the datasource exists in the central repository it may of been processed with the correlation engine
+                                //if the datasource exists in the central repository it may of been processed with the Central Repository
                                 dataSourceCorrelationMap.put(dataSource, CorrelatedStatus.IN_CENTRAL_REPO);
                                 break;
                             }
                         }
                     }
                     if (dataSourceCorrelationMap.get(dataSource) == CorrelatedStatus.IN_CENTRAL_REPO) {
-                        //if the data source was in the central repository check if any of the modules run on it were the correlation engine
+                        //if the data source was in the central repository check if any of the modules run on it were the Central Repository
                         for (IngestModuleInfo ingestModuleInfo : jobInfo.getIngestModuleInfo()) {
                             if (correlationEngineModuleName.equals(ingestModuleInfo.getDisplayName())) {
                                 dataSourceCorrelationMap.put(dataSource, CorrelatedStatus.CORRELATED);

Core/src/org/sleuthkit/autopsy/communications/Bundle.properties

@@ -14,7 +14,7 @@ FiltersPanel.endCheckBox.text=End:
 FiltersPanel.refreshButton.text=Refresh
 FiltersPanel.deviceRequiredLabel.text=Select at least one.
 FiltersPanel.accountTypeRequiredLabel.text=Select at least one.
-FiltersPanel.needsRefreshLabel.text=Displayed data is out of date. Press Refresh.
+FiltersPanel.needsRefreshLabel.text=Displayed data may be out of date. Press Refresh to update.
 VisualizationPanel.jButton1.text=Fast Organic 
 CVTTopComponent.vizPanel.TabConstraints.tabTitle=Visualize
 CVTTopComponent.accountsBrowser.TabConstraints.tabTitle_1=Browse

Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED

@@ -1,3 +1,8 @@
+# {0} - PersonaAccount count
+AccountInstanceNode_Tooltip_suffix=(1 of {0})
+# {0} - Contact Name
+# {1} - Persona Name
+AccountInstanceNode_Tooltip_Template=Contact: {0} - Persona: {1}
 AccountNode.accountName=Account
 AccountNode.accountType=Type
 AccountNode.device=Device
@@ -21,7 +26,7 @@ FiltersPanel.endCheckBox.text=End:
 FiltersPanel.refreshButton.text=Refresh
 FiltersPanel.deviceRequiredLabel.text=Select at least one.
 FiltersPanel.accountTypeRequiredLabel.text=Select at least one.
-FiltersPanel.needsRefreshLabel.text=Displayed data is out of date. Press Refresh.
+FiltersPanel.needsRefreshLabel.text=Displayed data may be out of date. Press Refresh to update.
 OpenCVTAction.displayName=Communications
 PinAccountsAction.pluralText=Add Selected Accounts to Visualization
 PinAccountsAction.singularText=Add Selected Account to Visualization

Core/src/org/sleuthkit/autopsy/communications/CVTFilterRefresher.java

@@ -0,0 +1,163 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.communications;
+
+import java.beans.PropertyChangeEvent;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.SwingUtilities;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.guiutils.RefreshThrottler;
+import static org.sleuthkit.autopsy.ingest.IngestManager.IngestModuleEvent.DATA_ADDED;
+import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.datamodel.Account;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.datamodel.DataSource;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
+
+/**
+ * Refreshes the CVTFilterPanel.
+ */
+abstract class CVTFilterRefresher implements RefreshThrottler.Refresher {
+
+    private static final Logger logger = Logger.getLogger(CVTFilterRefresher.class.getName());
+    /**
+     * contains all of the gui control specific update code. Refresh will call
+     * this method with an involkLater so that the updating of the swing
+     * controls can happen on the EDT.
+     *
+     * @param data
+     */
+    abstract void updateFilterPanel(FilterPanelData data);
+
+    @Override
+    public void refresh() {
+        try {
+            Integer startTime;
+            Integer endTime;
+            SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
+
+            // Fetch Min/Max start times
+            try (SleuthkitCase.CaseDbQuery dbQuery = skCase.executeQuery("SELECT MAX(date_time) as end,  MIN(date_time) as start from account_relationships")) {
+                // ResultSet is closed by CasDBQuery
+                ResultSet rs = dbQuery.getResultSet();
+                rs.next();
+                startTime = rs.getInt("start"); // NON-NLS
+                endTime = rs.getInt("end"); // NON-NLS
+                
+            }
+            // Get the devices with CVT artifacts
+            List<Integer> deviceObjIds = new ArrayList<>();
+            try (SleuthkitCase.CaseDbQuery queryResult = skCase.executeQuery("SELECT DISTINCT data_source_obj_id FROM account_relationships")) {
+                // ResultSet is closed by CasDBQuery
+                ResultSet rs = queryResult.getResultSet();
+                while (rs.next()) {
+                    deviceObjIds.add(rs.getInt(1));
+                }
+            }
+
+            // The map key is the Content name instead of the data source name
+            // to match how the CVT filters work.
+            Map<String, DataSource> dataSourceMap = new HashMap<>();
+            for (DataSource dataSource : skCase.getDataSources()) {
+                if (deviceObjIds.contains((int) dataSource.getId())) {
+                    String dsName = skCase.getContentById(dataSource.getId()).getName();
+                    dataSourceMap.put(dsName, dataSource);
+                }
+            }
+
+            List<Account.Type> accountTypesInUse = skCase.getCommunicationsManager().getAccountTypesInUse();
+
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    updateFilterPanel(new FilterPanelData(dataSourceMap, accountTypesInUse, startTime, endTime));
+                }
+            });
+
+        } catch (SQLException | TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to update CVT filter panel.", ex);
+        } catch (NoCurrentCaseException notUsed) {
+            /**
+             * Case is closed, do nothing.
+             */
+        }
+
+    }
+
+    @Override
+    public boolean isRefreshRequired(PropertyChangeEvent evt) {
+        String eventType = evt.getPropertyName();
+        if (eventType.equals(DATA_ADDED.toString())) {
+            // Indicate that a refresh may be needed, unless the data added is Keyword or Hashset hits
+            ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue();
+            return (null != eventData
+                    && (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()
+                    || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID()
+                    || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()
+                    || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()));
+        }
+
+        return false;
+    }
+
+    /**
+     * Class to hold the data for setting up the filter panel gui controls.
+     */
+    class FilterPanelData {
+
+        private final Map<String, DataSource> dataSourceMap;
+        private final Integer startTime;
+        private final Integer endTime;
+        private final List<Account.Type> accountTypesInUse;
+
+        FilterPanelData(Map<String, DataSource> dataSourceMap, List<Account.Type> accountTypesInUse, Integer startTime, Integer endTime) {
+            this.dataSourceMap = dataSourceMap;
+            this.startTime = startTime;
+            this.endTime = endTime;
+            this.accountTypesInUse = accountTypesInUse;
+        }
+
+        Map<String, DataSource> getDataSourceMap() {
+            return dataSourceMap;
+        }
+
+        Integer getStartTime() {
+            return startTime;
+        }
+
+        Integer getEndTime() {
+            return endTime;
+        }
+
+        List<Account.Type> getAccountTypesInUse() {
+            return accountTypesInUse;
+        }
+
+    }
+
+}

Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java

@@ -189,7 +189,7 @@ public final class CVTTopComponent extends TopComponent {
          *
          * Re-applying the filters means we will lose the selection...
          */
-        filtersPane.updateAndApplyFilters(true);
+        filtersPane.initalizeFilters();
     }
 
     @Override

Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form

@@ -18,11 +18,11 @@
   <SubComponents>
     <Container class="javax.swing.JScrollPane" name="scrollPane">
       <Properties>
+        <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+        <Property name="autoscrolls" type="boolean" value="true"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="null"/>
         </Property>
-        <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
-        <Property name="autoscrolls" type="boolean" value="true"/>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -222,9 +222,14 @@
               </SubComponents>
             </Container>
             <Container class="javax.swing.JPanel" name="devicesPane">
+              <Properties>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[300, 300]"/>
+                </Property>
+              </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                  <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="100" insetsTop="15" insetsLeft="0" insetsBottom="0" insetsRight="25" anchor="18" weightX="1.0" weightY="0.0"/>
+                  <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="15" insetsLeft="0" insetsBottom="0" insetsRight="25" anchor="18" weightX="1.0" weightY="1.0"/>
                 </Constraint>
               </Constraints>
 
@@ -277,7 +282,6 @@
                 </Component>
                 <Container class="javax.swing.JScrollPane" name="devicesScrollPane">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[32767, 30]"/>
                     </Property>

Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java

@@ -18,25 +18,24 @@
  */
 package org.sleuthkit.autopsy.communications;
 
+import org.sleuthkit.autopsy.guiutils.RefreshThrottler;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.Subscribe;
 import java.awt.event.ItemListener;
 import java.beans.PropertyChangeListener;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -45,11 +44,9 @@ import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingWorker;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
@@ -59,7 +56,6 @@ import static org.sleuthkit.autopsy.ingest.IngestManager.IngestModuleEvent.DATA_
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.datamodel.Account;
 import org.sleuthkit.datamodel.BlackboardArtifact;
-import org.sleuthkit.datamodel.CaseDbAccessManager.CaseDbAccessQueryCallback;
 import org.sleuthkit.datamodel.CommunicationsFilter;
 import org.sleuthkit.datamodel.CommunicationsFilter.AccountTypeFilter;
 import org.sleuthkit.datamodel.CommunicationsFilter.DateRangeFilter;
@@ -69,8 +65,6 @@ import org.sleuthkit.datamodel.DataSource;
 import static org.sleuthkit.datamodel.Relationship.Type.CALL_LOG;
 import static org.sleuthkit.datamodel.Relationship.Type.CONTACT;
 import static org.sleuthkit.datamodel.Relationship.Type.MESSAGE;
-import org.sleuthkit.datamodel.SleuthkitCase;
-import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Panel that holds the Filter control widgets and triggers queries against the
@@ -114,6 +108,8 @@ final public class FiltersPanel extends JPanel {
      */
     private final ItemListener validationListener;
 
+    private final RefreshThrottler refreshThrottler;
+
     /**
      * Is the device account type filter enabled or not. It should be enabled
      * when the Table/Brows mode is active and disabled when the visualization
@@ -129,6 +125,7 @@ final public class FiltersPanel extends JPanel {
         initComponents();
 
         initalizeDeviceAccountType();
+        setDateTimeFiltersToDefault();
 
         deviceRequiredLabel.setVisible(false);
         accountTypeRequiredLabel.setVisible(false);
@@ -160,25 +157,27 @@ final public class FiltersPanel extends JPanel {
             if (eventType.equals(DATA_ADDED.toString())) {
                 // Indicate that a refresh may be needed, unless the data added is Keyword or Hashset hits
                 ModuleDataEvent eventData = (ModuleDataEvent) pce.getOldValue();
-                if (null != eventData
+                if (!needsRefresh
+                        && null != eventData
                         && (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()
                         || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID()
                         || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()
                         || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID())) {
-                    updateFilters(true);
                     needsRefresh = true;
                     validateFilters();
                 }
             }
         };
 
+        refreshThrottler = new RefreshThrottler(new FilterPanelRefresher(false, false));
+
         this.ingestJobListener = pce -> {
             String eventType = pce.getPropertyName();
-            if (eventType.equals(COMPLETED.toString())
-                    && updateFilters(true)) {
+            if (eventType.equals(COMPLETED.toString()) && !needsRefresh) {
 
                 needsRefresh = true;
                 validateFilters();
+
             }
         };
 
@@ -220,39 +219,24 @@ final public class FiltersPanel extends JPanel {
         }
     }
 
-    /**
-     * Update the filter widgets, and apply them.
-     */
-    void updateAndApplyFilters(boolean initialState) {
-        updateFilters(initialState);
-        applyFilters();
-        initalizeDateTimeFilters();
+    void initalizeFilters() {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                new FilterPanelRefresher(true, true).refresh();
+            }
+        };
+        runnable.run();
     }
 
     private void updateTimeZone() {
         dateRangeLabel.setText("Date Range (" + Utils.getUserPreferredZoneId().toString() + "):");
     }
 
-    /**
-     * Updates the filter widgets to reflect he data sources/types in the case.
-     */
-    private boolean updateFilters(boolean initialState) {
-        final SleuthkitCase sleuthkitCase;
-        try {
-            sleuthkitCase = Case.getCurrentCaseThrows().getSleuthkitCase();
-        } catch (NoCurrentCaseException ex) {
-            logger.log(Level.WARNING, "Unable to perform filter update, update has been cancelled. Case is closed.", ex);
-            return false;
-        }
-        boolean newAccountType = updateAccountTypeFilter(initialState, sleuthkitCase);
-        boolean newDeviceFilter = updateDeviceFilter(initialState, sleuthkitCase);
-        // both or either are true, return true;
-        return newAccountType || newDeviceFilter;
-    }
-
     @Override
     public void addNotify() {
         super.addNotify();
+        refreshThrottler.registerForIngestModuleEvents();
         IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, ingestListener);
         IngestManager.getInstance().addIngestJobEventListener(INGEST_JOB_EVENTS_OF_INTEREST, ingestJobListener);
         Case.addEventTypeSubscriber(EnumSet.of(CURRENT_CASE), evt -> {
@@ -270,6 +254,7 @@ final public class FiltersPanel extends JPanel {
     @Override
     public void removeNotify() {
         super.removeNotify();
+        refreshThrottler.unregisterEventListener();
         IngestManager.getInstance().removeIngestModuleEventListener(ingestListener);
         IngestManager.getInstance().removeIngestJobEventListener(ingestJobListener);
     }
@@ -283,33 +268,26 @@ final public class FiltersPanel extends JPanel {
     /**
      * Populate the Account Types filter widgets.
      *
-     * @param selected      The initial value for the account type checkbox.
-     * @param sleuthkitCase The sleuthkit case for containing the account
-     *                      information.
+     * @param accountTypesInUse List of accountTypes currently in use
+     * @param checkNewOnes
      *
      * @return True, if a new accountType was found
      */
-    private boolean updateAccountTypeFilter(boolean selected, SleuthkitCase sleuthkitCase) {
+    private boolean updateAccountTypeFilter(List<Account.Type> accountTypesInUse, boolean checkNewOnes) {
         boolean newOneFound = false;
-        try {
-            List<Account.Type> accountTypesInUse = sleuthkitCase.getCommunicationsManager().getAccountTypesInUse();
 
-            for (Account.Type type : accountTypesInUse) {
+        for (Account.Type type : accountTypesInUse) {
+            if (!accountTypeMap.containsKey(type) && !type.equals(Account.Type.CREDIT_CARD)) {
+                CheckBoxIconPanel panel = createAccoutTypeCheckBoxPanel(type, checkNewOnes);
+                accountTypeMap.put(type, panel.getCheckBox());
+                accountTypeListPane.add(panel);
 
-                if (!accountTypeMap.containsKey(type) && !type.equals(Account.Type.CREDIT_CARD)) {
-                    CheckBoxIconPanel panel = createAccoutTypeCheckBoxPanel(type, selected);
-                    accountTypeMap.put(type, panel.getCheckBox());
-                    accountTypeListPane.add(panel);
-
-                    newOneFound = true;
-                }
+                newOneFound = true;
             }
-
-        } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Unable to update to update Account Types Filter", ex);
         }
+
         if (newOneFound) {
-            accountTypeListPane.revalidate();
+            accountTypeListPane.validate();
         }
 
         return newOneFound;
@@ -337,38 +315,48 @@ final public class FiltersPanel extends JPanel {
     /**
      * Populate the devices filter widgets.
      *
-     * @param selected      Sets the initial state of device check box.
-     * @param sleuthkitCase The sleuthkit case for containing the data source
-     *                      information.
+     * @param dataSourceMap
+     * @param checkNewOnes 
      *
      * @return true if a new device was found
      */
-    private boolean updateDeviceFilter(boolean selected, SleuthkitCase sleuthkitCase) {
+    private void updateDeviceFilterPanel(Map<String, DataSource> dataSourceMap, boolean checkNewOnes) {
         boolean newOneFound = false;
-        try {
-            for (DataSource dataSource : sleuthkitCase.getDataSources()) {
-                String dsName = sleuthkitCase.getContentById(dataSource.getId()).getName();
-                if (devicesMap.containsKey(dataSource.getDeviceId())) {
-                    continue;
-                }
-
-                final JCheckBox jCheckBox = new JCheckBox(dsName, selected);
-                jCheckBox.addItemListener(validationListener);
-                devicesListPane.add(jCheckBox);
-                devicesMap.put(dataSource.getDeviceId(), jCheckBox);
-
-                newOneFound = true;
-
+        for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
+            if (devicesMap.containsKey(entry.getValue().getDeviceId())) {
+                continue;
             }
-        } catch (TskCoreException tskCoreException) {
-            logger.log(Level.SEVERE, "There was a error loading the datasources for the case.", tskCoreException);
+
+            final JCheckBox jCheckBox = new JCheckBox(entry.getKey(), checkNewOnes);
+            jCheckBox.addItemListener(validationListener);
+            jCheckBox.setToolTipText(entry.getKey());
+            devicesListPane.add(jCheckBox);
+            devicesMap.put(entry.getValue().getDeviceId(), jCheckBox);
+
+            newOneFound = true;
         }
 
         if (newOneFound) {
+            devicesListPane.removeAll();
+            List<JCheckBox> checkList = new ArrayList<>(devicesMap.values());
+            checkList.sort(new DeviceCheckBoxComparator());
+
+            for (JCheckBox cb : checkList) {
+                devicesListPane.add(cb);
+            }
+
             devicesListPane.revalidate();
         }
+    }
 
-        return newOneFound;
+    private void updateDateTimePicker(Integer start, Integer end) {
+        if (start != null && start != 0) {
+            startDatePicker.setDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(start), Utils.getUserPreferredZoneId()).toLocalDate());
+        }
+
+        if (end != null && end != 0) {
+            endDatePicker.setDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(end), Utils.getUserPreferredZoneId()).toLocalDate());
+        }
     }
 
     /**
@@ -477,9 +465,9 @@ final public class FiltersPanel extends JPanel {
 
         setLayout(new java.awt.GridBagLayout());
 
-        scrollPane.setBorder(null);
         scrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         scrollPane.setAutoscrolls(true);
+        scrollPane.setBorder(null);
 
         mainPanel.setLayout(new java.awt.GridBagLayout());
 
@@ -613,6 +601,7 @@ final public class FiltersPanel extends JPanel {
         gridBagConstraints.insets = new java.awt.Insets(15, 0, 0, 25);
         mainPanel.add(dateRangePane, gridBagConstraints);
 
+        devicesPane.setPreferredSize(new java.awt.Dimension(300, 300));
         devicesPane.setLayout(new java.awt.GridBagLayout());
 
         unCheckAllDevicesButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.unCheckAllDevicesButton.text")); // NOI18N
@@ -652,7 +641,6 @@ final public class FiltersPanel extends JPanel {
         gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
         devicesPane.add(checkAllDevicesButton, gridBagConstraints);
 
-        devicesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         devicesScrollPane.setMaximumSize(new java.awt.Dimension(32767, 30));
         devicesScrollPane.setMinimumSize(new java.awt.Dimension(27, 30));
         devicesScrollPane.setPreferredSize(new java.awt.Dimension(3, 30));
@@ -686,10 +674,10 @@ final public class FiltersPanel extends JPanel {
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 2;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
-        gridBagConstraints.ipady = 100;
+        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         gridBagConstraints.weightx = 1.0;
+        gridBagConstraints.weighty = 1.0;
         gridBagConstraints.insets = new java.awt.Insets(15, 0, 0, 25);
         mainPanel.add(devicesPane, gridBagConstraints);
 
@@ -836,10 +824,11 @@ final public class FiltersPanel extends JPanel {
     /**
      * Post an event with the new filters.
      */
-    private void applyFilters() {
-        CVTEvents.getCVTEventBus().post(new CVTEvents.FilterChangeEvent(getFilter(), getStartControlState(), getEndControlState()));
+    void applyFilters() {
         needsRefresh = false;
         validateFilters();
+        CVTEvents.getCVTEventBus().post(new CVTEvents.FilterChangeEvent(getFilter(), getStartControlState(), getEndControlState()));
+
     }
 
     /**
@@ -958,31 +947,6 @@ final public class FiltersPanel extends JPanel {
         map.values().forEach(box -> box.setSelected(selected));
     }
 
-    /**
-     * initalize the DateTimePickers by grabbing the earliest and latest time
-     * from the autopsy db.
-     */
-    private void initalizeDateTimeFilters() {
-        Case currentCase = null;
-        try {
-            currentCase = Case.getCurrentCaseThrows();
-        } catch (NoCurrentCaseException ex) {
-            logger.log(Level.INFO, "Tried to intialize communication filters date range filters without an open case, using default values");
-        }
-
-        if (currentCase == null) {
-            setDateTimeFiltersToDefault();
-            openCase = null;
-            return;
-        }
-
-        if (!currentCase.equals(openCase)) {
-            setDateTimeFiltersToDefault();
-            openCase = currentCase;
-            (new DatePickerWorker()).execute();
-        }
-    }
-
     private void setDateTimeFiltersToDefault() {
         startDatePicker.setDate(LocalDate.now().minusWeeks(3));
         endDatePicker.setDate(LocalDate.now());
@@ -1159,69 +1123,51 @@ final public class FiltersPanel extends JPanel {
     }
 
     /**
-     * A simple class that implements CaseDbAccessQueryCallback. Can be used as
-     * an anonymous innerclass with the CaseDbAccessManager select function.
+     * Extends the CVTFilterRefresher abstract class to add the calls to update
+     * the ui controls with the data found. Note that updateFilterPanel is run
+     * in the EDT.
      */
-    class FilterPanelQueryCallback implements CaseDbAccessQueryCallback {
+    final class FilterPanelRefresher extends CVTFilterRefresher {
+
+        private final boolean selectNewOption;
+        private final boolean refreshAfterUpdate;
+
+        FilterPanelRefresher(boolean selectNewOptions, boolean refreshAfterUpdate) {
+            this.selectNewOption = selectNewOptions;
+            this.refreshAfterUpdate = refreshAfterUpdate;
+        }
 
         @Override
-        public void process(ResultSet rs) {
-            // Subclasses can implement their own process function.
+        void updateFilterPanel(CVTFilterRefresher.FilterPanelData data) {
+            updateDateTimePicker(data.getStartTime(), data.getEndTime());
+            updateDeviceFilterPanel(data.getDataSourceMap(), selectNewOption);
+            updateAccountTypeFilter(data.getAccountTypesInUse(), selectNewOption);
+
+            FiltersPanel.this.repaint();
+
+            if (refreshAfterUpdate) {
+                applyFilters();
+            }
+
+            if (!isEnabled()) {
+                setEnabled(true);
+            }
+
+            validateFilters();
+
+            repaint();
         }
     }
 
-    final class DatePickerWorker extends SwingWorker<Map<String, Integer>, Void> {
+    /**
+     * Sorts a list of JCheckBoxes in alphabetical order of the text field
+     * value.
+     */
+    class DeviceCheckBoxComparator implements Comparator<JCheckBox> {
 
         @Override
-        protected Map<String, Integer> doInBackground() throws Exception {
-            if (openCase == null) {
-                return null;
-            }
-
-            Map<String, Integer> resultMap = new HashMap<>();
-            String queryString = "max(date_time) as end,  min(date_time) as start from account_relationships"; // NON-NLS
-
-            openCase.getSleuthkitCase().getCaseDbAccessManager().select(queryString, new FilterPanelQueryCallback() {
-                @Override
-                public void process(ResultSet rs) {
-                    try {
-                        if (rs.next()) {
-                            int startDate = rs.getInt("start"); // NON-NLS
-                            int endDate = rs.getInt("end"); // NON-NLS
-
-                            resultMap.put("start", startDate); // NON-NLS
-                            resultMap.put("end", endDate); // NON-NLS
-                        }
-                    } catch (SQLException ex) {
-                        // Not the end of the world if this fails.
-                        logger.log(Level.WARNING, String.format("SQL Exception thrown from Query: %s", queryString), ex);
-                    }
-                }
-            });
-
-            return resultMap;
-        }
-
-        @Override
-        protected void done() {
-            try {
-                Map<String, Integer> resultMap = get();
-                if (resultMap != null) {
-                    Integer start = resultMap.get("start");
-                    Integer end = resultMap.get("end");
-
-                    if (start != null && start != 0) {
-                        startDatePicker.setDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(start), Utils.getUserPreferredZoneId()).toLocalDate());
-                    }
-
-                    if (end != null && end != 0) {
-                        endDatePicker.setDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(end), Utils.getUserPreferredZoneId()).toLocalDate());
-                    }
-                }
-            } catch (InterruptedException | ExecutionException ex) {
-                logger.log(Level.WARNING, "Exception occured after date time sql query", ex);
-            }
+        public int compare(JCheckBox e1, JCheckBox e2) {
+            return e1.getText().toLowerCase().compareTo(e2.getText().toLowerCase());
         }
     }
-
 }

Core/src/org/sleuthkit/autopsy/communications/Utils.java

@@ -18,9 +18,12 @@
  */
 package org.sleuthkit.autopsy.communications;
 
+import java.awt.Component;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.TimeZone;
+import javax.swing.table.TableCellRenderer;
+import org.netbeans.swing.outline.Outline;
 import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.datamodel.accounts.Accounts;
 import org.sleuthkit.datamodel.Account;
@@ -47,5 +50,29 @@ public final class Utils {
     static public final String getIconFilePath(Account.Type type) {
         return Accounts.getIconFilePath(type);
     }
+    
+    static public  void setColumnWidths(Outline outline) {
+        int margin = 4;
+        int padding = 8;
+
+        final int rows = Math.min(100, outline.getRowCount());
+
+        for (int column = 0; column < outline.getColumnCount(); column++) {
+            int columnWidthLimit = 500;
+            int columnWidth = 0;
+
+            // find the maximum width needed to fit the values for the first 100 rows, at most
+            for (int row = 0; row < rows; row++) {
+                TableCellRenderer renderer = outline.getCellRenderer(row, column);
+                Component comp = outline.prepareRenderer(renderer, row, column);
+                columnWidth = Math.max(comp.getPreferredSize().width, columnWidth);
+            }
+
+            columnWidth += 2 * margin + padding; // add margin and regular padding
+            columnWidth = Math.min(columnWidth, columnWidthLimit);
+
+            outline.getColumnModel().getColumn(column).setPreferredWidth(columnWidth);
+        }
+    }
 
 }

Core/src/org/sleuthkit/autopsy/communications/relationships/AccountSummary.java

@@ -33,6 +33,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.blackboardutils.attributes.MessageAttachments.FileAttachment;
 import org.sleuthkit.datamodel.blackboardutils.attributes.MessageAttachments;
 import org.sleuthkit.datamodel.CommunicationsUtils;
+import org.sleuthkit.datamodel.InvalidAccountIDException;
 import org.sleuthkit.datamodel.blackboardutils.attributes.BlackboardJsonAttrUtil;
 
 /**
@@ -113,7 +114,7 @@ class AccountSummary {
                                         isReference = true;
                                         break;
                                     }
-                                } catch (TskCoreException ex) {
+                                } catch (InvalidAccountIDException ex) {
                                     logger.log(Level.WARNING, String.format("Exception thrown "
                                             + "in trying to normalize attribute value: %s",
                                             attributeValue), ex); //NON-NLS

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties

@@ -9,7 +9,6 @@ SummaryViewer.callLogsLabel.text=Call Logs:
 ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
 MessageViewer.threadsLabel.text=Select a Thread to View
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=Showing Messages for Thread:
@@ -27,3 +26,5 @@ SummaryViewer.referencesLabel.text=Communication References:
 SummaryViewer.referencesDataLabel.text=<reference count>
 SummaryViewer.contactsLabel.text=Book Entries:
 SummaryViewer.accountCountry.text=<account country>
+SummaryViewer.fileRefPane.border.title=File References in Current Case
+SummaryViewer.selectAccountFileRefLabel.text=<Select a single account to see File References>

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED

@@ -17,7 +17,7 @@ ContactsViewer_columnHeader_Phone=Phone
 ContactsViewer_noContacts_message=<No contacts found for selected account>
 ContactsViewer_tabTitle=Contacts
 MediaViewer_Name=Media Attachments
-MessageNode_Node_Property_Attms=Attachments
+MessageNode_Node_Property_Attms=Attachment Count
 MessageNode_Node_Property_Date=Date
 MessageNode_Node_Property_From=From
 MessageNode_Node_Property_Subject=Subject
@@ -49,13 +49,13 @@ SummaryViewer_CentralRepository_Message=<Enable Central Respository to see Other
 SummaryViewer_Country_Code=Country: 
 SummaryViewer_Creation_Date_Title=Creation Date
 SummaryViewer_Device_Account_Description=This account was referenced by a device in the case.
+SummaryViewer_Fetching_References=<Fetching File References>
 SummaryViewer_FileRef_Message=<Select a single account to see File References>
 SummaryViewer_FileRefNameColumn_Title=Path
 SummaryViewer_TabTitle=Summary
 ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
 MessageViewer.threadsLabel.text=Select a Thread to View
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=Showing Messages for Thread:
@@ -73,3 +73,5 @@ SummaryViewer.referencesLabel.text=Communication References:
 SummaryViewer.referencesDataLabel.text=<reference count>
 SummaryViewer.contactsLabel.text=Book Entries:
 SummaryViewer.accountCountry.text=<account country>
+SummaryViewer.fileRefPane.border.title=File References in Current Case
+SummaryViewer.selectAccountFileRefLabel.text=<Select a single account to see File References>

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle_ja.properties

@@ -49,7 +49,6 @@ SummeryViewer_FileRef_Message=<\u30a2\u30ab\u30a6\u30f3\u30c8\u30921\u3064\u9078
 ThreadRootMessagePanel.showAllCheckBox.text=\u3059\u3079\u3066\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=\u305d\u306e\u4ed6\u306e\u767a\u751f
-SummaryViewer.fileReferencesPanel.border.title=\u73fe\u5728\u306e\u30b1\u30fc\u30b9\u306e\u30d5\u30a1\u30a4\u30eb\u30ec\u30d5\u30a1\u30ec\u30f3\u30b9
 MessageViewer.threadsLabel.text=\u30b9\u30ec\u30c3\u30c9\u3092\u9078\u629e\u3057\u3066\u8868\u793a
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=\u6b21\u306e\u30b9\u30ec\u30c3\u30c9\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a\u4e2d\u3067\u3059:

Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java

@@ -0,0 +1,58 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.communications.relationships;
+
+import java.beans.PropertyChangeEvent;
+import org.openide.explorer.ExplorerManager;
+import org.openide.nodes.Node;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.CallLogArtifactViewer;
+import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+
+/**
+ *
+ * Wrapper around CallLogArtifactViewer to add Node support and an
+ * ExplorerManager.
+ */
+public class CallLogDataViewer extends CallLogArtifactViewer implements DataContent, ExplorerManager.Provider {
+
+    private static final long serialVersionUID = 1L;
+
+    final private ExplorerManager explorerManager = new ExplorerManager();
+
+    @Override
+    public void setNode(Node selectedNode) {
+        BlackboardArtifact artifact = null;
+        if (selectedNode != null) {
+            artifact = selectedNode.getLookup().lookup(BlackboardArtifact.class);
+        }
+        this.setArtifact(artifact);
+    }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public ExplorerManager getExplorerManager() {
+        return explorerManager;
+    }
+
+}

Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogViewer.form

@@ -16,12 +16,35 @@
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   <SubComponents>
-    <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="outlineViewPanel">
+    <Container class="javax.swing.JSplitPane" name="splitPane">
+      <Properties>
+        <Property name="orientation" type="int" value="0"/>
+      </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="15" insetsLeft="15" insetsBottom="15" insetsRight="15" anchor="12" weightX="1.0" weightY="1.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="1.0"/>
         </Constraint>
       </Constraints>
-    </Component>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
+      <SubComponents>
+        <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="outlineViewPanel">
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+              <JSplitPaneConstraints position="left"/>
+            </Constraint>
+          </Constraints>
+        </Component>
+        <Container class="javax.swing.JScrollPane" name="bottomScrollPane">
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+              <JSplitPaneConstraints position="right"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+        </Container>
+      </SubComponents>
+    </Container>
   </SubComponents>
 </Form>

Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogViewer.java

@@ -18,15 +18,24 @@
  */
 package org.sleuthkit.autopsy.communications.relationships;
 
+import java.awt.Component;
+import java.awt.KeyboardFocusManager;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import javax.swing.JPanel;
+import static javax.swing.SwingUtilities.isDescendingFrom;
 import org.netbeans.swing.outline.DefaultOutlineModel;
 import org.netbeans.swing.outline.Outline;
+import org.openide.explorer.ExplorerManager;
+import static org.openide.explorer.ExplorerUtils.createLookup;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
+import org.openide.nodes.Node;
 import org.openide.nodes.NodeAdapter;
 import org.openide.nodes.NodeMemberEvent;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
+import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PHONE_NUMBER;
@@ -35,46 +44,68 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DIR
 
 /**
  *
- * CallLogViewer Panel 
+ * CallLogViewer Panel
  */
 final class CallLogViewer extends javax.swing.JPanel implements RelationshipsViewer {
-    
+
+    private static final long serialVersionUID = 1L;
+
     private final CallLogsChildNodeFactory nodeFactory;
-    
+
+    private final CallLogDataViewer callLogDataViewer;
+    private final ModifiableProxyLookup proxyLookup;
+    private PropertyChangeListener focusPropertyListener;
+
     @Messages({
         "CallLogViewer_title=Call Logs",
         "CallLogViewer_noCallLogs=<No call logs found for selected account>",
         "CallLogViewer_recipient_label=To/From",
         "CallLogViewer_duration_label=Duration(seconds)",
-        "CallLogViewer_device_label=Device"      
+        "CallLogViewer_device_label=Device"
     })
-    
+
     /**
      * Creates new form CallLogViewer
      */
-    public CallLogViewer() {
+    CallLogViewer() {
         initComponents();
-        
+
+        callLogDataViewer = new CallLogDataViewer();
+
+        bottomScrollPane.setViewportView(callLogDataViewer);
+
+        splitPane.setResizeWeight(0.5);
+        splitPane.setDividerLocation(0.5);
+
         nodeFactory = new CallLogsChildNodeFactory(null);
+        proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
+
         outlineViewPanel.hideOutlineView(Bundle.CallLogViewer_noCallLogs());
-        
+
         outlineViewPanel.getOutlineView().setPropertyColumns(
                 TSK_DIRECTION.getLabel(), TSK_DIRECTION.getDisplayName(),
                 TSK_PHONE_NUMBER.getLabel(), Bundle.CallLogViewer_recipient_label(),
                 TSK_DATETIME_START.getLabel(), TSK_DATETIME_START.getDisplayName(),
                 CallLogNode.DURATION_PROP, Bundle.CallLogViewer_duration_label()
         );
-        
+
         Outline outline = outlineViewPanel.getOutlineView().getOutline();
         outline.setRootVisible(false);
         ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.CallLogViewer_device_label());
-        
+
+        outlineViewPanel.getExplorerManager().addPropertyChangeListener((PropertyChangeEvent evt) -> {
+            if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) {
+                final Node[] nodes = outlineViewPanel.getExplorerManager().getSelectedNodes();
+                callLogDataViewer.setNode(nodes != null && nodes.length > 0 ? nodes[0] : null);
+            }
+        });
+
         outlineViewPanel.getExplorerManager().setRootContext(
                 new TableFilterNode(
                         new DataResultFilterNode(
                                 new AbstractNode(Children.create(nodeFactory, true)), outlineViewPanel.getExplorerManager()), true));
-        
-         outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter(){
+
+        outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter() {
             @Override
             public void childrenAdded(NodeMemberEvent nme) {
                 updateOutlineViewPanel();
@@ -83,9 +114,9 @@ final class CallLogViewer extends javax.swing.JPanel implements RelationshipsVie
             @Override
             public void childrenRemoved(NodeMemberEvent nme) {
                 updateOutlineViewPanel();
-            }       
+            }
         });
-        
+
     }
 
     /**
@@ -98,16 +129,21 @@ final class CallLogViewer extends javax.swing.JPanel implements RelationshipsVie
     private void initComponents() {
         java.awt.GridBagConstraints gridBagConstraints;
 
+        splitPane = new javax.swing.JSplitPane();
         outlineViewPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
+        bottomScrollPane = new javax.swing.JScrollPane();
 
         setLayout(new java.awt.GridBagLayout());
+
+        splitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+        splitPane.setLeftComponent(outlineViewPanel);
+        splitPane.setRightComponent(bottomScrollPane);
+
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
         gridBagConstraints.weightx = 1.0;
         gridBagConstraints.weighty = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(15, 15, 15, 15);
-        add(outlineViewPanel, gridBagConstraints);
+        add(splitPane, gridBagConstraints);
     }// </editor-fold>//GEN-END:initComponents
 
     @Override
@@ -127,12 +163,60 @@ final class CallLogViewer extends javax.swing.JPanel implements RelationshipsVie
 
     @Override
     public Lookup getLookup() {
-       return outlineViewPanel.getLookup();
+        return outlineViewPanel.getLookup();
     }
-    
+
+    @Override
+    public void addNotify() {
+        super.addNotify();
+
+        if (focusPropertyListener == null) {
+            // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
+            // explaination of focusPropertyListener
+            focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
+                if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
+                    handleFocusChange((Component) focusEvent.getNewValue());
+
+                }
+            };
+        }
+
+        //add listener that maintains correct selection in the Global Actions Context
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS
+    }
+
+    /**
+     * Handle the switching of the proxyLookup due to focus change.
+     *
+     * @param newFocusOwner
+     */
+    private void handleFocusChange(Component newFocusOwner) {
+        if (newFocusOwner == null) {
+            return;
+        }
+        if (isDescendingFrom(newFocusOwner, callLogDataViewer)) {
+            //if the focus owner is within the MessageContentViewer (the attachments table)
+            proxyLookup.setNewLookups(createLookup(callLogDataViewer.getExplorerManager(), getActionMap()));
+        } else if (isDescendingFrom(newFocusOwner, this)) {
+            //... or if it is within the Results table.
+            proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
+
+        }
+    }
+
+    @Override
+    public void removeNotify() {
+        super.removeNotify();
+        if (focusPropertyListener != null) {
+            KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                    .removePropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS
+        }
+    }
+
     private void updateOutlineViewPanel() {
         int nodeCount = outlineViewPanel.getExplorerManager().getRootContext().getChildren().getNodesCount();
-        if(nodeCount == 0) {
+        if (nodeCount == 0) {
             outlineViewPanel.hideOutlineView(Bundle.ContactsViewer_noContacts_message());
         } else {
             outlineViewPanel.showOutlineView();
@@ -141,6 +225,8 @@ final class CallLogViewer extends javax.swing.JPanel implements RelationshipsVie
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JScrollPane bottomScrollPane;
     private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel outlineViewPanel;
+    private javax.swing.JSplitPane splitPane;
     // End of variables declaration//GEN-END:variables
 }

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java

@@ -0,0 +1,58 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.communications.relationships;
+
+import java.beans.PropertyChangeEvent;
+import org.openide.explorer.ExplorerManager;
+import org.openide.nodes.Node;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.ContactArtifactViewer;
+import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+
+/**
+ *
+ * Wrapper around ContactArtifactViewer to add Node support and an
+ * ExplorerManager.
+ */
+public class ContactDataViewer extends ContactArtifactViewer implements DataContent, ExplorerManager.Provider {
+
+    private static final long serialVersionUID = 1L;
+
+    final private ExplorerManager explorerManager = new ExplorerManager();
+
+    @Override
+    public void setNode(Node selectedNode) {
+        BlackboardArtifact artifact = null;
+        if (selectedNode != null) {
+            artifact = selectedNode.getLookup().lookup(BlackboardArtifact.class);
+        }
+        this.setArtifact(artifact);
+    }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public ExplorerManager getExplorerManager() {
+        return explorerManager;
+    }
+
+}

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.form

@@ -1,47 +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"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
-  </AuxValues>
-
-  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-  <SubComponents>
-    <Component class="javax.swing.JLabel" name="nameLabel">
-      <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-          <FontInfo relative="true">
-            <Font component="nameLabel" property="font" relativeSize="true" size="13"/>
-          </FontInfo>
-        </Property>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="ContactDetailsPane.nameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="16" insetsLeft="15" insetsBottom="15" insetsRight="15" anchor="23" weightX="1.0" weightY="0.0"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="org.openide.explorer.propertysheet.PropertySheet" name="propertySheet">
-      <Properties>
-        <Property name="descriptionAreaVisible" type="boolean" value="false"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="15" insetsBottom="16" insetsRight="15" anchor="18" weightX="1.0" weightY="1.0"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-  </SubComponents>
-</Form>

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.java

@@ -1,163 +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.communications.relationships;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
-import org.openide.explorer.ExplorerManager;
-import org.openide.nodes.Node;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.BlackboardArtifact;
-import org.sleuthkit.datamodel.Content;
-import org.sleuthkit.datamodel.TskCoreException;
-
-/**
- * Displays the propertied of a ContactNode in a PropertySheet.
- */
-public final class ContactDetailsPane extends javax.swing.JPanel implements ExplorerManager.Provider {
-
-    private static final Logger logger = Logger.getLogger(ContactDetailsPane.class.getName());
-    
-    private final static String DEFAULT_IMAGE_PATH = "/org/sleuthkit/autopsy/communications/images/defaultContact.png";
-    
-    private final ExplorerManager explorerManager = new ExplorerManager();
-    private final ImageIcon defaultImage;
-
-    /**
-     * Displays the propertied of a ContactNode in a PropertySheet.
-     */
-    public ContactDetailsPane() {
-        initComponents();
-        nameLabel.setText("");
-        
-        defaultImage = new ImageIcon(ContactDetailsPane.class.getResource(DEFAULT_IMAGE_PATH));
-    }
-
-    /**
-     * Sets the list of nodes for the property sheet.
-     *
-     * @param nodes List of nodes to set
-     */
-    public void setNode(Node[] nodes) {
-        if (nodes != null && nodes.length == 1) {
-            nameLabel.setText(nodes[0].getDisplayName());
-            nameLabel.setIcon(null);
-            propertySheet.setNodes(nodes);
-            
-            BlackboardArtifact n = nodes[0].getLookup().lookup(BlackboardArtifact.class);
-            if(n != null) {
-                nameLabel.setIcon(getImageFromArtifact(n));
-            }
-        } else {
-            nameLabel.setText("");
-            nameLabel.setIcon(null);
-            propertySheet.setNodes(null);
-        }
-    }
-
-    @Override
-    public ExplorerManager getExplorerManager() {
-        return explorerManager;
-    }
-    
-    public ImageIcon getImageFromArtifact(BlackboardArtifact artifact){
-        ImageIcon imageIcon = defaultImage;
-        
-        if(artifact == null) {
-            return imageIcon;
-        }
-        
-        BlackboardArtifact.ARTIFACT_TYPE artifactType = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID());
-        if(artifactType != BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT) {
-            return imageIcon;
-        }
-        
-        try {
-            for(Content content: artifact.getChildren()) {
-                if(content instanceof AbstractFile) {
-                    AbstractFile file = (AbstractFile)content;
-                    
-                    try {
-                        BufferedImage image = ImageIO.read(new File(file.getLocalAbsPath()));
-                        imageIcon = new ImageIcon(image);
-                        break;
-                    } catch (IOException ex) {
-                       // ImageIO.read will through an IOException if file is not an image
-                       // therefore we don't need to report this exception just try
-                       // the next file.
-                    }
-                }
-            }
-        } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, String.format("Unable to load image for contact: %d", artifact.getId()), ex);
-        }
-        
-        return imageIcon;
-    }
-
-    /**
-     * 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() {
-        java.awt.GridBagConstraints gridBagConstraints;
-
-        nameLabel = new javax.swing.JLabel();
-        propertySheet = new org.openide.explorer.propertysheet.PropertySheet();
-
-        setLayout(new java.awt.GridBagLayout());
-
-        nameLabel.setFont(nameLabel.getFont().deriveFont(nameLabel.getFont().getSize()+13f));
-        org.openide.awt.Mnemonics.setLocalizedText(nameLabel, org.openide.util.NbBundle.getMessage(ContactDetailsPane.class, "ContactDetailsPane.nameLabel.text")); // NOI18N
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_START;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(16, 15, 15, 15);
-        add(nameLabel, gridBagConstraints);
-
-        propertySheet.setDescriptionAreaVisible(false);
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.gridwidth = 2;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.weighty = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(9, 15, 16, 15);
-        add(propertySheet, gridBagConstraints);
-    }// </editor-fold>//GEN-END:initComponents
-
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel nameLabel;
-    private org.openide.explorer.propertysheet.PropertySheet propertySheet;
-    // End of variables declaration//GEN-END:variables
-}

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form

@@ -28,13 +28,6 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
-        <Component class="org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane" name="contactPane">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-        </Component>
         <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="outlineViewPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java

@@ -45,14 +45,15 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
  * Visualization for contact nodes.
  *
  */
-@ServiceProvider(service = RelationshipsViewer.class)
-public final class ContactsViewer extends JPanel implements RelationshipsViewer{
+final class ContactsViewer extends JPanel implements RelationshipsViewer {
+
+    private static final long serialVersionUID = 1L;
 
-//    private final ExplorerManager tableEM;
     private final Outline outline;
     private final ModifiableProxyLookup proxyLookup;
-    private final PropertyChangeListener focusPropertyListener;
+    private PropertyChangeListener focusPropertyListener;
     private final ContactsChildNodeFactory nodeFactory;
+    private final ContactDataViewer contactPane;
 
     @NbBundle.Messages({
         "ContactsViewer_tabTitle=Contacts",
@@ -65,34 +66,17 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
     /**
      * Visualization for contact nodes.
      */
-    public ContactsViewer() {
+    ContactsViewer() {
         initComponents();
-        
+
+        contactPane = new ContactDataViewer();
+        splitPane.setRightComponent(contactPane);
+
         outlineViewPanel.hideOutlineView(Bundle.ContactsViewer_noContacts_message());
 
         proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
         nodeFactory = new ContactsChildNodeFactory(null);
 
-        // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
-        // explaination of focusPropertyListener
-        focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
-            if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
-                final Component newFocusOwner = (Component) focusEvent.getNewValue();
-
-                if (newFocusOwner == null) {
-                    return;
-                }
-                if (isDescendingFrom(newFocusOwner, contactPane)) {
-                    //if the focus owner is within the MessageContentViewer (the attachments table)
-                    proxyLookup.setNewLookups(createLookup(contactPane.getExplorerManager(), getActionMap()));
-                } else if (isDescendingFrom(newFocusOwner, ContactsViewer.this)) {
-                    //... or if it is within the Results table.
-                    proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
-
-                }
-            }
-        };
-
         outline = outlineViewPanel.getOutlineView().getOutline();
         outlineViewPanel.getOutlineView().setPropertyColumns(
                 "TSK_EMAIL", BlackboardAttribute.ATTRIBUTE_TYPE.TSK_EMAIL.getDisplayName(),
@@ -100,21 +84,21 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
         );
         outline.setRootVisible(false);
         ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.ContactsViewer_columnHeader_Name());
-        
+
         outlineViewPanel.hideOutlineView("<No contacts for selected account>");
 
         outlineViewPanel.getExplorerManager().addPropertyChangeListener((PropertyChangeEvent evt) -> {
             if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) {
                 final Node[] nodes = outlineViewPanel.getExplorerManager().getSelectedNodes();
-                contactPane.setNode(nodes);
+                contactPane.setNode(nodes != null && nodes.length > 0 ? nodes[0] : null);
             }
         });
 
         outlineViewPanel.getExplorerManager().setRootContext(new TableFilterNode(new DataResultFilterNode(new AbstractNode(Children.create(nodeFactory, true)), outlineViewPanel.getExplorerManager()), true));
-        
+
         // When a new set of nodes are added to the OutlineView the childrenAdded
         // seems to be fired before the childrenRemoved. 
-        outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter(){
+        outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter() {
             @Override
             public void childrenAdded(NodeMemberEvent nme) {
                 updateOutlineViewPanel();
@@ -123,9 +107,9 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
             @Override
             public void childrenRemoved(NodeMemberEvent nme) {
                 updateOutlineViewPanel();
-            }       
+            }
         });
-        
+
         splitPane.setResizeWeight(0.5);
         splitPane.setDividerLocation(0.5);
     }
@@ -144,7 +128,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
     public void setSelectionInfo(SelectionInfo info) {
         nodeFactory.refresh(info);
     }
-    
+
     @Override
     public Lookup getLookup() {
         return proxyLookup;
@@ -153,21 +137,53 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
     @Override
     public void addNotify() {
         super.addNotify();
+
+        if (focusPropertyListener == null) {
+            // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
+            // explaination of focusPropertyListener
+            focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
+                if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
+                    handleFocusChange((Component) focusEvent.getNewValue());
+                }
+            };
+        }
+
         //add listener that maintains correct selection in the Global Actions Context
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS
     }
 
+    /**
+     * Handle the switching of the proxyLookup due to focus change.
+     *
+     * @param newFocusOwner
+     */
+    private void handleFocusChange(Component newFocusOwner) {
+        if (newFocusOwner == null) {
+            return;
+        }
+        if (isDescendingFrom(newFocusOwner, contactPane)) {
+            //if the focus owner is within the MessageContentViewer (the attachments table)
+            proxyLookup.setNewLookups(createLookup(contactPane.getExplorerManager(), getActionMap()));
+        } else if (isDescendingFrom(newFocusOwner, this)) {
+            //... or if it is within the Results table.
+            proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
+
+        }
+    }
+
     @Override
     public void removeNotify() {
         super.removeNotify();
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .removePropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS
+        if (focusPropertyListener != null) {
+            KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                    .removePropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS
+        }
     }
-    
+
     private void updateOutlineViewPanel() {
         int nodeCount = outlineViewPanel.getExplorerManager().getRootContext().getChildren().getNodesCount();
-        if(nodeCount == 0) {
+        if (nodeCount == 0) {
             outlineViewPanel.hideOutlineView(Bundle.ContactsViewer_noContacts_message());
         } else {
             outlineViewPanel.showOutlineView();
@@ -185,13 +201,11 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
         java.awt.GridBagConstraints gridBagConstraints;
 
         splitPane = new javax.swing.JSplitPane();
-        contactPane = new org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane();
         outlineViewPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
 
         setLayout(new java.awt.GridBagLayout());
 
         splitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
-        splitPane.setRightComponent(contactPane);
         splitPane.setLeftComponent(outlineViewPanel);
 
         gridBagConstraints = new java.awt.GridBagConstraints();
@@ -206,7 +220,6 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane contactPane;
     private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel outlineViewPanel;
     private javax.swing.JSplitPane splitPane;
     // End of variables declaration//GEN-END:variables

Core/src/org/sleuthkit/autopsy/communications/relationships/MediaViewer.form

@@ -46,21 +46,6 @@
             </Constraint>
           </Constraints>
         </Component>
-        <Component class="org.sleuthkit.autopsy.contentviewers.MessageContentViewer" name="contentViewer">
-          <Properties>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[450, 400]"/>
-            </Property>
-          </Properties>
-          <AuxValues>
-            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new MessageDataContent()"/>
-          </AuxValues>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>

Core/src/org/sleuthkit/autopsy/communications/relationships/MediaViewer.java

@@ -33,8 +33,6 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -42,56 +40,42 @@ import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
 import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 import org.sleuthkit.datamodel.AbstractContent;
 import org.sleuthkit.datamodel.BlackboardArtifact;
-import org.sleuthkit.datamodel.CommunicationsManager;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- *  A Panel that shows the media (thumbnails) for the selected account.
+ * A Panel that shows the media (thumbnails) for the selected account.
  */
 final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerManager.Provider, Lookup.Provider {
 
     private static final Logger logger = Logger.getLogger(MediaViewer.class.getName());
+    private static final long serialVersionUID = 1L;
 
     private final ExplorerManager tableEM = new ExplorerManager();
-    private final PropertyChangeListener focusPropertyListener;
+    private PropertyChangeListener focusPropertyListener;
 
     private final ModifiableProxyLookup proxyLookup;
 
+    private final MessageDataContent contentViewer;
+
     @Messages({
         "MediaViewer_Name=Media Attachments"
     })
     /**
      * Creates new form ThumbnailViewer
      */
-    public MediaViewer() {
+    MediaViewer() {
         initComponents();
-        
+
         splitPane.setResizeWeight(0.5);
         splitPane.setDividerLocation(0.5);
-        
+
+        contentViewer = new MessageDataContent();
+        contentViewer.setPreferredSize(new java.awt.Dimension(450, 400));
+        splitPane.setRightComponent(contentViewer);
+
         proxyLookup = new ModifiableProxyLookup(createLookup(tableEM, getActionMap()));
 
-        // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
-        // explaination of focusPropertyListener
-        focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
-            if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
-                final Component newFocusOwner = (Component) focusEvent.getNewValue();
-
-                if (newFocusOwner == null) {
-                    return;
-                }
-                if (isDescendingFrom(newFocusOwner, contentViewer)) {
-                    //if the focus owner is within the MessageContentViewer (the attachments table)
-                    proxyLookup.setNewLookups(createLookup(((MessageDataContent) contentViewer).getExplorerManager(), getActionMap()));
-                } else if (isDescendingFrom(newFocusOwner, MediaViewer.this)) {
-                    //... or if it is within the Results table.
-                    proxyLookup.setNewLookups(createLookup(tableEM, getActionMap()));
-
-                }
-            }
-        };
-
         tableEM.addPropertyChangeListener((PropertyChangeEvent evt) -> {
             if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) {
                 handleNodeSelectionChange();
@@ -124,7 +108,7 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
             });
 
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Unable to update selection." , ex);
+            logger.log(Level.WARNING, "Unable to update selection.", ex);
         }
 
         thumbnailViewer.resetComponent();
@@ -145,16 +129,49 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
     @Override
     public void addNotify() {
         super.addNotify();
+
+        if (focusPropertyListener == null) {
+            // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
+            // explaination of focusPropertyListener
+            focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
+                if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
+                    handleFocusChange((Component) focusEvent.getNewValue());
+                }
+            };
+
+        }
         //add listener that maintains correct selection in the Global Actions Context
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener("focusOwner", focusPropertyListener);
     }
 
+    /**
+     * Handle the switching of the proxyLookup due to focus change.
+     *
+     * @param newFocusOwner
+     */
+    private void handleFocusChange(Component newFocusOwner) {
+        if (newFocusOwner == null) {
+            return;
+        }
+        if (isDescendingFrom(newFocusOwner, contentViewer)) {
+            //if the focus owner is within the MessageContentViewer (the attachments table)
+            proxyLookup.setNewLookups(createLookup(contentViewer.getExplorerManager(), getActionMap()));
+        } else if (isDescendingFrom(newFocusOwner, this)) {
+            //... or if it is within the Results table.
+            proxyLookup.setNewLookups(createLookup(tableEM, getActionMap()));
+
+        }
+    }
+
     @Override
     public void removeNotify() {
         super.removeNotify();
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .removePropertyChangeListener("focusOwner", focusPropertyListener);
+
+        if (focusPropertyListener != null) {
+            KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                    .removePropertyChangeListener("focusOwner", focusPropertyListener);
+        }
     }
 
     /**
@@ -192,7 +209,6 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
 
         splitPane = new javax.swing.JSplitPane();
         thumbnailViewer = new org.sleuthkit.autopsy.corecomponents.DataResultViewerThumbnail(tableEM);
-        contentViewer = new MessageDataContent();
 
         setLayout(new java.awt.GridBagLayout());
 
@@ -202,9 +218,6 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
         thumbnailViewer.setPreferredSize(new java.awt.Dimension(450, 400));
         splitPane.setLeftComponent(thumbnailViewer);
 
-        contentViewer.setPreferredSize(new java.awt.Dimension(450, 400));
-        splitPane.setRightComponent(contentViewer);
-
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 0;
@@ -217,7 +230,6 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.contentviewers.MessageContentViewer contentViewer;
     private javax.swing.JSplitPane splitPane;
     private org.sleuthkit.autopsy.corecomponents.DataResultViewerThumbnail thumbnailViewer;
     // End of variables declaration//GEN-END:variables

Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java

@@ -19,9 +19,21 @@
 package org.sleuthkit.autopsy.communications.relationships;
 
 import java.beans.PropertyChangeEvent;
+import java.util.List;
+import java.util.logging.Level;
 import org.openide.explorer.ExplorerManager;
-import org.sleuthkit.autopsy.contentviewers.MessageContentViewer;
+import org.openide.nodes.Node;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.MessageArtifactViewer;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_ASSOCIATED_OBJECT;
+import org.sleuthkit.datamodel.BlackboardAttribute;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Extends MessageContentViewer so that it implements DataContent and can be set
@@ -32,7 +44,9 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
  * solution to a very similar problem.
  *
  */
-final class MessageDataContent extends MessageContentViewer implements DataContent, ExplorerManager.Provider {
+final class MessageDataContent extends MessageArtifactViewer implements DataContent, ExplorerManager.Provider {
+
+    private static final Logger LOGGER = Logger.getLogger(MessageDataContent.class.getName());
 
     private static final long serialVersionUID = 1L;
     final private ExplorerManager explorerManager = new ExplorerManager();
@@ -46,4 +60,53 @@ final class MessageDataContent extends MessageContentViewer implements DataConte
     public ExplorerManager getExplorerManager() {
         return explorerManager;
     }
+
+    @Override
+    public void setNode(Node node) {
+        BlackboardArtifact artifact = null;
+        if (node != null) {
+            artifact = getNodeArtifact(node);
+        }
+        setArtifact(artifact);
+    }
+
+    /**
+     * Returns the artifact represented by node.
+     *
+     * If the node lookup has an artifact, that artifact is returned. However,
+     * if the node lookup is a file, then we look for a TSK_ASSOCIATED_OBJECT
+     * artifact on the file, and if a message artifact is found associated with
+     * the file, that artifact is returned.
+     *
+     * @param node Node to check.
+     *
+     * @return Blackboard artifact for the node, null if there isn't any.
+     */
+    private BlackboardArtifact getNodeArtifact(Node node) {
+        BlackboardArtifact nodeArtifact = node.getLookup().lookup(BlackboardArtifact.class);
+
+        if (nodeArtifact == null) {
+            try {
+                SleuthkitCase tskCase = Case.getCurrentCaseThrows().getSleuthkitCase();
+                AbstractFile file = node.getLookup().lookup(AbstractFile.class);
+                if (file != null) {
+                    List<BlackboardArtifact> artifactsList = tskCase.getBlackboardArtifacts(TSK_ASSOCIATED_OBJECT, file.getId());
+
+                    for (BlackboardArtifact fileArtifact : artifactsList) {
+                        BlackboardAttribute associatedArtifactAttribute = fileArtifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT));
+                        if (associatedArtifactAttribute != null) {
+                            BlackboardArtifact associatedArtifact = fileArtifact.getSleuthkitCase().getBlackboardArtifact(associatedArtifactAttribute.getValueLong());
+                            if (isMessageArtifact(associatedArtifact)) {
+                                nodeArtifact = associatedArtifact;
+                            }
+                        }
+                    }
+                }
+            } catch (NoCurrentCaseException | TskCoreException ex) {
+                LOGGER.log(Level.SEVERE, "Failed to get file for selected node.", ex); //NON-NLS
+            }
+        }
+
+        return nodeArtifact;
+    }
 }

Core/src/org/sleuthkit/autopsy/communications/relationships/MessageNode.java

@@ -18,7 +18,9 @@
  */
 package org.sleuthkit.autopsy.communications.relationships;
 
+import java.awt.event.ActionEvent;
 import java.util.logging.Level;
+import javax.swing.AbstractAction;
 import javax.swing.Action;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.nodes.Sheet;
@@ -48,22 +50,24 @@ import org.sleuthkit.datamodel.blackboardutils.attributes.MessageAttachments;
 class MessageNode extends BlackboardArtifactNode {
 
     public static final String UNTHREADED_ID = "<UNTHREADED>";
-    
+
     private static final Logger logger = Logger.getLogger(MessageNode.class.getName());
-    
+
     private final String threadID;
-    
+
     private final Action preferredAction;
 
-    MessageNode(BlackboardArtifact artifact, String threadID,  Action preferredAction) {
+    private final Action defaultNoopAction = new DefaultMessageAction();
+
+    MessageNode(BlackboardArtifact artifact, String threadID, Action preferredAction) {
         super(artifact);
-        
+
         this.preferredAction = preferredAction;
 
         final String stripEnd = StringUtils.stripEnd(artifact.getDisplayName(), "s"); // NON-NLS
         String removeEndIgnoreCase = StringUtils.removeEndIgnoreCase(stripEnd, "message"); // NON-NLS
         setDisplayName(removeEndIgnoreCase.isEmpty() ? stripEnd : removeEndIgnoreCase);
-        
+
         this.threadID = threadID;
     }
 
@@ -73,12 +77,12 @@ class MessageNode extends BlackboardArtifactNode {
         "MessageNode_Node_Property_To=To",
         "MessageNode_Node_Property_Date=Date",
         "MessageNode_Node_Property_Subject=Subject",
-        "MessageNode_Node_Property_Attms=Attachments"
+        "MessageNode_Node_Property_Attms=Attachment Count"
     })
-    
+
     @Override
     protected Sheet createSheet() {
-        Sheet sheet = super.createSheet();
+        Sheet sheet = Sheet.createDefault();
         Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
         if (sheetSet == null) {
             sheetSet = Sheet.createPropertiesSet();
@@ -89,42 +93,45 @@ class MessageNode extends BlackboardArtifactNode {
 
         final BlackboardArtifact artifact = getArtifact();
         BlackboardArtifact.ARTIFACT_TYPE fromID = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID());
-        
-        if(fromID == null ||
-                (fromID != TSK_EMAIL_MSG &&
-                fromID != TSK_MESSAGE)) {
+
+        if (fromID == null
+                || (fromID != TSK_EMAIL_MSG
+                && fromID != TSK_MESSAGE)) {
             return sheet;
         }
-        
-        sheetSet.put(new NodeProperty<>("ThreadID", "ThreadID","",threadID == null ? UNTHREADED_ID : threadID)); //NON-NLS
+        if (threadID != null) {
+            sheetSet.put(new NodeProperty<>("ThreadID", "ThreadID", "", threadID)); //NON-NLS
+        }
         sheetSet.put(new NodeProperty<>("Subject", Bundle.MessageNode_Node_Property_Subject(), "",
-            getAttributeDisplayString(artifact, TSK_SUBJECT))); //NON-NLS
+                getAttributeDisplayString(artifact, TSK_SUBJECT))); //NON-NLS
         try {
             sheetSet.put(new NodeProperty<>("Attms", Bundle.MessageNode_Node_Property_Attms(), "", getAttachmentsCount())); //NON-NLS
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Error loading attachment count for " + artifact, ex); //NON-NLS
         }
-            
-        switch (fromID) {
-            case TSK_EMAIL_MSG:
-                sheetSet.put(new NodeProperty<>("From", Bundle.MessageNode_Node_Property_From(), "",
-                        StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_FROM), " \t\n;"))); //NON-NLS
-                sheetSet.put(new NodeProperty<>("To", Bundle.MessageNode_Node_Property_To(), "",
-                        StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_TO), " \t\n;"))); //NON-NLS
-                sheetSet.put(new NodeProperty<>("Date", Bundle.MessageNode_Node_Property_Date(), "",
-                        getAttributeDisplayString(artifact, TSK_DATETIME_SENT))); //NON-NLS
-                break;
-            case TSK_MESSAGE:
-                sheetSet.put(new NodeProperty<>("From", Bundle.MessageNode_Node_Property_From(), "",
-                        getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM))); //NON-NLS
-                sheetSet.put(new NodeProperty<>("To", Bundle.MessageNode_Node_Property_To(), "",
-                        getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO))); //NON-NLS
-                sheetSet.put(new NodeProperty<>("Date", Bundle.MessageNode_Node_Property_Date(), "",
-                        getAttributeDisplayString(artifact, TSK_DATETIME))); //NON-NLS
-                break;
-            default:
-                break;
+
+        String msg_from = getAttributeDisplayString(artifact, TSK_EMAIL_FROM);
+        String msg_to = getAttributeDisplayString(artifact, TSK_EMAIL_TO);
+        String date = getAttributeDisplayString(artifact, TSK_DATETIME_SENT);
+
+        if (msg_from.isEmpty()) {
+            msg_from = getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM);
+
         }
+        if (msg_to.isEmpty()) {
+            msg_to = getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO);
+        }
+        if (date.isEmpty()) {
+            date = getAttributeDisplayString(artifact, TSK_DATETIME);
+        }
+
+        sheetSet.put(new NodeProperty<>("From", Bundle.MessageNode_Node_Property_From(), "",
+                msg_from)); //NON-NLS
+        sheetSet.put(new NodeProperty<>("To", Bundle.MessageNode_Node_Property_To(), "",
+                msg_to)); //NON-NLS
+        sheetSet.put(new NodeProperty<>("Date", Bundle.MessageNode_Node_Property_Date(), "",
+                date)); //NON-NLS
+
         return sheet;
     }
 
@@ -138,16 +145,16 @@ class MessageNode extends BlackboardArtifactNode {
     public String getSourceName() {
         return getDisplayName();
     }
-    
+
     String getThreadID() {
         return threadID;
     }
-    
+
     @Override
     public Action getPreferredAction() {
-        return preferredAction;
+        return preferredAction != null ? preferredAction : defaultNoopAction;
     }
-    
+
     private int getAttachmentsCount() throws TskCoreException {
         final BlackboardArtifact artifact = getArtifact();
         int attachmentsCount;
@@ -158,8 +165,7 @@ class MessageNode extends BlackboardArtifactNode {
             try {
                 MessageAttachments msgAttachments = BlackboardJsonAttrUtil.fromAttribute(attachmentsAttr, MessageAttachments.class);
                 return msgAttachments.getAttachmentsCount();
-            } 
-            catch (BlackboardJsonAttrUtil.InvalidJsonException ex) {
+            } catch (BlackboardJsonAttrUtil.InvalidJsonException ex) {
                 logger.log(Level.WARNING, String.format("Unable to parse json for MessageAttachments object in artifact: %s", artifact.getName()), ex);
                 return 0;
             }
@@ -169,4 +175,17 @@ class MessageNode extends BlackboardArtifactNode {
 
         return attachmentsCount;
     }
+
+    /**
+     * A no op action to override the default action of BlackboardArtifactNode
+     */
+    private class DefaultMessageAction extends AbstractAction {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            // Do Nothing.
+        }
+    }
 }

Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java

@@ -38,6 +38,8 @@ import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import static javax.swing.SwingUtilities.isDescendingFrom;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 import org.netbeans.swing.outline.DefaultOutlineModel;
 import org.netbeans.swing.outline.Outline;
 import org.openide.explorer.ExplorerManager;
@@ -50,6 +52,7 @@ import org.openide.nodes.Node.PropertySet;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
+import org.sleuthkit.autopsy.communications.Utils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -57,18 +60,19 @@ import org.sleuthkit.autopsy.coreutils.Logger;
  *
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class MessageViewer extends JPanel implements RelationshipsViewer {
+final class MessageViewer extends JPanel implements RelationshipsViewer {
 
     private static final Logger logger = Logger.getLogger(MessageViewer.class.getName());
+    private static final long serialVersionUID = 1L;
 
     private final ModifiableProxyLookup proxyLookup;
-    private final PropertyChangeListener focusPropertyListener;
+    private PropertyChangeListener focusPropertyListener;
     private final ThreadChildNodeFactory rootMessageFactory;
     private final MessagesChildNodeFactory threadMessageNodeFactory;
 
     private SelectionInfo currentSelectionInfo = null;
 
-    OutlineViewPanel currentPanel;
+    private OutlineViewPanel currentPanel;
 
     @Messages({
         "MessageViewer_tabTitle=Messages",
@@ -87,7 +91,7 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
     /**
      * Creates new form MessageViewer
      */
-    public MessageViewer() {
+    MessageViewer() {
 
         initComponents();
         currentPanel = rootTablePane;
@@ -95,26 +99,9 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
         rootMessageFactory = new ThreadChildNodeFactory(new ShowThreadMessagesAction());
         threadMessageNodeFactory = new MessagesChildNodeFactory();
 
-        // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
-        // explaination of focusPropertyListener
-        focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
-            if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
-                final Component newFocusOwner = (Component) focusEvent.getNewValue();
-
-                if (newFocusOwner == null) {
-                    return;
-                }
-                if (isDescendingFrom(newFocusOwner, rootTablePane)) {
-                    proxyLookup.setNewLookups(createLookup(rootTablePane.getExplorerManager(), getActionMap()));
-                } else if (isDescendingFrom(newFocusOwner, MessageViewer.this)) {
-                    proxyLookup.setNewLookups(createLookup(currentPanel.getExplorerManager(), getActionMap()));
-                }
-            }
-        };
-
         rootTablePane.getExplorerManager().setRootContext(
                 new AbstractNode(Children.create(rootMessageFactory, true)));
-        
+
         rootTablePane.getOutlineView().setPopupAllowed(false);
 
         Outline outline = rootTablePane.getOutlineView().getOutline();
@@ -131,13 +118,20 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
                 showSelectedThread();
             }
         });
+        
+        rootTablePane.getOutlineView().getOutline().getModel().addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                Utils.setColumnWidths(rootTablePane.getOutlineView().getOutline());
+            }
+        });
 
         threadMessagesPanel.setChildFactory(threadMessageNodeFactory);
 
         rootTablePane.setTableColumnsWidth(10, 20, 70);
-        
+
         Image image = getScaledImage((new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/timeline/images/arrow-180.png"))).getImage(), 16, 16);
-        backButton.setIcon(new ImageIcon(image) );
+        backButton.setIcon(new ImageIcon(image));
     }
 
     @Override
@@ -170,11 +164,38 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
     @Override
     public void addNotify() {
         super.addNotify();
+
+        if (focusPropertyListener == null) {
+            // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
+            // explaination of focusPropertyListener
+            focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
+                if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
+                    handleFocusChange((Component) focusEvent.getNewValue());
+                }
+            };
+
+        }
         //add listener that maintains correct selection in the Global Actions Context
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener("focusOwner", focusPropertyListener);
     }
 
+    /**
+     * Handle the switching of the proxyLookup due to focus change.
+     * 
+     * @param newFocusOwner 
+     */
+    private void handleFocusChange(Component newFocusOwner) {
+        if (newFocusOwner == null) {
+            return;
+        }
+        if (isDescendingFrom(newFocusOwner, rootTablePane)) {
+            proxyLookup.setNewLookups(createLookup(rootTablePane.getExplorerManager(), getActionMap()));
+        } else if (isDescendingFrom(newFocusOwner, this)) {
+            proxyLookup.setNewLookups(createLookup(currentPanel.getExplorerManager(), getActionMap()));
+        }
+    }
+
     @Override
     public void removeNotify() {
         super.removeNotify();
@@ -230,52 +251,50 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
             } else {
                 threadNameLabel.setText(Bundle.MessageViewer_viewMessage_unthreaded());
             }
-            
-           showMessagesPane();
+
+            showMessagesPane();
         }
     }
-    
+
     /**
      * Make the threads pane visible.
      */
     private void showThreadsPane() {
         switchCard("threads");
     }
-    
+
     /**
      * Make the message pane visible.
      */
     private void showMessagesPane() {
         switchCard("messages");
-        Outline outline = rootTablePane.getOutlineView().getOutline();
-        outline.clearSelection();
     }
-    
+
     /**
      * Changes the visible panel (card).
-     * 
+     *
      * @param cardName Name of card to show
      */
     private void switchCard(String cardName) {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                CardLayout layout = (CardLayout)getLayout();
+                CardLayout layout = (CardLayout) getLayout();
                 layout.show(MessageViewer.this, cardName);
             }
         });
     }
-    
+
     /**
      * Scales the given image to the given width and height.
-     * 
+     *
      * @param srcImg Image to scale
-     * @param w Image width
-     * @param h Image height
-     * 
+     * @param w      Image width
+     * @param h      Image height
+     *
      * @return Scaled version of srcImg
      */
-    private Image getScaledImage(Image srcImg, int w, int h){
+    private Image getScaledImage(Image srcImg, int w, int h) {
         BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2 = resizedImg.createGraphics();
 

Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.form

@@ -35,16 +35,6 @@
             </Constraint>
           </Constraints>
         </Component>
-        <Component class="org.sleuthkit.autopsy.contentviewers.MessageContentViewer" name="messageContentViewer">
-          <AuxValues>
-            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new MessageDataContent()"/>
-          </AuxValues>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>

Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.java

@@ -23,6 +23,8 @@ import java.awt.KeyboardFocusManager;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import static javax.swing.SwingUtilities.isDescendingFrom;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 import org.netbeans.swing.outline.DefaultOutlineModel;
 import org.netbeans.swing.outline.Outline;
 import org.openide.explorer.ExplorerManager;
@@ -38,43 +40,30 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 
 /**
  *
- * General Purpose class for panels that need OutlineView of message nodes at 
- * the top with a MessageContentViewer at the bottom.
+ * General Purpose class for panels that need OutlineView of message nodes at
+ * the top with a MessageDataContent at the bottom.
  */
-public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider {
+class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider {
+
+    private static final long serialVersionUID = 1L;
 
     private final Outline outline;
     private final ModifiableProxyLookup proxyLookup;
-    private final PropertyChangeListener focusPropertyListener;
-    
+    private PropertyChangeListener focusPropertyListener;
+
+    private final MessageDataContent messageContentViewer;
+
     /**
      * Creates new form MessagesPanel
      */
-    public MessagesPanel() {
+    MessagesPanel() {
         initComponents();
-        
+
+        messageContentViewer = new MessageDataContent();
+        splitPane.setRightComponent(messageContentViewer);
+
         proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
 
-        // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
-        // explaination of focusPropertyListener
-        focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
-            if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
-                final Component newFocusOwner = (Component) focusEvent.getNewValue();
-
-                if (newFocusOwner == null) {
-                    return;
-                }
-                if (isDescendingFrom(newFocusOwner, messageContentViewer)) {
-                    //if the focus owner is within the MessageContentViewer (the attachments table)
-                    proxyLookup.setNewLookups(createLookup(((MessageDataContent) messageContentViewer).getExplorerManager(), getActionMap()));
-                } else if (isDescendingFrom(newFocusOwner, MessagesPanel.this)) {
-                    //... or if it is within the Results table.
-                    proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
-
-                }
-            }
-        };
-
         outline = outlineViewPanel.getOutlineView().getOutline();
         outlineViewPanel.getOutlineView().setPropertyColumns(
                 "From", Bundle.MessageViewer_columnHeader_From(),
@@ -92,23 +81,34 @@ public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider
 
                 if (nodes != null && nodes.length == 1) {
                     messageContentViewer.setNode(nodes[0]);
-                }
-                else {
+                } else {
                     messageContentViewer.setNode(null);
                 }
+                
             }
         });
         
+        // This is a trick to get the first message to be selected after the ChildFactory has added
+        // new data to the table.
+        outlineViewPanel.getOutlineView().getOutline().getOutlineModel().addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                if (e.getType() == TableModelEvent.INSERT) {
+                    outline.setRowSelectionInterval(0, 0);
+                }
+            }
+        });
+
         splitPane.setResizeWeight(0.5);
         splitPane.setDividerLocation(0.5);
-        outlineViewPanel.setTableColumnsWidth(5,10,10,15,50,10);
+        outlineViewPanel.setTableColumnsWidth(5, 10, 10, 15, 50, 10);
     }
-    
+
     public MessagesPanel(ChildFactory<?> nodeFactory) {
         this();
         setChildFactory(nodeFactory);
     }
-    
+
     @Override
     public Lookup getLookup() {
         return proxyLookup;
@@ -117,11 +117,38 @@ public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider
     @Override
     public void addNotify() {
         super.addNotify();
+
+        if (focusPropertyListener == null) {
+            // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed
+            // explaination of focusPropertyListener
+            focusPropertyListener = (final PropertyChangeEvent focusEvent) -> {
+                if (focusEvent.getPropertyName().equalsIgnoreCase("focusOwner")) {
+                    handleFocusChange((Component) focusEvent.getNewValue());
+
+                }
+            };
+
+        }
+
         //add listener that maintains correct selection in the Global Actions Context
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener("focusOwner", focusPropertyListener);
     }
 
+    private void handleFocusChange(Component newFocusOwner) {
+        if (newFocusOwner == null) {
+            return;
+        }
+        if (isDescendingFrom(newFocusOwner, messageContentViewer)) {
+            //if the focus owner is within the MessageContentViewer (the attachments table)
+            proxyLookup.setNewLookups(createLookup((messageContentViewer).getExplorerManager(), getActionMap()));
+        } else if (isDescendingFrom(newFocusOwner, MessagesPanel.this)) {
+            //... or if it is within the Results table.
+            proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap()));
+
+        }
+    }
+
     @Override
     public void removeNotify() {
         super.removeNotify();
@@ -135,9 +162,9 @@ public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider
                         new DataResultFilterNode(
                                 new AbstractNode(
                                         Children.create(nodeFactory, true)),
-                                outlineViewPanel.getExplorerManager()),true));
+                                outlineViewPanel.getExplorerManager()), true));
     }
-    
+
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -149,20 +176,17 @@ public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider
 
         splitPane = new javax.swing.JSplitPane();
         outlineViewPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
-        messageContentViewer = new MessageDataContent();
 
         setLayout(new java.awt.BorderLayout());
 
         splitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
         splitPane.setLeftComponent(outlineViewPanel);
-        splitPane.setRightComponent(messageContentViewer);
 
         add(splitPane, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.contentviewers.MessageContentViewer messageContentViewer;
     private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel outlineViewPanel;
     private javax.swing.JSplitPane splitPane;
     // End of variables declaration//GEN-END:variables

Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form

@@ -253,22 +253,6 @@
         </Component>
       </SubComponents>
     </Container>
-    <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="fileReferencesPanel">
-      <Properties>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="File References in Current Case">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.fileReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </TitledBorder>
-          </Border>
-        </Property>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="1.0" weightY="1.0"/>
-        </Constraint>
-      </Constraints>
-    </Component>
     <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="caseReferencesPanel">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -285,5 +269,99 @@
         </Constraint>
       </Constraints>
     </Component>
+    <Container class="javax.swing.JPanel" name="fileRefPane">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="File References in Current Case">
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.fileRefPane.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="1.0"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignCardLayout"/>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="fileRefScrolPanel">
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+          </AuxValues>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
+              <CardConstraints cardName="listPanelCard"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+          <SubComponents>
+            <Container class="javax.swing.JScrollPane" name="scrollPane">
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+                <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+              </AuxValues>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+                  <BorderConstraints direction="Center"/>
+                </Constraint>
+              </Constraints>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+              <SubComponents>
+                <Component class="javax.swing.JList" name="fileRefList">
+                  <Properties>
+                    <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
+                      <StringArray count="5">
+                        <StringItem index="0" value="Item 1"/>
+                        <StringItem index="1" value="Item 2"/>
+                        <StringItem index="2" value="Item 3"/>
+                        <StringItem index="3" value="Item 4"/>
+                        <StringItem index="4" value="Item 5"/>
+                      </StringArray>
+                    </Property>
+                  </Properties>
+                  <AuxValues>
+                    <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+                  </AuxValues>
+                </Component>
+              </SubComponents>
+            </Container>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="selectAccountPane">
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+          </AuxValues>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
+              <CardConstraints cardName="selectAccountCard"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JLabel" name="selectAccountFileRefLabel">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.selectAccountFileRefLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+                <Property name="enabled" type="boolean" value="false"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
   </SubComponents>
 </Form>