From e947e4d530c137d1b658542ef78c97e99360ecba Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 13 Mar 2020 07:51:51 -0400
Subject: [PATCH 1/8] Tidy up BlackboardArtifactNOde.java

---
 .../datamodel/BlackboardArtifactNode.java     | 485 ++++++++++--------
 .../datamodel/Bundle.properties-MERGED        |   3 -
 2 files changed, 261 insertions(+), 227 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 17b8248f06..1126cb1c80 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -60,7 +60,6 @@ import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable;
 import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable.Score;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import static org.sleuthkit.autopsy.datamodel.DisplayableItemNode.findLinked;
 import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable.HasCommentStatus;
 import static org.sleuthkit.autopsy.datamodel.AbstractContentNode.backgroundTasksPool;
@@ -79,45 +78,56 @@ import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 
 /**
- * Node wrapping a blackboard artifact object. This is generated from several
- * places in the tree.
+ * An AbstractNode implementation representing an artifact of any type.
  */
 public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifact> {
 
     private static final Logger logger = Logger.getLogger(BlackboardArtifactNode.class.getName());
-    private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(Case.Events.BLACKBOARD_ARTIFACT_TAG_ADDED,
+
+    /*
+     * This cache is used to avoid repeated trips to the case database for
+     * Content objects that are the source of multiple artifacts.
+     */
+    private static final Cache<Long, Content> contentCache = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build();
+
+    /*
+     * Case application events that affect the property sheets of
+     * BlackboardArtifactNodes, with one exception, CURRENT_CASE (closed) events
+     * which triggers content cache invalidation and unregistering of the node's
+     * ProeprtyChangeListener.
+     */
+    private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(
+            Case.Events.BLACKBOARD_ARTIFACT_TAG_ADDED,
             Case.Events.BLACKBOARD_ARTIFACT_TAG_DELETED,
             Case.Events.CONTENT_TAG_ADDED,
             Case.Events.CONTENT_TAG_DELETED,
             Case.Events.CURRENT_CASE,
             Case.Events.CR_COMMENT_CHANGED);
 
-    private static Cache<Long, Content> contentCache = CacheBuilder.newBuilder()
-            .expireAfterWrite(1, TimeUnit.MINUTES).
-            build();
-
-    private final BlackboardArtifact artifact;
-    private Content associated = null;
-
-    private List<NodeProperty<? extends Object>> customProperties;
-
     /*
-     * Artifact types which should have the full unique path of the associated
-     * content as a property.
+     * Artifact types which should display the full unique path of the source
+     * content in their property sheets.
      */
     private static final Integer[] SHOW_UNIQUE_PATH = new Integer[]{
         BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID(),
         BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID(),
         BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID(),};
+        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()
+    };
 
-    // TODO (RC): This is an unattractive alternative to subclassing BlackboardArtifactNode,
-    // cut from the same cloth as the equally unattractive SHOW_UNIQUE_PATH array
-    // above. It should be removed when and if the subclassing is implemented.
+    /*
+     * Artifact types which should display the file metadata of the source
+     * content, in these cases always a file, in their property sheets.
+     */
     private static final Integer[] SHOW_FILE_METADATA = new Integer[]{
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),};
+        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
+    };
 
-    private final PropertyChangeListener pcl = new PropertyChangeListener() {
+    private final BlackboardArtifact artifact;
+    private Content sourceContent;
+    private List<NodeProperty<? extends Object>> customProperties;
+
+    private final PropertyChangeListener appEventListener = new PropertyChangeListener() {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
             String eventType = evt.getPropertyName();
@@ -133,23 +143,25 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 }
             } else if (eventType.equals(Case.Events.CONTENT_TAG_ADDED.toString())) {
                 ContentTagAddedEvent event = (ContentTagAddedEvent) evt;
-                if (event.getAddedTag().getContent().equals(associated)) {
+                if (event.getAddedTag().getContent().equals(sourceContent)) {
                     updateSheet();
                 }
             } else if (eventType.equals(Case.Events.CONTENT_TAG_DELETED.toString())) {
                 ContentTagDeletedEvent event = (ContentTagDeletedEvent) evt;
-                if (event.getDeletedTagInfo().getContentID() == associated.getId()) {
+                if (event.getDeletedTagInfo().getContentID() == sourceContent.getId()) {
                     updateSheet();
                 }
             } else if (eventType.equals(Case.Events.CR_COMMENT_CHANGED.toString())) {
                 CommentChangedEvent event = (CommentChangedEvent) evt;
-                if (event.getContentID() == associated.getId()) {
+                if (event.getContentID() == sourceContent.getId()) {
                     updateSheet();
                 }
             } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
                 if (evt.getNewValue() == null) {
-                    // case was closed. Remove listeners so that we don't get called with a stale case handle
-                    removeListeners();
+                    /*
+                     * The case has been closed.
+                     */
+                    unregisterListener();
                     contentCache.invalidateAll();
                 }
             } else if (eventType.equals(NodeSpecificEvents.SCO_AVAILABLE.toString()) && !UserPreferences.getHideSCOColumns()) {
@@ -167,120 +179,121 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
     };
 
-    /**
-     * We pass a weak reference wrapper around the listener to the event
-     * publisher. This allows Netbeans to delete the node when the user
-     * navigates to another part of the tree (previously, nodes were not being
-     * deleted because the event publisher was holding onto a strong reference
-     * to the listener. We need to hold onto the weak reference here to support
-     * unregistering of the listener in removeListeners() below.
+    /*
+     * Wrap the app event PropertyChangeListener in a weak reference that will
+     * be passed to all event publishers. This allows the NetBeans
+     * infrastructure to delete the node when the user navigates to another part
+     * of the tree. Previously, nodes were not being deleted because the event
+     * publisher was holding a strong reference to the listener. We need to hold
+     * onto the weak reference here to support unregistering of the listener in
+     * unregisterListener() method below.
      */
-    private final PropertyChangeListener weakPcl = WeakListeners.propertyChange(pcl, null);
+    private final PropertyChangeListener weakAppEventListener = WeakListeners.propertyChange(appEventListener, null);
 
     /**
-     * Construct blackboard artifact node from an artifact, overriding the
-     * standard icon with the one at the path provided.
+     * Constructs a BlackboardArtifactNode, an AbstractNode implementation
+     * representing an artifact of any type.
      *
-     *
-     * @param artifact artifact to encapsulate
-     * @param iconPath icon to use for the artifact
+     * @param artifact The artifact to represent.
+     * @param iconPath The path to the icon for the artifact type.
      */
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact));
-
         this.artifact = artifact;
-
-        // Look for associated Content  i.e. the source file for the artifact
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
-                this.associated = lookupContent;
-                
+                sourceContent = lookupContent;
                 try {
-                    //See JIRA-5971
-                    //Attempt to cache file path during construction of this UI component.
-                    this.associated.getUniquePath();
+                    /*
+                     * Get the unique path of the source content now (it is
+                     * cached in the Content object).
+                     */
+                    this.sourceContent.getUniquePath();
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, String.format("Failed attempt to cache the "
-                            + "unique path of the associated content instance. Name: %s (objID=%d)", 
-                            this.associated.getName(), this.associated.getId()), ex);
+                    logger.log(Level.SEVERE, MessageFormat.format("Error getting the unique path of the source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
                 }
                 break;
             }
         }
-
         this.setName(Long.toString(artifact.getArtifactID()));
         this.setDisplayName();
         this.setIconBaseWithExtension(iconPath);
-        Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakPcl);
+        Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakAppEventListener);
     }
 
     /**
-     * Construct blackboard artifact node from an artifact and using default
-     * icon for artifact type
+     * Constructs a BlackboardArtifactNode, an AbstractNode implementation
+     * representing an artifact of any type.
      *
-     * @param artifact artifact to encapsulate
+     * @param artifact The artifact to represent.
      */
     public BlackboardArtifactNode(BlackboardArtifact artifact) {
         this(artifact, ExtractedContent.getIconFilePath(artifact.getArtifactTypeID()));
     }
 
     /**
-     * The finalizer removes event listeners as the BlackboardArtifactNode is
-     * being garbage collected. Yes, we know that finalizers are considered to
-     * be "bad" but since the alternative also relies on garbage collection
-     * being run and we know that finalize will be called when the object is
-     * being GC'd it seems like this is a reasonable solution.
+     * Unregisters the application event listener when the node is garbage
+     * collected, if the finalizer is called.
      *
      * @throws Throwable
      */
     @Override
     protected void finalize() throws Throwable {
         super.finalize();
-        removeListeners();
+        unregisterListener();
     }
 
-    private void removeListeners() {
-        Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakPcl);
+    /**
+     * Unregisters the application event listener.
+     */
+    private void unregisterListener() {
+        Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakAppEventListener);
     }
 
+    /**
+     * Gets the artifact represented by this node.
+     *
+     * @return The artifact.
+     */
     public BlackboardArtifact getArtifact() {
         return this.artifact;
     }
 
     @Override
-    @NbBundle.Messages({
-        "BlackboardArtifactNode.getAction.errorTitle=Error getting actions",
-        "BlackboardArtifactNode.getAction.resultErrorMessage=There was a problem getting actions for the selected result."
-        + "  The 'View Result in Timeline' action will not be available.",
-        "BlackboardArtifactNode.getAction.linkedFileMessage=There was a problem getting actions for the selected result. "
-        + " The 'View File in Timeline' action will not be available."})
     public Action[] getActions(boolean context) {
         List<Action> actionsList = new ArrayList<>();
         actionsList.addAll(Arrays.asList(super.getActions(context)));
-        AbstractFile file = getLookup().lookup(AbstractFile.class);
 
-        //if this artifact has a time stamp add the action to view it in the timeline
+        /*
+         * If this artifact has a timestamp, add an action to view it in the
+         * timeline.
+         */
         try {
             if (ViewArtifactInTimelineAction.hasSupportedTimeStamp(artifact)) {
                 actionsList.add(new ViewArtifactInTimelineAction(artifact));
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting arttribute(s) from blackboard artifact{0}.", artifact.getArtifactID()), ex); //NON-NLS
-            MessageNotifyUtil.Notify.error(Bundle.BlackboardArtifactNode_getAction_errorTitle(), Bundle.BlackboardArtifactNode_getAction_resultErrorMessage());
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting attributes of artifact (onbjID={0})", artifact.getArtifactID()), ex); //NON-NLS
         }
 
-        // if the artifact links to another file, add an action to go to that file
+        /*
+         * If the artifact is linked to a file via a TSK_PATH_ID attribute add
+         * an action to view the file in the timeline.
+         */
         try {
-            AbstractFile c = findLinked(artifact);
-            if (c != null) {
-                actionsList.add(ViewFileInTimelineAction.createViewFileAction(c));
+            AbstractFile linkedFile = findLinked(artifact);
+            if (linkedFile != null) {
+                actionsList.add(ViewFileInTimelineAction.createViewFileAction(linkedFile));
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting linked file from blackboard artifact{0}.", artifact.getArtifactID()), ex); //NON-NLS
-            MessageNotifyUtil.Notify.error(Bundle.BlackboardArtifactNode_getAction_errorTitle(), Bundle.BlackboardArtifactNode_getAction_linkedFileMessage());
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting linked file of artifact (onbjID={0})", artifact.getArtifactID()), ex); //NON-NLS
         }
 
-        //if the artifact has associated content, add the action to view the content in the timeline
+        /*
+         * If the source content of the artifact is a file, add an action to
+         * view the file in the data source tree.
+         */
+        AbstractFile file = getLookup().lookup(AbstractFile.class);
         if (null != file) {
             actionsList.add(ViewFileInTimelineAction.createViewSourceFileAction(file));
         }
@@ -288,12 +301,12 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         return actionsList.toArray(new Action[actionsList.size()]);
     }
 
-    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
     /**
      * Set the filter node display name. The value will either be the file name
      * or something along the lines of e.g. "Messages Artifact" for keyword hits
      * on artifacts.
      */
+    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
     private void setDisplayName() {
         String displayName = ""; //NON-NLS
 
@@ -335,17 +348,12 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Return the name of the associated source file/content
+     * Gets the name of this artifact's source content.
      *
-     * @return source file/content name
+     * @return The source content name.
      */
     public String getSourceName() {
-
-        String srcName = "";
-        if (associated != null) {
-            srcName = associated.getName();
-        }
-        return srcName;
+        return sourceContent.getName();
     }
 
     @NbBundle.Messages({
@@ -358,10 +366,13 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         "BlackboardArtifactNode.createSheet.fileSize.name=Size",
         "BlackboardArtifactNode.createSheet.fileSize.displayName=Size",
         "BlackboardArtifactNode.createSheet.path.displayName=Path",
-        "BlackboardArtifactNode.createSheet.path.name=Path"})
-
+        "BlackboardArtifactNode.createSheet.path.name=Path"
+    })
     @Override
     protected Sheet createSheet() {
+        /*
+         * Create an empty sheet.
+         */
         Sheet sheet = super.createSheet();
         Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
         if (sheetSet == null) {
@@ -369,26 +380,31 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             sheet.put(sheetSet);
         }
 
-        Map<String, Object> map = new LinkedHashMap<>();
-        fillPropertyMap(map, artifact);
-
+        /*
+         * Add the name of the artifact's source content to the sheet.
+         */
         sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.name"),
                 NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.displayName"),
                 NO_DESCR,
                 this.getSourceName()));
 
-        // Create place holders for S C O 
         if (!UserPreferences.getHideSCOColumns()) {
+            /*
+             * Add the S, C, and O columns to the sheet and start a background
+             * task to compute the S, C, O values of the artifact.
+             */
             sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_score_name(), Bundle.BlackboardArtifactNode_createSheet_score_displayName(), VALUE_LOADING, ""));
             sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), VALUE_LOADING, ""));
             if (CentralRepository.isEnabled()) {
                 sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_count_name(), Bundle.BlackboardArtifactNode_createSheet_count_displayName(), VALUE_LOADING, ""));
             }
-            // Get the SCO columns data in a background task
-            backgroundTasksPool.submit(new GetSCOTask(
-                    new WeakReference<>(this), weakPcl));
+            backgroundTasksPool.submit(new GetSCOTask(new WeakReference<>(this), weakAppEventListener));
         }
 
+        /*
+         * If the artifact is an interesting artifact hit, add the type and
+         * description of the interesting artifact to the sheet.
+         */
         if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
             try {
                 BlackboardAttribute attribute = artifact.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT));
@@ -404,10 +420,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                             associatedArtifact.getShortDescription()));
                 }
             } catch (TskCoreException | NoCurrentCaseException ex) {
-                // Do nothing since the display name will be set to the file name.
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting associated artifact of TSK_INTERESTING_ARTIFACT_HIT artifact (objID={0}))", artifact.getId()), ex); //NON-NLS
             }
         }
 
+        /*
+         * Add the artifact's attributes to the sheet.
+         */
+        Map<String, Object> map = new LinkedHashMap<>();
+        fillPropertyMap(map, artifact);
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             sheetSet.put(new NodeProperty<>(entry.getKey(),
                     entry.getKey(),
@@ -415,23 +436,28 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     entry.getValue()));
         }
 
-        //append custom node properties
+        /*
+         * Add any "custom properties" for the artifact to the sheet.
+         */
         if (customProperties != null) {
             for (NodeProperty<? extends Object> np : customProperties) {
                 sheetSet.put(np);
             }
         }
 
-        final int artifactTypeId = artifact.getArtifactTypeID();
 
-        // If mismatch, add props for extension and file type
+        /*
+         * If the artifact is a file extension mismatch artifact, add the
+         * extension and type of the file to the sheet.
+         */
+        final int artifactTypeId = artifact.getArtifactTypeID();
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) {
             String ext = ""; //NON-NLS
             String actualMimeType = ""; //NON-NLS
-            if (associated instanceof AbstractFile) {
-                AbstractFile af = (AbstractFile) associated;
-                ext = af.getNameExtension();
-                actualMimeType = af.getMIMEType();
+            if (sourceContent instanceof AbstractFile) {
+                AbstractFile file = (AbstractFile) sourceContent;
+                ext = file.getNameExtension();
+                actualMimeType = file.getMIMEType();
                 if (actualMimeType == null) {
                     actualMimeType = ""; //NON-NLS
                 }
@@ -447,12 +473,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     actualMimeType));
         }
 
+        /*
+         * If the artifact's type dictates the addition of the source content's
+         * unique path, add it to the sheet.
+         */
         if (Arrays.asList(SHOW_UNIQUE_PATH).contains(artifactTypeId)) {
             String sourcePath = ""; //NON-NLS
             try {
-                sourcePath = associated.getUniquePath();
+                sourcePath = sourceContent.getUniquePath();
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get unique path from: {0}", associated.getName()); //NON-NLS
+                logger.log(Level.WARNING, "Failed to get unique path from: {0}", sourceContent.getName()); //NON-NLS
             }
 
             if (sourcePath.isEmpty() == false) {
@@ -463,8 +493,13 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                         sourcePath));
             }
 
+            /*
+             * If the artifact's type dictates the addition of the source
+             * content's file metadata, add it to the sheet. Otherwise, add the
+             * data source to the sheet.
+             */
             if (Arrays.asList(SHOW_FILE_METADATA).contains(artifactTypeId)) {
-                AbstractFile file = associated instanceof AbstractFile ? (AbstractFile) associated : null;
+                AbstractFile file = sourceContent instanceof AbstractFile ? (AbstractFile) sourceContent : null;
                 sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.name"),
                         NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.displayName"),
                         "",
@@ -484,7 +519,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.name"),
                         NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.displayName"),
                         "",
-                        associated.getSize()));
+                        sourceContent.getSize()));
                 sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_artifactMD5_name(),
                         Bundle.BlackboardArtifactNode_createSheet_artifactMD5_displayName(),
                         "",
@@ -493,14 +528,14 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         } else {
             String dataSourceStr = "";
             try {
-                Content dataSource = associated.getDataSource();
+                Content dataSource = sourceContent.getDataSource();
                 if (dataSource != null) {
                     dataSourceStr = dataSource.getName();
                 } else {
                     dataSourceStr = getRootParentName();
                 }
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get image name from {0}", associated.getName()); //NON-NLS
+                logger.log(Level.WARNING, "Failed to get image name from {0}", sourceContent.getName()); //NON-NLS
             }
 
             if (dataSourceStr.isEmpty() == false) {
@@ -512,13 +547,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
         }
 
-        // If EXIF, add props for file size and path
+        /*
+         * If the artifact is an EXIF artifact, ad the source file size and path
+         * to the sheet.
+         */
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
-
             long size = 0;
             String path = ""; //NON-NLS
-            if (associated instanceof AbstractFile) {
-                AbstractFile af = (AbstractFile) associated;
+            if (sourceContent instanceof AbstractFile) {
+                AbstractFile af = (AbstractFile) sourceContent;
                 size = af.getSize();
                 try {
                     path = af.getUniquePath();
@@ -541,18 +578,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Get all tags from the case database relating to the artifact and the file
-     * it is associated with.
+     * Gets all of the tags applied to the artifact or its source content.
      *
-     * @return a list of tags which on the artifact or the file it is associated
-     *         with
+     * @return The list of tags.
      */
     @Override
     protected final List<Tag> getAllTagsFromDatabase() {
         List<Tag> tags = new ArrayList<>();
         try {
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
-            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(associated));
+            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
         } catch (TskCoreException | NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
         }
@@ -560,89 +595,30 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
-     * to their sheets.
+     * Gets the correlation attribute for the MD5 hash of the source file of the
+     * artifact, if the central repository is enabled and the source content is
+     * a file.
      *
-     * @param sheetSet the modifiable Sheet.Set returned by
-     *                 Sheet.get(Sheet.PROPERTIES)
-     */
-    @NbBundle.Messages({
-        "BlackboardArtifactNode.createSheet.tags.displayName=Tags"})
-    @Deprecated
-    protected void addTagProperty(Sheet.Set sheetSet) throws MissingResourceException {
-        // add properties for tags
-        List<Tag> tags = new ArrayList<>();
-        try {
-            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
-            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(associated));
-        } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
-        }
-        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
-                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
-    }
-
-    /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
-     * to their sheets.
-     *
-     * @param sheetSet the modifiable Sheet.Set returned by
-     *                 Sheet.get(Sheet.PROPERTIES)
-     * @param tags     the list of tags which should appear as the value for the
-     *                 property
-     */
-    @Deprecated
-    protected final void addTagProperty(Sheet.Set sheetSet, List<Tag> tags) {
-        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
-                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
-    }
-
-    /**
-     * Gets the correlation attribute for the associated file
-     *
-     * @return the correlation attribute for the file associated with this
-     *         BlackboardArtifactNode
+     * @return The correlation attribute instance, may be null.
      */
     @Override
     protected final CorrelationAttributeInstance getCorrelationAttributeInstance() {
         CorrelationAttributeInstance correlationAttribute = null;
-        if (CentralRepository.isEnabled() && associated instanceof AbstractFile) {
-            correlationAttribute = CorrelationAttributeUtil.getCorrAttrForFile((AbstractFile)associated);
+        if (CentralRepository.isEnabled() && sourceContent instanceof AbstractFile) {
+            correlationAttribute = CorrelationAttributeUtil.getCorrAttrForFile((AbstractFile) sourceContent);
         }
         return correlationAttribute;
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the comment
-     * property to their sheets.
+     * Computes the value of the comment property ("C" in S, C, O) for this
+     * artifact.
      *
-     * @param sheetSet  the modifiable Sheet.Set to add the property to
-     * @param tags      the list of tags associated with the file
-     * @param attribute the correlation attribute associated with this
-     *                  artifact's associated file, null if central repo is not
-     *                  enabled
+     * @param tags      The tags applied to the artifact and its source content.
+     * @param attribute The correlation attribute for the MD5 hash of the source
+     *                  file of the artifact, may be null.
      *
-     * @deprecated Use the GetSCOTask to get this data on a background
-     * thread..., and then update the property sheet asynchronously
-     */
-    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.comment.name=C",
-        "BlackboardArtifactNode.createSheet.comment.displayName=C"})
-    @Deprecated
-    protected final void addCommentProperty(Sheet.Set sheetSet, List<Tag> tags, CorrelationAttributeInstance attribute) {
-        HasCommentStatus status = getCommentProperty(tags, attribute);
-        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), NO_DESCR,
-                status));
-    }
-
-    /**
-     * Gets the comment property for the node
-     *
-     * @param tags      the list of tags associated with the file
-     * @param attribute the correlation attribute associated with this
-     *                  artifact's associated file, null if central repo is not
-     *                  enabled
-     *
-     * @return comment property
+     * @return The value of the comment property.
      */
     @Override
     protected DataResultViewerTable.HasCommentStatus getCommentProperty(List<Tag> tags, CorrelationAttributeInstance attribute) {
@@ -702,8 +678,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     protected Pair<DataResultViewerTable.Score, String> getScorePropertyAndDescription(List<Tag> tags) {
         Score score = Score.NO_SCORE;
         String description = Bundle.BlackboardArtifactNode_createSheet_noScore_description();
-        if (associated instanceof AbstractFile) {
-            if (((AbstractFile) associated).getKnown() == TskData.FileKnown.BAD) {
+        if (sourceContent instanceof AbstractFile) {
+            if (((AbstractFile) sourceContent).getKnown() == TskData.FileKnown.BAD) {
                 score = Score.NOTABLE_SCORE;
                 description = Bundle.BlackboardArtifactNode_createSheet_notableFile_description();
             }
@@ -748,30 +724,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         return Pair.of(score, description);
     }
 
-    /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the Occurrences
-     * property to their sheets.
-     *
-     * @param sheetSet  the modifiable Sheet.Set to add the property to
-     * @param attribute correlation attribute instance
-     *
-     * @deprecated Use the GetSCOTask to get this data on a background
-     * thread..., and then update the property sheet asynchronously
-     */
-    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.count.name=O",
-        "BlackboardArtifactNode.createSheet.count.displayName=O",
-        "BlackboardArtifactNode.createSheet.count.noCorrelationAttributes.description=No correlation properties found",
-        "BlackboardArtifactNode.createSheet.count.noCorrelationValues.description=Unable to find other occurrences because no value exists for the available correlation property",
-        "# {0} - occurrenceCount",
-        "# {1} - attributeType",
-        "BlackboardArtifactNode.createSheet.count.description=There were {0} datasource(s) found with occurrences of the correlation value of type {1}"})
-    @Deprecated
-    protected final void addCountProperty(Sheet.Set sheetSet, CorrelationAttributeInstance attribute) {
-        Pair<Long, String> countAndDescription = getCountPropertyAndDescription(attribute.getCorrelationType(), attribute.getCorrelationValue(), Bundle.BlackboardArtifactNode_createSheet_count_noCorrelationAttributes_description());
-        sheetSet.put(
-                new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_count_name(), Bundle.BlackboardArtifactNode_createSheet_count_displayName(), countAndDescription.getRight(), countAndDescription.getLeft()));
-    }
-
     /**
      * Gets the Occurrences property for the node.
      *
@@ -808,14 +760,14 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     private String getRootParentName() {
-        String parentName = associated.getName();
-        Content parent = associated;
+        String parentName = sourceContent.getName();
+        Content parent = sourceContent;
         try {
             while ((parent = parent.getParent()) != null) {
                 parentName = parent.getName();
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Failed to get parent name from {0}", associated.getName()); //NON-NLS
+            logger.log(Level.WARNING, "Failed to get parent name from {0}", sourceContent.getName()); //NON-NLS
             return "";
         }
         return parentName;
@@ -852,13 +804,13 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT.getTypeID()
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID()
-                        || attributeTypeID == ATTRIBUTE_TYPE.TSK_KEYWORD_SEARCH_TYPE.getTypeID() 
+                        || attributeTypeID == ATTRIBUTE_TYPE.TSK_KEYWORD_SEARCH_TYPE.getTypeID()
                         || attribute.getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.JSON) {
                     continue;
                 } else if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) {
                     addEmailMsgProperty(map, attribute);
                 } else if (attribute.getAttributeType().getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME) {
-                    map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), associated));
+                    map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), sourceContent));
                 } else if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getTypeID()
                         && attributeTypeID == ATTRIBUTE_TYPE.TSK_TEXT.getTypeID()) {
                     /*
@@ -910,7 +862,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
             map.put(attribute.getAttributeType().getDisplayName(), value);
         } else if (attribute.getAttributeType().getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME) {
-            map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), associated));
+            map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), sourceContent));
         } else {
             map.put(attribute.getAttributeType().getDisplayName(), attribute.getDisplayString());
         }
@@ -960,4 +912,89 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public <T> T accept(ContentNodeVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /**
+     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
+     * to their sheets.
+     *
+     * @param sheetSet the modifiable Sheet.Set returned by
+     *                 Sheet.get(Sheet.PROPERTIES)
+     */
+    @NbBundle.Messages({
+        "BlackboardArtifactNode.createSheet.tags.displayName=Tags"})
+    @Deprecated
+    protected void addTagProperty(Sheet.Set sheetSet) throws MissingResourceException {
+        // add properties for tags
+        List<Tag> tags = new ArrayList<>();
+        try {
+            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
+            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
+        } catch (TskCoreException | NoCurrentCaseException ex) {
+            logger.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
+        }
+        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
+                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
+    }
+
+    /**
+     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
+     * to their sheets.
+     *
+     * @param sheetSet the modifiable Sheet.Set returned by
+     *                 Sheet.get(Sheet.PROPERTIES)
+     * @param tags     the list of tags which should appear as the value for the
+     *                 property
+     */
+    @Deprecated
+    protected final void addTagProperty(Sheet.Set sheetSet, List<Tag> tags) {
+        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
+                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
+    }
+
+    /**
+     * Used by (subclasses of) BlackboardArtifactNode to add the Occurrences
+     * property to their sheets.
+     *
+     * @param sheetSet  the modifiable Sheet.Set to add the property to
+     * @param attribute correlation attribute instance
+     *
+     * @deprecated Use the GetSCOTask to get this data on a background
+     * thread..., and then update the property sheet asynchronously
+     */
+    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.count.name=O",
+        "BlackboardArtifactNode.createSheet.count.displayName=O",
+        "BlackboardArtifactNode.createSheet.count.noCorrelationAttributes.description=No correlation properties found",
+        "BlackboardArtifactNode.createSheet.count.noCorrelationValues.description=Unable to find other occurrences because no value exists for the available correlation property",
+        "# {0} - occurrenceCount",
+        "# {1} - attributeType",
+        "BlackboardArtifactNode.createSheet.count.description=There were {0} datasource(s) found with occurrences of the correlation value of type {1}"})
+    @Deprecated
+    protected final void addCountProperty(Sheet.Set sheetSet, CorrelationAttributeInstance attribute) {
+        Pair<Long, String> countAndDescription = getCountPropertyAndDescription(attribute.getCorrelationType(), attribute.getCorrelationValue(), Bundle.BlackboardArtifactNode_createSheet_count_noCorrelationAttributes_description());
+        sheetSet.put(
+                new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_count_name(), Bundle.BlackboardArtifactNode_createSheet_count_displayName(), countAndDescription.getRight(), countAndDescription.getLeft()));
+    }
+
+    /**
+     * Used by (subclasses of) BlackboardArtifactNode to add the comment
+     * property to their sheets.
+     *
+     * @param sheetSet  the modifiable Sheet.Set to add the property to
+     * @param tags      the list of tags associated with the file
+     * @param attribute the correlation attribute associated with this
+     *                  artifact's associated file, null if central repo is not
+     *                  enabled
+     *
+     * @deprecated Use the GetSCOTask to get this data on a background
+     * thread..., and then update the property sheet asynchronously
+     */
+    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.comment.name=C",
+        "BlackboardArtifactNode.createSheet.comment.displayName=C"})
+    @Deprecated
+    protected final void addCommentProperty(Sheet.Set sheetSet, List<Tag> tags, CorrelationAttributeInstance attribute) {
+        HasCommentStatus status = getCommentProperty(tags, attribute);
+        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), NO_DESCR,
+                status));
+    }
+
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
index 9ac85bd1e7..8289f947da 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
@@ -78,9 +78,6 @@ BlackboardArtifactNode.createSheet.taggedItem.description=Result or associated f
 BlackboardArtifactNode.createSheet.tags.displayName=Tags
 # {0} - artifactDisplayName
 BlackboardArtifactNode.displayName.artifact={0} Artifact
-BlackboardArtifactNode.getAction.errorTitle=Error getting actions
-BlackboardArtifactNode.getAction.linkedFileMessage=There was a problem getting actions for the selected result.  The 'View File in Timeline' action will not be available.
-BlackboardArtifactNode.getAction.resultErrorMessage=There was a problem getting actions for the selected result.  The 'View Result in Timeline' action will not be available.
 BlackboardArtifactTagNode.createSheet.userName.text=User Name
 BlackboardArtifactTagNode.viewSourceArtifact.text=View Source Result
 Category.five=CAT-5: Non-pertinent

From 2977b986010539d10721f64a1c9d909cf2ea9dd7 Mon Sep 17 00:00:00 2001
From: Raman Arora <raman@basistech.com>
Date: Fri, 13 Mar 2020 13:49:33 -0400
Subject: [PATCH 2/8] Fix for changes to the CentralRepoPlatform class.

---
 .../datamodel/CentralRepoDbUpgrader13To14.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbUpgrader13To14.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbUpgrader13To14.java
index f4ddbca089..9d6473055e 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbUpgrader13To14.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbUpgrader13To14.java
@@ -39,7 +39,7 @@ public class CentralRepoDbUpgrader13To14 implements CentralRepoDbUpgrader {
 
             try (Statement statement = connection.createStatement();) {
 
-                CentralRepoPlatforms selectedPlatform = CentralRepoPlatforms.getSelectedPlatform();
+                CentralRepoPlatforms selectedPlatform = CentralRepoDbManager.getSavedDbChoice().getDbPlatform();
 
                 // Create account_types and accounts tables which are referred by X_instances tables
                 statement.execute(RdbmsCentralRepoFactory.getCreateAccountTypesTableStatement(selectedPlatform));

From 1fc3bd524a4e6b8bc092160c521210d2ac4f4212 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 13 Mar 2020 15:35:55 -0400
Subject: [PATCH 3/8] 6132 prevent NPE in video content viewers when video is
 unplayable

---
 .../contentviewers/MediaPlayerPanel.java      | 219 ++++++++++--------
 1 file changed, 118 insertions(+), 101 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
index c518abdd45..53cf9e8bf4 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
@@ -241,7 +241,7 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
         progressSlider.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                if (progressSlider.getValueIsAdjusting()) {
+                if (progressSlider.getValueIsAdjusting() && gstPlayBin != null) {
                     long duration = gstPlayBin.queryDuration(TimeUnit.NANOSECONDS);
                     double relativePosition = progressSlider.getValue() * 1.0 / PROGRESS_SLIDER_SIZE;
                     long newStartTime = (long) (relativePosition * duration);
@@ -264,20 +264,23 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
         //Manage the video while the user is performing actions on the track.
         progressSlider.addMouseListener(new MouseListener() {
             private State previousState = State.NULL;
-            
+
             @Override
             public void mousePressed(MouseEvent e) {
-                previousState = gstPlayBin.getState();
-                gstPlayBin.pause();
+                if (gstPlayBin != null) {
+                    previousState = gstPlayBin.getState();
+                    gstPlayBin.pause();
+                }
             }
 
             @Override
             public void mouseReleased(MouseEvent e) {
-                if(previousState.equals(State.PLAYING)) {
+                if (previousState.equals(State.PLAYING) && gstPlayBin != null) {
                     gstPlayBin.play();
                 }
                 previousState = State.NULL;
             }
+
             @Override
             public void mouseClicked(MouseEvent e) {
             }
@@ -289,11 +292,11 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
             @Override
             public void mouseExited(MouseEvent e) {
             }
-            
+
         });
         //Manage the audio level when the user is adjusting the volume slider
         audioSlider.addChangeListener((ChangeEvent event) -> {
-            if (audioSlider.getValueIsAdjusting()) {
+            if (audioSlider.getValueIsAdjusting() && gstPlayBin != null) {
                 double audioPercent = (audioSlider.getValue() * 2.0) / 100.0;
                 gstPlayBin.setVolume(audioPercent);
             }
@@ -327,11 +330,13 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
         endOfStreamListener = new Bus.EOS() {
             @Override
             public void endOfStream(GstObject go) {
-                gstPlayBin.seek(ClockTime.ZERO);
-                /**
-                 * Keep the video from automatically playing
-                 */
-                Gst.getExecutor().submit(() -> gstPlayBin.pause());
+                if (gstPlayBin != null) {
+                    gstPlayBin.seek(ClockTime.ZERO);
+                    /**
+                     * Keep the video from automatically playing
+                     */
+                    Gst.getExecutor().submit(() -> gstPlayBin.pause());
+                }
             }
         };
     }
@@ -556,10 +561,12 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
                 //Video is ready for playback. Create new components
                 gstPlayBin = new PlayBin("VideoPlayer", tempFile.toURI());
                 //Configure event handling
-                Bus playBinBus = gstPlayBin.getBus();
-                playBinBus.connect(endOfStreamListener);
-                playBinBus.connect(stateChangeListener);
-                playBinBus.connect(errorListener);
+                if (gstPlayBin != null) {
+                    Bus playBinBus = gstPlayBin.getBus();
+                    playBinBus.connect(endOfStreamListener);
+                    playBinBus.connect(stateChangeListener);
+                    playBinBus.connect(errorListener);
+                }
 
                 if (this.isCancelled()) {
                     return;
@@ -570,15 +577,16 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
                 videoPanel.setLayout(new BoxLayout(videoPanel, BoxLayout.Y_AXIS));
                 videoPanel.add(fxPanel);
                 fxAppSink = new JavaFxAppSink("JavaFxAppSink", fxPanel);
-                gstPlayBin.setVideoSink(fxAppSink);
-
+                if (gstPlayBin != null) {
+                    gstPlayBin.setVideoSink(fxAppSink);
+                }
                 if (this.isCancelled()) {
                     return;
                 }
-
-                gstPlayBin.setVolume((audioSlider.getValue() * 2.0) / 100.0);
-                gstPlayBin.pause();
-
+                if (gstPlayBin != null) {
+                    gstPlayBin.setVolume((audioSlider.getValue() * 2.0) / 100.0);
+                    gstPlayBin.pause();
+                }
                 timer.start();
                 enableComponents(true);
             } catch (CancellationException ex) {
@@ -598,7 +606,7 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (!progressSlider.getValueIsAdjusting()) {
+            if (!progressSlider.getValueIsAdjusting() && gstPlayBin != null) {
                 sliderLock.acquireUninterruptibly();
                 long position = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
                 long duration = gstPlayBin.queryDuration(TimeUnit.NANOSECONDS);
@@ -635,13 +643,13 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
          * thumb at the given width and height. It also paints the track blue as
          * the thumb progresses.
          *
-         * @param slider JSlider component
+         * @param slider         JSlider component
          * @param thumbDimension
          */
         public CircularJSliderUI(JSlider slider, Dimension thumbDimension) {
             super(slider);
             this.thumbDimension = thumbDimension;
-            
+
             //Configure track and thumb colors.
             Color lightBlue = new Color(0, 130, 255);
             thumbColor = lightBlue;
@@ -655,8 +663,8 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
         }
 
         /**
-         * Modifies the View to be an oval rather than the underlying 
-         * rectangle Controller.
+         * Modifies the View to be an oval rather than the underlying rectangle
+         * Controller.
          */
         @Override
         public void paintThumb(Graphics graphic) {
@@ -705,12 +713,13 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
         @Override
         protected TrackListener createTrackListener(JSlider slider) {
             /**
-            * This track listener will force the thumb to be snapped to the mouse
-            * location. This makes grabbing and dragging the JSlider much easier.
-            * Using the default track listener, the user would have to click
-            * exactly on the slider thumb to drag it. Now the thumb positions
-            * itself under the mouse so that it can always be dragged.
-            */
+             * This track listener will force the thumb to be snapped to the
+             * mouse location. This makes grabbing and dragging the JSlider much
+             * easier. Using the default track listener, the user would have to
+             * click exactly on the slider thumb to drag it. Now the thumb
+             * positions itself under the mouse so that it can always be
+             * dragged.
+             */
             return new TrackListener() {
                 @Override
                 public void mousePressed(MouseEvent e) {
@@ -982,87 +991,95 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
     }// </editor-fold>//GEN-END:initComponents
 
     private void rewindButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rewindButtonActionPerformed
-        long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
-        //Skip 30 seconds.
-        long rewindDelta = TimeUnit.NANOSECONDS.convert(SKIP_IN_SECONDS, TimeUnit.SECONDS);
-        //Ensure new video position is within bounds
-        long newTime = Math.max(currentTime - rewindDelta, 0);
-        double playBackRate = getPlayBackRate();
-        gstPlayBin.seek(playBackRate,
-                Format.TIME,
-                //FLUSH - flushes the pipeline
-                //ACCURATE - video will seek exactly to the position requested
-                EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
-                //Set the start position to newTime
-                SeekType.SET, newTime,
-                //Do nothing for the end position
-                SeekType.NONE, -1);
-    }//GEN-LAST:event_rewindButtonActionPerformed
-
-    private void fastForwardButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fastForwardButtonActionPerformed
-        long duration = gstPlayBin.queryDuration(TimeUnit.NANOSECONDS);
-        long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
-        //Skip 30 seconds.
-        long fastForwardDelta = TimeUnit.NANOSECONDS.convert(SKIP_IN_SECONDS, TimeUnit.SECONDS);
-        //Don't allow skipping within 2 seconds of video ending. Skipping right to
-        //the end causes undefined behavior for some gstreamer plugins.
-        long twoSecondsInNano = TimeUnit.NANOSECONDS.convert(2, TimeUnit.SECONDS);
-        if((duration - currentTime) <= twoSecondsInNano) {
-            return;
-        }
-        
-        long newTime;
-        if (currentTime + fastForwardDelta >= duration) {
-            //If there are less than 30 seconds left, only fast forward to the midpoint.
-            newTime = currentTime + (duration - currentTime)/2;
-        } else {
-            newTime = currentTime + fastForwardDelta;
-        }
-
-        double playBackRate = getPlayBackRate();
-        gstPlayBin.seek(playBackRate,
-                Format.TIME,
-                //FLUSH - flushes the pipeline
-                //ACCURATE - video will seek exactly to the position requested
-                EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
-                //Set the start position to newTime
-                SeekType.SET, newTime,
-                //Do nothing for the end position
-                SeekType.NONE, -1);
-    }//GEN-LAST:event_fastForwardButtonActionPerformed
-
-    private void playButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_playButtonActionPerformed
-        if (gstPlayBin.isPlaying()) {
-            gstPlayBin.pause();
-        } else {
-            double playBackRate = getPlayBackRate();
+        if (gstPlayBin != null) {
             long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
-            //Set playback rate before play.
+            //Skip 30 seconds.
+            long rewindDelta = TimeUnit.NANOSECONDS.convert(SKIP_IN_SECONDS, TimeUnit.SECONDS);
+            //Ensure new video position is within bounds
+            long newTime = Math.max(currentTime - rewindDelta, 0);
+            double playBackRate = getPlayBackRate();
             gstPlayBin.seek(playBackRate,
                     Format.TIME,
                     //FLUSH - flushes the pipeline
                     //ACCURATE - video will seek exactly to the position requested
                     EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
                     //Set the start position to newTime
-                    SeekType.SET, currentTime,
+                    SeekType.SET, newTime,
                     //Do nothing for the end position
                     SeekType.NONE, -1);
-            gstPlayBin.play();
+        }
+    }//GEN-LAST:event_rewindButtonActionPerformed
+
+    private void fastForwardButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fastForwardButtonActionPerformed
+        if (gstPlayBin != null) {
+            long duration = gstPlayBin.queryDuration(TimeUnit.NANOSECONDS);
+            long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
+            //Skip 30 seconds.
+            long fastForwardDelta = TimeUnit.NANOSECONDS.convert(SKIP_IN_SECONDS, TimeUnit.SECONDS);
+            //Don't allow skipping within 2 seconds of video ending. Skipping right to
+            //the end causes undefined behavior for some gstreamer plugins.
+            long twoSecondsInNano = TimeUnit.NANOSECONDS.convert(2, TimeUnit.SECONDS);
+            if ((duration - currentTime) <= twoSecondsInNano) {
+                return;
+            }
+
+            long newTime;
+            if (currentTime + fastForwardDelta >= duration) {
+                //If there are less than 30 seconds left, only fast forward to the midpoint.
+                newTime = currentTime + (duration - currentTime) / 2;
+            } else {
+                newTime = currentTime + fastForwardDelta;
+            }
+
+            double playBackRate = getPlayBackRate();
+            gstPlayBin.seek(playBackRate,
+                    Format.TIME,
+                    //FLUSH - flushes the pipeline
+                    //ACCURATE - video will seek exactly to the position requested
+                    EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
+                    //Set the start position to newTime
+                    SeekType.SET, newTime,
+                    //Do nothing for the end position
+                    SeekType.NONE, -1);
+        }
+    }//GEN-LAST:event_fastForwardButtonActionPerformed
+
+    private void playButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_playButtonActionPerformed
+        if (gstPlayBin != null) {
+            if (gstPlayBin.isPlaying()) {
+                gstPlayBin.pause();
+            } else {
+                double playBackRate = getPlayBackRate();
+                long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
+                //Set playback rate before play.
+                gstPlayBin.seek(playBackRate,
+                        Format.TIME,
+                        //FLUSH - flushes the pipeline
+                        //ACCURATE - video will seek exactly to the position requested
+                        EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
+                        //Set the start position to newTime
+                        SeekType.SET, currentTime,
+                        //Do nothing for the end position
+                        SeekType.NONE, -1);
+                gstPlayBin.play();
+            }
         }
     }//GEN-LAST:event_playButtonActionPerformed
 
     private void playBackSpeedComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_playBackSpeedComboBoxActionPerformed
-        double playBackRate = getPlayBackRate();
-        long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
-        gstPlayBin.seek(playBackRate,
-                Format.TIME,
-                //FLUSH - flushes the pipeline
-                //ACCURATE - video will seek exactly to the position requested
-                EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
-                //Set the position to the currentTime, we are only adjusting the
-                //playback rate.
-                SeekType.SET, currentTime,
-                SeekType.NONE, 0);
+        if (gstPlayBin != null) {
+            double playBackRate = getPlayBackRate();
+            long currentTime = gstPlayBin.queryPosition(TimeUnit.NANOSECONDS);
+            gstPlayBin.seek(playBackRate,
+                    Format.TIME,
+                    //FLUSH - flushes the pipeline
+                    //ACCURATE - video will seek exactly to the position requested
+                    EnumSet.of(SeekFlags.FLUSH, SeekFlags.ACCURATE),
+                    //Set the position to the currentTime, we are only adjusting the
+                    //playback rate.
+                    SeekType.SET, currentTime,
+                    SeekType.NONE, 0);
+        }
     }//GEN-LAST:event_playBackSpeedComboBoxActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

From 87cc28942665aebf5a87e115f3e96a788ea12f21 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 13 Mar 2020 21:28:48 -0400
Subject: [PATCH 4/8] Tidy up BlackboardArtifactNode.java

---
 .../datamodel/BlackboardArtifactNode.java     | 477 ++++++++++--------
 1 file changed, 277 insertions(+), 200 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 1126cb1c80..0b4d09a7b1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -78,23 +78,27 @@ import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 
 /**
- * An AbstractNode implementation representing an artifact of any type.
+ * A BlackboardArtifactNode is an AbstractNode implementation that can be used
+ * to represent an artifact of any type.
  */
 public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifact> {
 
     private static final Logger logger = Logger.getLogger(BlackboardArtifactNode.class.getName());
 
     /*
-     * This cache is used to avoid repeated trips to the case database for
-     * Content objects that are the source of multiple artifacts.
+     * Cache of Content objects used to avoid repeated trips to the case
+     * database to retrieve Content objects that are the source of multiple
+     * artifacts.
      */
     private static final Cache<Long, Content> contentCache = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build();
 
     /*
      * Case application events that affect the property sheets of
-     * BlackboardArtifactNodes, with one exception, CURRENT_CASE (closed) events
-     * which triggers content cache invalidation and unregistering of the node's
-     * ProeprtyChangeListener.
+     * BlackboardArtifactNodes.
+     *
+     * NOTE: CURRENT_CASE (closed) events trigger content cache invalidation and
+     * unregistering of the PropertyChangeListener subscribed to the application
+     * events.
      */
     private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(
             Case.Events.BLACKBOARD_ARTIFACT_TAG_ADDED,
@@ -105,8 +109,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             Case.Events.CR_COMMENT_CHANGED);
 
     /*
-     * Artifact types which should display the full unique path of the source
-     * content in their property sheets.
+     * Artifact types for which the unique path of the artifact's source content
+     * should be displayed in the node's property sheet.
      */
     private static final Integer[] SHOW_UNIQUE_PATH = new Integer[]{
         BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID(),
@@ -116,8 +120,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     };
 
     /*
-     * Artifact types which should display the file metadata of the source
-     * content, in these cases always a file, in their property sheets.
+     * Artifact types for which the file metadata of the artifact's source
+     * content (a file) should be displayed in the node's property sheet.
      */
     private static final Integer[] SHOW_FILE_METADATA = new Integer[]{
         BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
@@ -127,6 +131,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     private Content sourceContent;
     private List<NodeProperty<? extends Object>> customProperties;
 
+    /*
+     * The node's application event listener.
+     */
     private final PropertyChangeListener appEventListener = new PropertyChangeListener() {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
@@ -180,19 +187,20 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     };
 
     /*
-     * Wrap the app event PropertyChangeListener in a weak reference that will
-     * be passed to all event publishers. This allows the NetBeans
-     * infrastructure to delete the node when the user navigates to another part
-     * of the tree. Previously, nodes were not being deleted because the event
-     * publisher was holding a strong reference to the listener. We need to hold
-     * onto the weak reference here to support unregistering of the listener in
-     * unregisterListener() method below.
+     * The node's application event listener is wrapped in a weak reference that
+     * allows the node to be garbage collected when the NetBeans infrastructure
+     * discards it because the user has navigated to another part of the tree.
+     * If this is not done, the strong reference to the listener held by the the
+     * event publisher prevents garbage collection of this node.
+     *
+     * RC: Isn't there some node lifecycle property change event that could be
+     * used to unregister the listener?
      */
     private final PropertyChangeListener weakAppEventListener = WeakListeners.propertyChange(appEventListener, null);
 
     /**
-     * Constructs a BlackboardArtifactNode, an AbstractNode implementation
-     * representing an artifact of any type.
+     * Constructs a BlackboardArtifactNode, an AbstractNode implementation that
+     * can be used to represent an artifact of any type.
      *
      * @param artifact The artifact to represent.
      * @param iconPath The path to the icon for the artifact type.
@@ -200,6 +208,13 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact));
         this.artifact = artifact;
+        /*
+         * RC: NPE ALERT!! The createLookup method can return a Lookup without
+         * the source content in it, so this loop has the potential to leave
+         * this.sourceContent null, causing NPEs within this class and in the UI
+         * component clients of this class. This constructor should throw
+         * instead. However, that would be an exported public API change.
+         */
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
                 sourceContent = lookupContent;
@@ -215,15 +230,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 break;
             }
         }
-        this.setName(Long.toString(artifact.getArtifactID()));
-        this.setDisplayName();
-        this.setIconBaseWithExtension(iconPath);
+        setName(Long.toString(artifact.getArtifactID()));
+        setDisplayName();
+        setIconBaseWithExtension(iconPath);
         Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakAppEventListener);
     }
 
     /**
-     * Constructs a BlackboardArtifactNode, an AbstractNode implementation
-     * representing an artifact of any type.
+     * Constructs a BlackboardArtifactNode, an AbstractNode implementation that
+     * can be used to represent an artifact of any type.
      *
      * @param artifact The artifact to represent.
      */
@@ -232,8 +247,41 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Unregisters the application event listener when the node is garbage
-     * collected, if the finalizer is called.
+     * Creates a Lookup object for this node and populates it with the artifact
+     * this node represents and its source content.
+     *
+     * @param artifact The artifact this node represents.
+     *
+     * @return The Lookup.
+     */
+    private static Lookup createLookup(BlackboardArtifact artifact) {
+        final long objectID = artifact.getObjectID();
+        try {
+            Content content = contentCache.get(objectID, () -> artifact.getSleuthkitCase().getContentById(objectID));
+            if (content == null) {
+                return Lookups.fixed(artifact);
+            } else {
+                return Lookups.fixed(artifact, content);
+            }
+        } catch (ExecutionException ex) {
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting source content (artifact objID={0}, content objID={1})", artifact.getId(), objectID), ex); //NON-NLS
+            /*
+             * RC: NPE ALERT!! The decision to return a Lookup without the
+             * source content in it has the potential to cause NPEs within this
+             * class and in the UI component clients of this class. The node
+             * constructor should throw. However, that would be an exported
+             * public API change.
+             */
+            return Lookups.fixed(artifact);
+        }
+    }
+
+    /**
+     * Unregisters the application event listener when this node is garbage
+     * collected, if this finalizer is called.
+     *
+     * RC: Isn't there some node lifecycle property change event that could be
+     * used to unregister the listener?
      *
      * @throws Throwable
      */
@@ -244,7 +292,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Unregisters the application event listener.
+     * Unregisters this node's application event listener.
      */
     private void unregisterListener() {
         Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakAppEventListener);
@@ -265,8 +313,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         actionsList.addAll(Arrays.asList(super.getActions(context)));
 
         /*
-         * If this artifact has a timestamp, add an action to view it in the
-         * timeline.
+         * If the artifact represented by this node has a timestamp, add an
+         * action to view it in the timeline.
          */
         try {
             if (ViewArtifactInTimelineAction.hasSupportedTimeStamp(artifact)) {
@@ -277,8 +325,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * If the artifact is linked to a file via a TSK_PATH_ID attribute add
-         * an action to view the file in the timeline.
+         * If the artifact represented by this node is linked to a file via a
+         * TSK_PATH_ID attribute, add an action to view the file in the
+         * timeline.
          */
         try {
             AbstractFile linkedFile = findLinked(artifact);
@@ -290,8 +339,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * If the source content of the artifact is a file, add an action to
-         * view the file in the data source tree.
+         * If the source content of the artifact represented by this node is a
+         * file, add an action to view the file in the data source tree.
          */
         AbstractFile file = getLookup().lookup(AbstractFile.class);
         if (null != file) {
@@ -302,9 +351,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Set the filter node display name. The value will either be the file name
-     * or something along the lines of e.g. "Messages Artifact" for keyword hits
-     * on artifacts.
+     * Sets the display name for this node.
+     *
+     * RC: I am not sure that the naming algorithm in this complicated and
+     * potentially fairly costly method has any value whatsoever. This should be
+     * investigated. In the mean time, I am preserving all of the comments I
+     * found here including: "Set the filter node display name. The value will
+     * either be the file name or something along the lines of e.g. "Messages
+     * Artifact" for keyword hits on artifacts." Note that this method swallows
+     * exceptions without logging them and also has a local variable that hides
+     * a superclass field with inappropriate package private access.
      */
     @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
     private void setDisplayName() {
@@ -336,7 +392,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
 
         if (displayName.isEmpty() && artifact != null) {
             try {
-                Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(this.artifact.getObjectID());
+                Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(artifact.getObjectID());
                 displayName = (content == null) ? artifact.getName() : content.getName();
             } catch (TskCoreException | NoCurrentCaseException ex) {
                 displayName = artifact.getName();
@@ -344,11 +400,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         this.setDisplayName(displayName);
-
     }
 
     /**
-     * Gets the name of this artifact's source content.
+     * Gets the name of the source content of the artifact represented by this
+     * node.
      *
      * @return The source content name.
      */
@@ -371,7 +427,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     @Override
     protected Sheet createSheet() {
         /*
-         * Create an empty sheet.
+         * Create an empty property sheet.
          */
         Sheet sheet = super.createSheet();
         Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
@@ -381,7 +437,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * Add the name of the artifact's source content to the sheet.
+         * Add the name of the source content of the artifact represented by
+         * this node to the sheet.
          */
         sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.name"),
                 NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.displayName"),
@@ -390,8 +447,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
 
         if (!UserPreferences.getHideSCOColumns()) {
             /*
-             * Add the S, C, and O columns to the sheet and start a background
-             * task to compute the S, C, O values of the artifact.
+             * Add S(core), C(omments), and O(ther occurences) columns to the
+             * sheet and start a background task to compute the value of these
+             * properties for the artifact represented by this node. The task
+             * will fire a PropertyChangeEvent when the computation is completed
+             * and this node's PropertyChangeListener will update the sheet.
              */
             sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_score_name(), Bundle.BlackboardArtifactNode_createSheet_score_displayName(), VALUE_LOADING, ""));
             sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), VALUE_LOADING, ""));
@@ -402,8 +462,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * If the artifact is an interesting artifact hit, add the type and
-         * description of the interesting artifact to the sheet.
+         * If the artifact represented by this node is an interesting artifact
+         * hit, add the type and description of the interesting artifact to the
+         * sheet.
          */
         if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
             try {
@@ -425,7 +486,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * Add the artifact's attributes to the sheet.
+         * Add the attributes of the artifact represented by this node to the
+         * sheet.
          */
         Map<String, Object> map = new LinkedHashMap<>();
         fillPropertyMap(map, artifact);
@@ -437,7 +499,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * Add any "custom properties" for the artifact to the sheet.
+         * Add any "custom properties" for the node to the sheet.
          */
         if (customProperties != null) {
             for (NodeProperty<? extends Object> np : customProperties) {
@@ -445,10 +507,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
         }
 
-
         /*
-         * If the artifact is a file extension mismatch artifact, add the
-         * extension and type of the file to the sheet.
+         * If the artifact represented by this node is a file extension mismatch
+         * artifact, add the extension and type of the artifact's source file to
+         * the sheet.
          */
         final int artifactTypeId = artifact.getArtifactTypeID();
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) {
@@ -474,15 +536,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * If the artifact's type dictates the addition of the source content's
-         * unique path, add it to the sheet.
+         * If the type of the artifact represented by this node dictates the
+         * addition of the source content's unique path, add it to the sheet.
          */
         if (Arrays.asList(SHOW_UNIQUE_PATH).contains(artifactTypeId)) {
             String sourcePath = ""; //NON-NLS
             try {
                 sourcePath = sourceContent.getUniquePath();
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get unique path from: {0}", sourceContent.getName()); //NON-NLS
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting unique path of source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
             }
 
             if (sourcePath.isEmpty() == false) {
@@ -494,9 +556,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
 
             /*
-             * If the artifact's type dictates the addition of the source
-             * content's file metadata, add it to the sheet. Otherwise, add the
-             * data source to the sheet.
+             * If the type of the artifact represented by this node dictates the
+             * addition of the source content's file metadata, add it to the
+             * sheet. Otherwise, add the data source to the sheet.
              */
             if (Arrays.asList(SHOW_FILE_METADATA).contains(artifactTypeId)) {
                 AbstractFile file = sourceContent instanceof AbstractFile ? (AbstractFile) sourceContent : null;
@@ -532,10 +594,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 if (dataSource != null) {
                     dataSourceStr = dataSource.getName();
                 } else {
-                    dataSourceStr = getRootParentName();
+                    dataSourceStr = getRootAncestorName();
                 }
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get image name from {0}", sourceContent.getName()); //NON-NLS
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting source data soiurce name (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
             }
 
             if (dataSourceStr.isEmpty() == false) {
@@ -548,8 +610,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
 
         /*
-         * If the artifact is an EXIF artifact, ad the source file size and path
-         * to the sheet.
+         * If the artifact represented by this node is an EXIF artifact, add the
+         * source file size and path to the sheet.
          */
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
             long size = 0;
@@ -578,9 +640,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Gets all of the tags applied to the artifact or its source content.
+     * Gets all of the tags applied to the artifact represented by this node and
+     * its source content.
      *
-     * @return The list of tags.
+     * @return The tags.
      */
     @Override
     protected final List<Tag> getAllTagsFromDatabase() {
@@ -589,15 +652,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
         } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and its source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
         }
         return tags;
     }
 
     /**
      * Gets the correlation attribute for the MD5 hash of the source file of the
-     * artifact, if the central repository is enabled and the source content is
-     * a file.
+     * artifact represented by this node. The correlation attribute instance can
+     * only be returned if the central repository is enabled and the source
+     * content is a file.
      *
      * @return The correlation attribute instance, may be null.
      */
@@ -611,8 +675,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Computes the value of the comment property ("C" in S, C, O) for this
-     * artifact.
+     * Computes the value of the comment property ("C" in S, C, O) for the
+     * artifact represented by this node. An icon is displayed if a commented
+     * tag has been applied to the artifact or its source content, or if there
+     * is a comment on the MD5 hash of the source file in the central
+     * repository.
      *
      * @param tags      The tags applied to the artifact and its source content.
      * @param attribute The correlation attribute for the MD5 hash of the source
@@ -626,14 +693,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         HasCommentStatus status = tags.size() > 0 ? HasCommentStatus.TAG_NO_COMMENT : HasCommentStatus.NO_COMMENT;
         for (Tag tag : tags) {
             if (!StringUtils.isBlank(tag.getComment())) {
-                //if the tag is null or empty or contains just white space it will indicate there is not a comment
                 status = HasCommentStatus.TAG_COMMENT;
                 break;
             }
         }
-        //currently checks for a comment on the associated file in the central repo not the artifact itself 
-        //what we want the column property to reflect should be revisted when we have added a way to comment
-        //on the artifact itself
+
         if (attribute != null && !StringUtils.isBlank(attribute.getComment())) {
             if (status == HasCommentStatus.TAG_COMMENT) {
                 status = HasCommentStatus.CR_AND_TAG_COMMENTS;
@@ -641,38 +705,25 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 status = HasCommentStatus.CR_COMMENT;
             }
         }
+
         return status;
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the Score property
-     * to their sheets.
+     * Computes the value of the score property ("S" in S, C, O) for the
+     * artifact represented by this node. The score property indicates whether
+     * the artifact or its source content is interesting or notable. A red icon
+     * will be displayed if the hash of the source file has been found in a
+     * notable hash set or if either the artifact or its source content has been
+     * tagged with a notable tag. A yellow icon will be displayed if the source
+     * file belongs to an interesting file set or either the artifact or its
+     * source content has been tagged with a non-notable tag.
      *
-     * @param sheetSet the modifiable Sheet.Set to add the property to
-     * @param tags     the list of tags associated with the file
+     * @param tags The tags that have been applied to the artifact and its
+     *             source content.
      *
-     * @deprecated Use the GetSCOTask to get this data on a background
-     * thread..., and then update the property sheet asynchronously
-     */
-    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.score.name=S",
-        "BlackboardArtifactNode.createSheet.score.displayName=S",
-        "BlackboardArtifactNode.createSheet.notableFile.description=Associated file recognized as notable.",
-        "BlackboardArtifactNode.createSheet.interestingResult.description=Result has an interesting result associated with it.",
-        "BlackboardArtifactNode.createSheet.taggedItem.description=Result or associated file has been tagged.",
-        "BlackboardArtifactNode.createSheet.notableTaggedItem.description=Result or associated file tagged with notable tag.",
-        "BlackboardArtifactNode.createSheet.noScore.description=No score"})
-    @Deprecated
-    protected final void addScorePropertyAndDescription(Sheet.Set sheetSet, List<Tag> tags) {
-        Pair<DataResultViewerTable.Score, String> scoreAndDescription = getScorePropertyAndDescription(tags);
-        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_score_name(), Bundle.BlackboardArtifactNode_createSheet_score_displayName(), scoreAndDescription.getRight(), scoreAndDescription.getLeft()));
-    }
-
-    /**
-     * Get the score property for the node.
-     *
-     * @param tags the list of tags associated with the file
-     *
-     * @return score property and description
+     * @return The value of the score property as an enum element and a
+     *         description string for dislpay in a tool tip.
      */
     @Override
     protected Pair<DataResultViewerTable.Score, String> getScorePropertyAndDescription(List<Tag> tags) {
@@ -697,8 +748,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     }
                 }
             } catch (TskCoreException ex) {
-                //unable to get the attribute so we can not update the status based on the attribute
-                logger.log(Level.WARNING, "Unable to get TSK_SET_NAME attribute for artifact of type TSK_HASHSET_HIT with artifact ID " + content.getArtifactID(), ex);
+                //unable to get the attribute so we can not update the status based on the attribute                
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_SET_NAME attribute (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
             }
         }
         try {
@@ -707,7 +758,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 description = Bundle.BlackboardArtifactNode_createSheet_interestingResult_description();
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error getting artifacts for artifact: " + content.getName(), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_INTERESTING_ARTIFACT_HIT artifacts (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
         }
         if (tags.size() > 0 && (score == Score.NO_SCORE || score == Score.INTERESTING_SCORE)) {
             score = Score.INTERESTING_SCORE;
@@ -725,41 +776,57 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Gets the Occurrences property for the node.
+     * Computes the value of the other occurrences property ("O" in S, C, O) for
+     * the artifact represented by this node. The value of the other occurrences
+     * property is the number of other data sources this artifact appears in
+     * according to a correlation attribute instance lookup in the central
+     * repository, plus one for the data source for this instance of the
+     * artifact.
      *
-     * @param attributeType      the type of the attribute to count
-     * @param attributeValue     the value of the attribute to count
-     * @param defaultDescription a description to use when none is determined by
-     *                           the getCountPropertyAndDescription method
+     * @param corrAttrType       The correlation attribute instance type to use
+     *                           for the central repsoitory lookup.
+     * @param attributeValue     The correlation attribute instane value to use
+     *                           for the central repsoitory lookup.
+     * @param defaultDescription A default description.
      *
-     * @return count and description
+     * @return The value of the occurrences property as a data sources count and
+     *         a description string.
      *
      */
     @Override
-    protected Pair<Long, String> getCountPropertyAndDescription(Type attributeType, String attributeValue, String defaultDescription) {
+    protected Pair<Long, String> getCountPropertyAndDescription(Type corrAttrType, String attributeValue, String defaultDescription) {
         Long count = -1L;
         String description = defaultDescription;
         try {
             //don't perform the query if there is no correlation value
-            if (attributeType != null && StringUtils.isNotBlank(attributeValue)) {
-                count = CentralRepository.getInstance().getCountUniqueCaseDataSourceTuplesHavingTypeValue(attributeType, attributeValue);
-                description = Bundle.BlackboardArtifactNode_createSheet_count_description(count, attributeType.getDisplayName());
-            } else if (attributeType != null) {
+            if (corrAttrType != null && StringUtils.isNotBlank(attributeValue)) {
+                count = CentralRepository.getInstance().getCountUniqueCaseDataSourceTuplesHavingTypeValue(corrAttrType, attributeValue);
+                description = Bundle.BlackboardArtifactNode_createSheet_count_description(count, corrAttrType.getDisplayName());
+            } else if (corrAttrType != null) {
                 description = Bundle.BlackboardArtifactNode_createSheet_count_noCorrelationValues_description();
             }
         } catch (CentralRepoException ex) {
-            logger.log(Level.WARNING, "Error getting count of datasources with correlation attribute", ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error querying central repository for other occurences count (artifact objID={0}, content objID={1}, corrAttrType={2}, corrAttrValue={3})", artifact.getId(), sourceContent.getId(), corrAttrType, attributeValue), ex);
         } catch (CorrelationAttributeNormalizationException ex) {
-            logger.log(Level.WARNING, "Unable to normalize data to get count of datasources with correlation attribute", ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error normalizing correlation attribute for central repository query (artifact objID={0}, content objID={1}, corrAttrType={2}, corrAttrValue={3})", artifact.getId(), sourceContent.getId(), corrAttrType, attributeValue), ex);
         }
         return Pair.of(count, description);
     }
 
+    /**
+     * Refreshes this node's property sheet.
+     */
     private void updateSheet() {
         this.setSheet(createSheet());
     }
 
-    private String getRootParentName() {
+    /**
+     * Gets the name of the root ancestor of the source content for the artifact
+     * represented by this node.
+     *
+     * @return The root ancestor name or the empty string if an error occurs.
+     */
+    private String getRootAncestorName() {
         String parentName = sourceContent.getName();
         Content parent = sourceContent;
         try {
@@ -767,32 +834,31 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 parentName = parent.getName();
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Failed to get parent name from {0}", sourceContent.getName()); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting root ancestor name for source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId())); //NON-NLS
             return "";
         }
         return parentName;
     }
 
     /**
-     * Add an additional custom node property to that node before it is
-     * displayed
+     * Adds a "custom" property to the property sheet of this node.
      *
-     * @param np NodeProperty to add
+     * @param property The custom property.
      */
-    public void addNodeProperty(NodeProperty<?> np) {
-        if (null == customProperties) {
-            //lazy create the list
+    public void addNodeProperty(NodeProperty<?> property) {
+        if (customProperties == null) {
             customProperties = new ArrayList<>();
         }
-        customProperties.add(np);
+        customProperties.add(property);
     }
 
     /**
-     * Fill map with Artifact properties
+     * Converts the attributes of the artifact this node represents to a map of
+     * name-value pairs, where the names are attribute type display names.
      *
-     * @param map      map with preserved ordering, where property names/values
-     *                 are put
-     * @param artifact to extract properties from
+     * @param map      The map to be populated with the artifact attribute
+     *                 name-value pairs.
+     * @param artifact The artifact.
      */
     @SuppressWarnings("deprecation")
     private void fillPropertyMap(Map<String, Object> map, BlackboardArtifact artifact) {
@@ -806,7 +872,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID()
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_KEYWORD_SEARCH_TYPE.getTypeID()
                         || attribute.getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.JSON) {
-                    continue;
+                    /*
+                     * Do nothing.
+                     */
                 } else if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) {
                     addEmailMsgProperty(map, attribute);
                 } else if (attribute.getAttributeType().getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME) {
@@ -814,11 +882,12 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 } else if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getTypeID()
                         && attributeTypeID == ATTRIBUTE_TYPE.TSK_TEXT.getTypeID()) {
                     /*
-                     * This was added because the RegRipper output would often
-                     * cause the UI to get a black line accross it and hang if
-                     * you hovered over large output or selected it. This
-                     * reduces the amount of data in the table. Could consider
-                     * doing this for all fields in the UI.
+                     * The truncation of text attributes appears to have been
+                     * motivated by the statement that "RegRipper output would
+                     * often cause the UI to get a black line accross it and
+                     * hang if you hovered over large output or selected it.
+                     * This reduces the amount of data in the table. Could
+                     * consider doing this for all fields in the UI."
                      */
                     String value = attribute.getDisplayString();
                     if (value.length() > 512) {
@@ -830,16 +899,18 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 }
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Getting attributes failed", ex); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting artifact attributes (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
         }
     }
 
     /**
-     * Fill map with EmailMsg properties, not all attributes are filled
+     * Adds an email message attribute of the artifact this node represents to a
+     * map of name-value pairs, where the names are attribute type display
+     * names.
      *
-     * @param map       map with preserved ordering, where property names/values
-     *                  are put
-     * @param attribute attribute to check/fill as property
+     * @param map       The map to be populated with the artifact attribute
+     *                  name-value pair.
+     * @param attribute The attribute to use to make the map entry.
      */
     private void addEmailMsgProperty(Map<String, Object> map, BlackboardAttribute attribute) {
 
@@ -852,10 +923,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 || attributeTypeID == ATTRIBUTE_TYPE.TSK_EMAIL_BCC.getTypeID()
                 || attributeTypeID == ATTRIBUTE_TYPE.TSK_EMAIL_CC.getTypeID()
                 || attributeTypeID == ATTRIBUTE_TYPE.TSK_HEADERS.getTypeID()) {
-
-            // do nothing
+            /*
+             * Do nothing.
+             */
         } else if (attributeTypeID == ATTRIBUTE_TYPE.TSK_EMAIL_CONTENT_PLAIN.getTypeID()) {
-
             String value = attribute.getDisplayString();
             if (value.length() > 160) {
                 value = value.substring(0, 160) + "...";
@@ -874,30 +945,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         return visitor.visit(this);
     }
 
-    /**
-     * Create a Lookup based on what is in the passed in artifact.
-     *
-     * @param artifact The artifact to make a look up for.
-     *
-     * @return A lookup with the artifact and possibly any associated content in
-     *         it.
-     */
-    private static Lookup createLookup(BlackboardArtifact artifact) {
-        // Add the content the artifact is associated with
-        final long objectID = artifact.getObjectID();
-        try {
-            Content content = contentCache.get(objectID, () -> artifact.getSleuthkitCase().getContentById(objectID));
-            if (content == null) {
-                return Lookups.fixed(artifact);
-            } else {
-                return Lookups.fixed(artifact, content);
-            }
-        } catch (ExecutionException ex) {
-            logger.log(Level.WARNING, "Getting associated content for artifact failed", ex); //NON-NLS
-            return Lookups.fixed(artifact);
-        }
-    }
-
     @Override
     public boolean isLeafTypeNode() {
         return true;
@@ -914,52 +961,83 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
-     * to their sheets.
+     * Adds the score property for the artifact represented by this node to the
+     * node property sheet.
      *
-     * @param sheetSet the modifiable Sheet.Set returned by
-     *                 Sheet.get(Sheet.PROPERTIES)
+     * @param sheetSet The property sheet.
+     * @param tags     The tags that have been applied to the artifact and its
+     *                 source content.
+     *
+     * @deprecated Do not use. The score property is now computed in a
+     * background thread and added to the property sheet in this node's event
+     * PropertyChangeEventListner.
+     */
+    @NbBundle.Messages({"BlackboardArtifactNode.createSheet.score.name=S",
+        "BlackboardArtifactNode.createSheet.score.displayName=S",
+        "BlackboardArtifactNode.createSheet.notableFile.description=Associated file recognized as notable.",
+        "BlackboardArtifactNode.createSheet.interestingResult.description=Result has an interesting result associated with it.",
+        "BlackboardArtifactNode.createSheet.taggedItem.description=Result or associated file has been tagged.",
+        "BlackboardArtifactNode.createSheet.notableTaggedItem.description=Result or associated file tagged with notable tag.",
+        "BlackboardArtifactNode.createSheet.noScore.description=No score"})
+    @Deprecated
+    protected final void addScorePropertyAndDescription(Sheet.Set sheetSet, List<Tag> tags) {
+        Pair<DataResultViewerTable.Score, String> scoreAndDescription = getScorePropertyAndDescription(tags);
+        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_score_name(), Bundle.BlackboardArtifactNode_createSheet_score_displayName(), scoreAndDescription.getRight(), scoreAndDescription.getLeft()));
+    }
+
+    /**
+     * Adds the tags property for the artifact represented by this node to the
+     * node property sheet.
+     *
+     * @param sheetSet The property sheet.
+     *
+     * @deprecated Do not use. The tags property is now computed in a background
+     * thread and added to the property sheet in this node's event
+     * PropertyChangeEventListner.
      */
     @NbBundle.Messages({
-        "BlackboardArtifactNode.createSheet.tags.displayName=Tags"})
+        "BlackboardArtifactNode.createSheet.tags.displayName=Tags"}
+    )
     @Deprecated
     protected void addTagProperty(Sheet.Set sheetSet) throws MissingResourceException {
-        // add properties for tags
         List<Tag> tags = new ArrayList<>();
         try {
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
         } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
         }
-        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
-                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
+        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(), NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the tags property
-     * to their sheets.
+     * Adds the tags property for the artifact represented by this node to the
+     * node property sheet.
      *
-     * @param sheetSet the modifiable Sheet.Set returned by
-     *                 Sheet.get(Sheet.PROPERTIES)
-     * @param tags     the list of tags which should appear as the value for the
-     *                 property
+     * @param sheetSet The property sheet.
+     * @param tags     The tags that have been applied to the artifact and its
+     *                 source content.
+     *
+     * @deprecated Do not use. The tags property is now computed in a background
+     * thread and added to the property sheet in this node's event
+     * PropertyChangeEventListner.
      */
     @Deprecated
     protected final void addTagProperty(Sheet.Set sheetSet, List<Tag> tags) {
-        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
-                NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
+        sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(), NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the Occurrences
-     * property to their sheets.
+     * Adds the count property for the artifact represented by this node to the
+     * node property sheet.
      *
-     * @param sheetSet  the modifiable Sheet.Set to add the property to
-     * @param attribute correlation attribute instance
+     * @param sheetSet  The property sheet.
+     * @param attribute The correlation attribute instance to use for the
+     *                  central repository lookup.
      *
-     * @deprecated Use the GetSCOTask to get this data on a background
-     * thread..., and then update the property sheet asynchronously
+     * @deprecated Do not use. The count property is now computed in a
+     * background thread and added to the property sheet in this node's event
+     * PropertyChangeEventListner.
      */
     @NbBundle.Messages({"BlackboardArtifactNode.createSheet.count.name=O",
         "BlackboardArtifactNode.createSheet.count.displayName=O",
@@ -971,30 +1049,29 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     @Deprecated
     protected final void addCountProperty(Sheet.Set sheetSet, CorrelationAttributeInstance attribute) {
         Pair<Long, String> countAndDescription = getCountPropertyAndDescription(attribute.getCorrelationType(), attribute.getCorrelationValue(), Bundle.BlackboardArtifactNode_createSheet_count_noCorrelationAttributes_description());
-        sheetSet.put(
-                new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_count_name(), Bundle.BlackboardArtifactNode_createSheet_count_displayName(), countAndDescription.getRight(), countAndDescription.getLeft()));
+        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_count_name(), Bundle.BlackboardArtifactNode_createSheet_count_displayName(), countAndDescription.getRight(), countAndDescription.getLeft()));
     }
 
     /**
-     * Used by (subclasses of) BlackboardArtifactNode to add the comment
-     * property to their sheets.
+     * Adds the other occurrences property for the artifact represented by this
+     * node to the node property sheet.
      *
-     * @param sheetSet  the modifiable Sheet.Set to add the property to
-     * @param tags      the list of tags associated with the file
-     * @param attribute the correlation attribute associated with this
-     *                  artifact's associated file, null if central repo is not
-     *                  enabled
+     * @param sheetSet  The property sheet.
+     * @param tags      The tags that have been applied to the artifact and its
+     *                  source content.
+     * @param attribute The correlation attribute instance to use for the
+     *                  central repository lookup.
      *
-     * @deprecated Use the GetSCOTask to get this data on a background
-     * thread..., and then update the property sheet asynchronously
+     * @deprecated Do not use. The count property is now computed in a
+     * background thread and added to the property sheet in this node's event
+     * PropertyChangeEventListner.
      */
     @NbBundle.Messages({"BlackboardArtifactNode.createSheet.comment.name=C",
         "BlackboardArtifactNode.createSheet.comment.displayName=C"})
     @Deprecated
     protected final void addCommentProperty(Sheet.Set sheetSet, List<Tag> tags, CorrelationAttributeInstance attribute) {
         HasCommentStatus status = getCommentProperty(tags, attribute);
-        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), NO_DESCR,
-                status));
+        sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_comment_name(), Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), NO_DESCR, status));
     }
 
 }

From fccf6b53cde0e62d8dac6dba3971b95875a5ef09 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 13 Mar 2020 21:35:06 -0400
Subject: [PATCH 5/8] Tidy up BlackboardArtifactNode.java

---
 .../sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 0b4d09a7b1..eb3571e0f1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -268,9 +268,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             /*
              * RC: NPE ALERT!! The decision to return a Lookup without the
              * source content in it has the potential to cause NPEs within this
-             * class and in the UI component clients of this class. The node
-             * constructor should throw. However, that would be an exported
-             * public API change.
+             * class and in the UI component clients of this class. Thsi method
+             * should throw and the node constructor should propagate the
+             * exception. However, that would be an exported public API change.
              */
             return Lookups.fixed(artifact);
         }

From a316eda337987295ef2462ee4c17cf6836a1e027 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sat, 14 Mar 2020 10:53:24 -0400
Subject: [PATCH 6/8] Tidy up BlackboardArtifactNode.java

---
 .../datamodel/BlackboardArtifactNode.java     | 384 +++++++++---------
 1 file changed, 201 insertions(+), 183 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index eb3571e0f1..2283e9d14f 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -93,20 +93,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     private static final Cache<Long, Content> contentCache = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build();
 
     /*
-     * Case application events that affect the property sheets of
-     * BlackboardArtifactNodes.
-     *
-     * NOTE: CURRENT_CASE (closed) events trigger content cache invalidation and
-     * unregistering of the PropertyChangeListener subscribed to the application
-     * events.
+     * Case events that indicate an update to the node's property sheet may be
+     * required.
      */
     private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(
             Case.Events.BLACKBOARD_ARTIFACT_TAG_ADDED,
             Case.Events.BLACKBOARD_ARTIFACT_TAG_DELETED,
             Case.Events.CONTENT_TAG_ADDED,
             Case.Events.CONTENT_TAG_DELETED,
-            Case.Events.CURRENT_CASE,
-            Case.Events.CR_COMMENT_CHANGED);
+            Case.Events.CR_COMMENT_CHANGED,
+            Case.Events.CURRENT_CASE);
 
     /*
      * Artifact types for which the unique path of the artifact's source content
@@ -120,20 +116,23 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     };
 
     /*
-     * Artifact types for which the file metadata of the artifact's source
-     * content (a file) should be displayed in the node's property sheet.
+     * Artifact types for which the file metadata of the artifact's source file
+     * should be displayed in the node's property sheet.
      */
     private static final Integer[] SHOW_FILE_METADATA = new Integer[]{
         BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
     };
 
     private final BlackboardArtifact artifact;
-    private Content sourceContent;
-    private List<NodeProperty<? extends Object>> customProperties;
+    private Content srcContent; // May be null.
 
     /*
-     * The node's application event listener.
+     * A method has been provided to allow the injection of properties into this
+     * node for display in the node's property sheet, independent of the
+     * artifact the node represents.
      */
+    private List<NodeProperty<? extends Object>> customProperties;
+
     private final PropertyChangeListener appEventListener = new PropertyChangeListener() {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
@@ -149,19 +148,25 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     updateSheet();
                 }
             } else if (eventType.equals(Case.Events.CONTENT_TAG_ADDED.toString())) {
-                ContentTagAddedEvent event = (ContentTagAddedEvent) evt;
-                if (event.getAddedTag().getContent().equals(sourceContent)) {
-                    updateSheet();
+                if (srcContent != null) {
+                    ContentTagAddedEvent event = (ContentTagAddedEvent) evt;
+                    if (event.getAddedTag().getContent().equals(srcContent)) {
+                        updateSheet();
+                    }
                 }
             } else if (eventType.equals(Case.Events.CONTENT_TAG_DELETED.toString())) {
-                ContentTagDeletedEvent event = (ContentTagDeletedEvent) evt;
-                if (event.getDeletedTagInfo().getContentID() == sourceContent.getId()) {
-                    updateSheet();
+                if (srcContent != null) {
+                    ContentTagDeletedEvent event = (ContentTagDeletedEvent) evt;
+                    if (event.getDeletedTagInfo().getContentID() == srcContent.getId()) {
+                        updateSheet();
+                    }
                 }
             } else if (eventType.equals(Case.Events.CR_COMMENT_CHANGED.toString())) {
-                CommentChangedEvent event = (CommentChangedEvent) evt;
-                if (event.getContentID() == sourceContent.getId()) {
-                    updateSheet();
+                if (srcContent != null) {
+                    CommentChangedEvent event = (CommentChangedEvent) evt;
+                    if (event.getContentID() == srcContent.getId()) {
+                        updateSheet();
+                    }
                 }
             } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
                 if (evt.getNewValue() == null) {
@@ -187,14 +192,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     };
 
     /*
-     * The node's application event listener is wrapped in a weak reference that
-     * allows the node to be garbage collected when the NetBeans infrastructure
-     * discards it because the user has navigated to another part of the tree.
-     * If this is not done, the strong reference to the listener held by the the
-     * event publisher prevents garbage collection of this node.
-     *
-     * RC: Isn't there some node lifecycle property change event that could be
-     * used to unregister the listener?
+     * The node's event listener is wrapped in a weak reference that allows the
+     * node to be garbage collected when the NetBeans infrastructure discards
+     * it. If this is not done, it has been shown that strong references to the
+     * listener held by event publishers prevents garbage collection of this
+     * node.
      */
     private final PropertyChangeListener weakAppEventListener = WeakListeners.propertyChange(appEventListener, null);
 
@@ -208,24 +210,19 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact));
         this.artifact = artifact;
-        /*
-         * RC: NPE ALERT!! The createLookup method can return a Lookup without
-         * the source content in it, so this loop has the potential to leave
-         * this.sourceContent null, causing NPEs within this class and in the UI
-         * component clients of this class. This constructor should throw
-         * instead. However, that would be an exported public API change.
-         */
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
-                sourceContent = lookupContent;
+                srcContent = lookupContent;
                 try {
                     /*
-                     * Get the unique path of the source content now (it is
-                     * cached in the Content object).
+                     * Calling this getter causes the unique path of the source
+                     * content to be cached in the Content object. This is
+                     * advantageous if this node is constructed in a background
+                     * thread instead of a UI thread.
                      */
-                    this.sourceContent.getUniquePath();
+                    srcContent.getUniquePath();
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, MessageFormat.format("Error getting the unique path of the source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
+                    logger.log(Level.SEVERE, MessageFormat.format("Error getting the unique path of the source content (artifact objID={0})", artifact.getId()), ex);
                 }
                 break;
             }
@@ -247,8 +244,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     }
 
     /**
-     * Creates a Lookup object for this node and populates it with the artifact
-     * this node represents and its source content.
+     * Creates a Lookup object for this node and populates it with both the
+     * artifact this node represents and its source content.
      *
      * @param artifact The artifact this node represents.
      *
@@ -264,24 +261,62 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 return Lookups.fixed(artifact, content);
             }
         } catch (ExecutionException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting source content (artifact objID={0}, content objID={1})", artifact.getId(), objectID), ex); //NON-NLS
-            /*
-             * RC: NPE ALERT!! The decision to return a Lookup without the
-             * source content in it has the potential to cause NPEs within this
-             * class and in the UI component clients of this class. Thsi method
-             * should throw and the node constructor should propagate the
-             * exception. However, that would be an exported public API change.
-             */
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting source content (artifact objID={0}", artifact.getId()), ex); //NON-NLS
             return Lookups.fixed(artifact);
         }
     }
 
+    /**
+     * Sets the display name for this node.
+     */
+    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
+    private void setDisplayName() {
+        String displayName = ""; //NON-NLS
+
+        /*
+         * If the artifact this node represents is a keyword hit artifact and
+         * the associated artifact can be retreived from the case database, make
+         * the display name the display name of the associated artifact.
+         *
+         * If the artifact this node represents is an interesting artifact hit
+         * and the associated artifact can be retreived from the case database,
+         * make the display name the display name of the artifact this node
+         * represents.
+         */
+        if (artifact != null
+                && (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()
+                || artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID())) {
+            try {
+                for (BlackboardAttribute attribute : artifact.getAttributes()) {
+                    if (attribute.getAttributeType().getTypeID() == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()) {
+                        BlackboardArtifact associatedArtifact = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboardArtifact(attribute.getValueLong());
+                        if (associatedArtifact != null) {
+                            if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
+                                displayName = Bundle.BlackboardArtifactNode_displayName_artifact(artifact.getDisplayName());
+                            } else {
+                                displayName = Bundle.BlackboardArtifactNode_displayName_artifact(associatedArtifact.getDisplayName());
+                            }
+                        }
+                    }
+                }
+            } catch (TskCoreException | NoCurrentCaseException ex) {
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting associated artifact of TSK_KEYWORD_HIT/TSK_INTERESTING_ARTIFACT_HIT artifact (objID={0}))", artifact.getId()), ex); //NON-NLS
+            }
+        }
+
+        if (displayName.isEmpty() && artifact != null) {
+            displayName = artifact.getDisplayName();
+        }
+
+        setDisplayName(displayName);
+    }
+
     /**
      * Unregisters the application event listener when this node is garbage
-     * collected, if this finalizer is called.
+     * collected, if this finalizer is actually called.
      *
      * RC: Isn't there some node lifecycle property change event that could be
-     * used to unregister the listener?
+     * used to unregister the listener instead?
      *
      * @throws Throwable
      */
@@ -321,7 +356,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 actionsList.add(new ViewArtifactInTimelineAction(artifact));
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting attributes of artifact (onbjID={0})", artifact.getArtifactID()), ex); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting artifact timestamp (artifact objID={0})", artifact.getId()), ex); //NON-NLS
         }
 
         /*
@@ -335,7 +370,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 actionsList.add(ViewFileInTimelineAction.createViewFileAction(linkedFile));
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting linked file of artifact (onbjID={0})", artifact.getArtifactID()), ex); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting linked file of artifact (artifact objID={0})", artifact.getId()), ex); //NON-NLS
         }
 
         /*
@@ -350,58 +385,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         return actionsList.toArray(new Action[actionsList.size()]);
     }
 
-    /**
-     * Sets the display name for this node.
-     *
-     * RC: I am not sure that the naming algorithm in this complicated and
-     * potentially fairly costly method has any value whatsoever. This should be
-     * investigated. In the mean time, I am preserving all of the comments I
-     * found here including: "Set the filter node display name. The value will
-     * either be the file name or something along the lines of e.g. "Messages
-     * Artifact" for keyword hits on artifacts." Note that this method swallows
-     * exceptions without logging them and also has a local variable that hides
-     * a superclass field with inappropriate package private access.
-     */
-    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
-    private void setDisplayName() {
-        String displayName = ""; //NON-NLS
-
-        // If this is a node for a keyword hit on an artifact, we set the
-        // display name to be the artifact type name followed by " Artifact"
-        // e.g. "Messages Artifact".
-        if (artifact != null
-                && (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()
-                || artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID())) {
-            try {
-                for (BlackboardAttribute attribute : artifact.getAttributes()) {
-                    if (attribute.getAttributeType().getTypeID() == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()) {
-                        BlackboardArtifact associatedArtifact = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboardArtifact(attribute.getValueLong());
-                        if (associatedArtifact != null) {
-                            if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
-                                artifact.getDisplayName();
-                            } else {
-                                displayName = NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.displayName.artifact", associatedArtifact.getDisplayName());
-                            }
-                        }
-                    }
-                }
-            } catch (TskCoreException | NoCurrentCaseException ex) {
-                // Do nothing since the display name will be set to the file name.
-            }
-        }
-
-        if (displayName.isEmpty() && artifact != null) {
-            try {
-                Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(artifact.getObjectID());
-                displayName = (content == null) ? artifact.getName() : content.getName();
-            } catch (TskCoreException | NoCurrentCaseException ex) {
-                displayName = artifact.getName();
-            }
-        }
-
-        this.setDisplayName(displayName);
-    }
-
     /**
      * Gets the name of the source content of the artifact represented by this
      * node.
@@ -409,7 +392,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @return The source content name.
      */
     public String getSourceName() {
-        return sourceContent.getName();
+        String name = "";
+        if (srcContent != null) {
+            srcContent.getName();
+        }
+        return name;
     }
 
     @NbBundle.Messages({
@@ -516,8 +503,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) {
             String ext = ""; //NON-NLS
             String actualMimeType = ""; //NON-NLS
-            if (sourceContent instanceof AbstractFile) {
-                AbstractFile file = (AbstractFile) sourceContent;
+            if (srcContent != null && srcContent instanceof AbstractFile) {
+                AbstractFile file = (AbstractFile) srcContent;
                 ext = file.getNameExtension();
                 actualMimeType = file.getMIMEType();
                 if (actualMimeType == null) {
@@ -541,10 +528,12 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
          */
         if (Arrays.asList(SHOW_UNIQUE_PATH).contains(artifactTypeId)) {
             String sourcePath = ""; //NON-NLS
-            try {
-                sourcePath = sourceContent.getUniquePath();
-            } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, MessageFormat.format("Error getting unique path of source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
+            if (srcContent != null) {
+                try {
+                    sourcePath = srcContent.getUniquePath();
+                } catch (TskCoreException ex) {
+                    logger.log(Level.SEVERE, MessageFormat.format("Error getting unique path of source content (artifact objID={0})", artifact.getId()), ex); //NON-NLS
+                }
             }
 
             if (sourcePath.isEmpty() == false) {
@@ -561,7 +550,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
              * sheet. Otherwise, add the data source to the sheet.
              */
             if (Arrays.asList(SHOW_FILE_METADATA).contains(artifactTypeId)) {
-                AbstractFile file = sourceContent instanceof AbstractFile ? (AbstractFile) sourceContent : null;
+                AbstractFile file = srcContent != null && srcContent instanceof AbstractFile ? (AbstractFile) srcContent : null;
                 sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.name"),
                         NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.displayName"),
                         "",
@@ -581,7 +570,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.name"),
                         NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.displayName"),
                         "",
-                        sourceContent.getSize()));
+                        file == null ? "" : file.getSize()));
                 sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_artifactMD5_name(),
                         Bundle.BlackboardArtifactNode_createSheet_artifactMD5_displayName(),
                         "",
@@ -589,15 +578,17 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
         } else {
             String dataSourceStr = "";
-            try {
-                Content dataSource = sourceContent.getDataSource();
-                if (dataSource != null) {
-                    dataSourceStr = dataSource.getName();
-                } else {
-                    dataSourceStr = getRootAncestorName();
+            if (srcContent != null) {
+                try {
+                    Content dataSource = srcContent.getDataSource();
+                    if (dataSource != null) {
+                        dataSourceStr = dataSource.getName();
+                    } else {
+                        dataSourceStr = getRootAncestorName();
+                    }
+                } catch (TskCoreException ex) {
+                    logger.log(Level.SEVERE, MessageFormat.format("Error getting source data source name (artifact objID={0})", artifact.getId()), ex); //NON-NLS
                 }
-            } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, MessageFormat.format("Error getting source data soiurce name (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
             }
 
             if (dataSourceStr.isEmpty() == false) {
@@ -616,8 +607,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
             long size = 0;
             String path = ""; //NON-NLS
-            if (sourceContent instanceof AbstractFile) {
-                AbstractFile af = (AbstractFile) sourceContent;
+            if (srcContent != null && srcContent instanceof AbstractFile) {
+                AbstractFile af = (AbstractFile) srcContent;
                 size = af.getSize();
                 try {
                     path = af.getUniquePath();
@@ -650,9 +641,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         List<Tag> tags = new ArrayList<>();
         try {
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
-            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
+            if (srcContent != null) {
+                tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(srcContent));
+            }
         } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and its source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and its source content (artifact objID={0})", artifact.getId()), ex);
         }
         return tags;
     }
@@ -668,28 +661,34 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     @Override
     protected final CorrelationAttributeInstance getCorrelationAttributeInstance() {
         CorrelationAttributeInstance correlationAttribute = null;
-        if (CentralRepository.isEnabled() && sourceContent instanceof AbstractFile) {
-            correlationAttribute = CorrelationAttributeUtil.getCorrAttrForFile((AbstractFile) sourceContent);
+        if (srcContent != null && CentralRepository.isEnabled() && srcContent instanceof AbstractFile) {
+            correlationAttribute = CorrelationAttributeUtil.getCorrAttrForFile((AbstractFile) srcContent);
         }
         return correlationAttribute;
     }
 
     /**
      * Computes the value of the comment property ("C" in S, C, O) for the
-     * artifact represented by this node. An icon is displayed if a commented
-     * tag has been applied to the artifact or its source content, or if there
-     * is a comment on the MD5 hash of the source file in the central
+     * artifact represented by this node.
+     *
+     * An icon is displayed in the property sheet if a commented tag has been
+     * applied to the artifact or its source content, or if there is a
+     * corresponding commented correlation attribute instance in the central
      * repository.
      *
      * @param tags      The tags applied to the artifact and its source content.
-     * @param attribute The correlation attribute for the MD5 hash of the source
-     *                  file of the artifact, may be null.
+     * @param attribute A correlation attribute instance Ffor the central
+     *                  repository lookup.
      *
      * @return The value of the comment property.
      */
     @Override
     protected DataResultViewerTable.HasCommentStatus getCommentProperty(List<Tag> tags, CorrelationAttributeInstance attribute) {
 
+        /*
+         * Has a tag with a comment been applied to the artifact or its source
+         * content?
+         */
         HasCommentStatus status = tags.size() > 0 ? HasCommentStatus.TAG_NO_COMMENT : HasCommentStatus.NO_COMMENT;
         for (Tag tag : tags) {
             if (!StringUtils.isBlank(tag.getComment())) {
@@ -698,6 +697,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
         }
 
+        /*
+         * Does the given correlation attribute instance have a comment in the
+         * central repository?
+         */
         if (attribute != null && !StringUtils.isBlank(attribute.getComment())) {
             if (status == HasCommentStatus.TAG_COMMENT) {
                 status = HasCommentStatus.CR_AND_TAG_COMMENTS;
@@ -712,12 +715,16 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     /**
      * Computes the value of the score property ("S" in S, C, O) for the
      * artifact represented by this node. The score property indicates whether
-     * the artifact or its source content is interesting or notable. A red icon
-     * will be displayed if the hash of the source file has been found in a
-     * notable hash set or if either the artifact or its source content has been
-     * tagged with a notable tag. A yellow icon will be displayed if the source
-     * file belongs to an interesting file set or either the artifact or its
-     * source content has been tagged with a non-notable tag.
+     * the artifact or its source content is notable or interesting.
+     *
+     * IMPORTANT: Notability takes precedence when computing the score.
+     *
+     * A red icon will be displayed in the property sheet if the hash of the
+     * source file has been found in a notable hash set or if either the
+     * artifact or its source content has been tagged with a notable tag. A
+     * yellow icon will be displayed if the source file belongs to an
+     * interesting file set or either the artifact or its source content has
+     * been tagged with a non-notable tag.
      *
      * @param tags The tags that have been applied to the artifact and its
      *             source content.
@@ -727,18 +734,25 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      */
     @Override
     protected Pair<DataResultViewerTable.Score, String> getScorePropertyAndDescription(List<Tag> tags) {
+        /*
+         * Is the artifact's source content marked as notable?
+         */
         Score score = Score.NO_SCORE;
         String description = Bundle.BlackboardArtifactNode_createSheet_noScore_description();
-        if (sourceContent instanceof AbstractFile) {
-            if (((AbstractFile) sourceContent).getKnown() == TskData.FileKnown.BAD) {
+        if (srcContent != null && srcContent instanceof AbstractFile) {
+            if (((AbstractFile) srcContent).getKnown() == TskData.FileKnown.BAD) {
                 score = Score.NOTABLE_SCORE;
                 description = Bundle.BlackboardArtifactNode_createSheet_notableFile_description();
             }
         }
-        //if the artifact being viewed is a hashhit check if the hashset is notable 
-        if ((score == Score.NO_SCORE || score == Score.INTERESTING_SCORE) && content.getArtifactTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) {
+
+        /*
+         * If the artifact is a hash set hit, is the hash set a notable hashes
+         * hash set?
+         */
+        if (score == Score.NO_SCORE && artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) {
             try {
-                BlackboardAttribute attr = content.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_SET_NAME));
+                BlackboardAttribute attr = artifact.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_SET_NAME));
                 List<HashDbManager.HashDb> notableHashsets = HashDbManager.getInstance().getKnownBadFileHashSets();
                 for (HashDbManager.HashDb hashDb : notableHashsets) {
                     if (hashDb.getHashSetName().equals(attr.getValueString())) {
@@ -748,18 +762,29 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     }
                 }
             } catch (TskCoreException ex) {
-                //unable to get the attribute so we can not update the status based on the attribute                
-                logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_SET_NAME attribute (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_SET_NAME attribute for TSK_HASHSET_HIT artifact (artifact objID={0})", artifact.getId()), ex);
             }
         }
-        try {
-            if (score == Score.NO_SCORE && !content.getArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT).isEmpty()) {
-                score = Score.INTERESTING_SCORE;
-                description = Bundle.BlackboardArtifactNode_createSheet_interestingResult_description();
+
+        /*
+         * Is the artifact's source content notable?
+         */
+        if (score == Score.NO_SCORE && srcContent != null) {
+            try {
+                if (!srcContent.getArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT).isEmpty()) {
+                    score = Score.INTERESTING_SCORE;
+                    description = Bundle.BlackboardArtifactNode_createSheet_interestingResult_description();
+                }
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_INTERESTING_ARTIFACT_HIT artifacts for source content (artifact objID={0})", artifact.getId()), ex);
             }
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting TSK_INTERESTING_ARTIFACT_HIT artifacts (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
         }
+
+        /*
+         * Analyze any tags applied to the artifact or its source content. If
+         * there are tags, tha artifact is at least interesting. If one of the
+         * tags is a notable tag, the artifact is notable.
+         */
         if (tags.size() > 0 && (score == Score.NO_SCORE || score == Score.INTERESTING_SCORE)) {
             score = Score.INTERESTING_SCORE;
             description = Bundle.BlackboardArtifactNode_createSheet_taggedItem_description();
@@ -798,7 +823,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         Long count = -1L;
         String description = defaultDescription;
         try {
-            //don't perform the query if there is no correlation value
             if (corrAttrType != null && StringUtils.isNotBlank(attributeValue)) {
                 count = CentralRepository.getInstance().getCountUniqueCaseDataSourceTuplesHavingTypeValue(corrAttrType, attributeValue);
                 description = Bundle.BlackboardArtifactNode_createSheet_count_description(count, corrAttrType.getDisplayName());
@@ -806,9 +830,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 description = Bundle.BlackboardArtifactNode_createSheet_count_noCorrelationValues_description();
             }
         } catch (CentralRepoException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error querying central repository for other occurences count (artifact objID={0}, content objID={1}, corrAttrType={2}, corrAttrValue={3})", artifact.getId(), sourceContent.getId(), corrAttrType, attributeValue), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error querying central repository for other occurences count (artifact objID={0}, corrAttrType={1}, corrAttrValue={2})", artifact.getId(), corrAttrType, attributeValue), ex);
         } catch (CorrelationAttributeNormalizationException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error normalizing correlation attribute for central repository query (artifact objID={0}, content objID={1}, corrAttrType={2}, corrAttrValue={3})", artifact.getId(), sourceContent.getId(), corrAttrType, attributeValue), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error normalizing correlation attribute for central repository query (artifact objID={0}, corrAttrType={2}, corrAttrValue={3})", artifact.getId(), corrAttrType, attributeValue), ex);
         }
         return Pair.of(count, description);
     }
@@ -827,21 +851,22 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @return The root ancestor name or the empty string if an error occurs.
      */
     private String getRootAncestorName() {
-        String parentName = sourceContent.getName();
-        Content parent = sourceContent;
+        String parentName = srcContent.getName();
+        Content parent = srcContent;
         try {
             while ((parent = parent.getParent()) != null) {
                 parentName = parent.getName();
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting root ancestor name for source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId())); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting root ancestor name for source content (artifact objID={0})", artifact.getId())); //NON-NLS
             return "";
         }
         return parentName;
     }
 
     /**
-     * Adds a "custom" property to the property sheet of this node.
+     * Adds a "custom" property to the property sheet of this node, indepoendent
+     * of the artifact this node represents or its source content.
      *
      * @param property The custom property.
      */
@@ -865,7 +890,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         try {
             for (BlackboardAttribute attribute : artifact.getAttributes()) {
                 final int attributeTypeID = attribute.getAttributeType().getTypeID();
-                //skip some internal attributes that user shouldn't see
                 if (attributeTypeID == ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID()
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT.getTypeID()
                         || attributeTypeID == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()
@@ -878,7 +902,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 } else if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) {
                     addEmailMsgProperty(map, attribute);
                 } else if (attribute.getAttributeType().getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME) {
-                    map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), sourceContent));
+                    map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), srcContent));
                 } else if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getTypeID()
                         && attributeTypeID == ATTRIBUTE_TYPE.TSK_TEXT.getTypeID()) {
                     /*
@@ -899,7 +923,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                 }
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting artifact attributes (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex); //NON-NLS
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting artifact attributes (artifact objID={0})", artifact.getId()), ex); //NON-NLS
         }
     }
 
@@ -913,10 +937,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @param attribute The attribute to use to make the map entry.
      */
     private void addEmailMsgProperty(Map<String, Object> map, BlackboardAttribute attribute) {
-
         final int attributeTypeID = attribute.getAttributeType().getTypeID();
-
-        // Skip certain Email msg attributes
         if (attributeTypeID == ATTRIBUTE_TYPE.TSK_DATETIME_SENT.getTypeID()
                 || attributeTypeID == ATTRIBUTE_TYPE.TSK_EMAIL_CONTENT_HTML.getTypeID()
                 || attributeTypeID == ATTRIBUTE_TYPE.TSK_EMAIL_CONTENT_RTF.getTypeID()
@@ -933,11 +954,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
             map.put(attribute.getAttributeType().getDisplayName(), value);
         } else if (attribute.getAttributeType().getValueType() == BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME) {
-            map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), sourceContent));
+            map.put(attribute.getAttributeType().getDisplayName(), ContentUtils.getStringTime(attribute.getValueLong(), srcContent));
         } else {
             map.put(attribute.getAttributeType().getDisplayName(), attribute.getDisplayString());
         }
-
     }
 
     @Override
@@ -969,8 +989,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      *                 source content.
      *
      * @deprecated Do not use. The score property is now computed in a
-     * background thread and added to the property sheet in this node's event
-     * PropertyChangeEventListner.
+     * background thread and added to the property sheet via property change
+     * event.
      */
     @NbBundle.Messages({"BlackboardArtifactNode.createSheet.score.name=S",
         "BlackboardArtifactNode.createSheet.score.displayName=S",
@@ -992,8 +1012,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @param sheetSet The property sheet.
      *
      * @deprecated Do not use. The tags property is now computed in a background
-     * thread and added to the property sheet in this node's event
-     * PropertyChangeEventListner.
+     * thread and added to the property sheet via property change event.
      */
     @NbBundle.Messages({
         "BlackboardArtifactNode.createSheet.tags.displayName=Tags"}
@@ -1003,9 +1022,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         List<Tag> tags = new ArrayList<>();
         try {
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact));
-            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(sourceContent));
+            tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(srcContent));
         } catch (TskCoreException | NoCurrentCaseException ex) {
-            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and source content (artifact objID={0}, content objID={1})", artifact.getId(), sourceContent.getId()), ex);
+            logger.log(Level.SEVERE, MessageFormat.format("Error getting tags for artifact and source content (artifact objID={0})", artifact.getId()), ex);
         }
         sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(), NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
     }
@@ -1019,8 +1038,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      *                 source content.
      *
      * @deprecated Do not use. The tags property is now computed in a background
-     * thread and added to the property sheet in this node's event
-     * PropertyChangeEventListner.
+     * thread and added to the property sheet via property change event.
      */
     @Deprecated
     protected final void addTagProperty(Sheet.Set sheetSet, List<Tag> tags) {
@@ -1036,8 +1054,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      *                  central repository lookup.
      *
      * @deprecated Do not use. The count property is now computed in a
-     * background thread and added to the property sheet in this node's event
-     * PropertyChangeEventListner.
+     * background thread and added to the property sheet via property change
+     * event.
      */
     @NbBundle.Messages({"BlackboardArtifactNode.createSheet.count.name=O",
         "BlackboardArtifactNode.createSheet.count.displayName=O",
@@ -1062,9 +1080,9 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @param attribute The correlation attribute instance to use for the
      *                  central repository lookup.
      *
-     * @deprecated Do not use. The count property is now computed in a
-     * background thread and added to the property sheet in this node's event
-     * PropertyChangeEventListner.
+     * @deprecated Do not use. The other occurrences property is now computed in a
+     * background thread and added to the property sheet via property change
+     * event.
      */
     @NbBundle.Messages({"BlackboardArtifactNode.createSheet.comment.name=C",
         "BlackboardArtifactNode.createSheet.comment.displayName=C"})

From c6fea4118f2166156a3abcb0ee65fc3634c94bf5 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sat, 14 Mar 2020 11:20:51 -0400
Subject: [PATCH 7/8] Tidy up BlackboardArtifactNode.java

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

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 2283e9d14f..caa2481a4c 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -394,7 +394,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public String getSourceName() {
         String name = "";
         if (srcContent != null) {
-            srcContent.getName();
+            name = srcContent.getName();
         }
         return name;
     }

From fd5cc7cb1694bcceb191aa80b9bdf9293f5d23ed Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sat, 14 Mar 2020 11:32:47 -0400
Subject: [PATCH 8/8] Improve performance of set display name for
 BlackboardArtifactNode

---
 .../datamodel/BlackboardArtifactNode.java     | 48 +------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index caa2481a4c..b4aafc2bcc 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -207,6 +207,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @param artifact The artifact to represent.
      * @param iconPath The path to the icon for the artifact type.
      */
+    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})    
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact));
         this.artifact = artifact;
@@ -228,7 +229,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             }
         }
         setName(Long.toString(artifact.getArtifactID()));
-        setDisplayName();
+        setDisplayName(Bundle.BlackboardArtifactNode_displayName_artifact(artifact.getDisplayName()));
         setIconBaseWithExtension(iconPath);
         Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakAppEventListener);
     }
@@ -266,51 +267,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         }
     }
 
-    /**
-     * Sets the display name for this node.
-     */
-    @NbBundle.Messages({"# {0} - artifactDisplayName", "BlackboardArtifactNode.displayName.artifact={0} Artifact"})
-    private void setDisplayName() {
-        String displayName = ""; //NON-NLS
-
-        /*
-         * If the artifact this node represents is a keyword hit artifact and
-         * the associated artifact can be retreived from the case database, make
-         * the display name the display name of the associated artifact.
-         *
-         * If the artifact this node represents is an interesting artifact hit
-         * and the associated artifact can be retreived from the case database,
-         * make the display name the display name of the artifact this node
-         * represents.
-         */
-        if (artifact != null
-                && (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()
-                || artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID())) {
-            try {
-                for (BlackboardAttribute attribute : artifact.getAttributes()) {
-                    if (attribute.getAttributeType().getTypeID() == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()) {
-                        BlackboardArtifact associatedArtifact = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboardArtifact(attribute.getValueLong());
-                        if (associatedArtifact != null) {
-                            if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
-                                displayName = Bundle.BlackboardArtifactNode_displayName_artifact(artifact.getDisplayName());
-                            } else {
-                                displayName = Bundle.BlackboardArtifactNode_displayName_artifact(associatedArtifact.getDisplayName());
-                            }
-                        }
-                    }
-                }
-            } catch (TskCoreException | NoCurrentCaseException ex) {
-                logger.log(Level.SEVERE, MessageFormat.format("Error getting associated artifact of TSK_KEYWORD_HIT/TSK_INTERESTING_ARTIFACT_HIT artifact (objID={0}))", artifact.getId()), ex); //NON-NLS
-            }
-        }
-
-        if (displayName.isEmpty() && artifact != null) {
-            displayName = artifact.getDisplayName();
-        }
-
-        setDisplayName(displayName);
-    }
-
     /**
      * Unregisters the application event listener when this node is garbage
      * collected, if this finalizer is actually called.