From 90ae935c005a6702302c4801f1e7fcae2b6fceac Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 11 Jun 2021 14:31:03 -0400
Subject: [PATCH 1/3] use analysis result for unique path

---
 .../datamodel/BlackboardArtifactNode.java     | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 1068c72973..f048a84663 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -80,6 +80,7 @@ import static org.sleuthkit.autopsy.datamodel.AbstractContentNode.NO_DESCR;
 import org.sleuthkit.autopsy.texttranslation.TextTranslationService;
 import org.sleuthkit.autopsy.datamodel.utils.FileNameTransTask;
 import org.sleuthkit.datamodel.AnalysisResult;
+import org.sleuthkit.datamodel.BlackboardArtifact.Category;
 import org.sleuthkit.datamodel.Score;
 
 /**
@@ -109,17 +110,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
             Case.Events.CR_COMMENT_CHANGED,
             Case.Events.CURRENT_CASE);
 
-    /*
-     * 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(),
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID(),
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()
-    };
-
     /*
      * Artifact types for which the file metadata of the artifact's source file
      * should be displayed in the node's property sheet.
@@ -650,12 +640,19 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     NO_DESCR,
                     actualMimeType));
         }
+        
+        BlackboardArtifact.Type artifactType = null;
+        try {
+            artifactType = artifact.getType();
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to get type for artifact with id: " + artifact.getId());
+        }
 
         /*
          * 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)) {
+        if (artifactType != null && artifactType.getCategory() == Category.ANALYSIS_RESULT) {
             String sourcePath = ""; //NON-NLS
             try {
                 sourcePath = srcContent.getUniquePath();

From 1afacd0e7b14e577ebc92a8cb1e9d40667d1070b Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 18 Jun 2021 14:44:09 -0400
Subject: [PATCH 2/3] move getType to constructor

---
 .../datamodel/BlackboardArtifactNode.java     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index f048a84663..f0168936c1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -119,6 +119,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     };
 
     private final BlackboardArtifact artifact;
+    private final BlackboardArtifact.Type artifactType;
     private Content srcContent;
     private volatile String translatedSourceName;
 
@@ -227,6 +228,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact, false));
         this.artifact = artifact;
+        
+        BlackboardArtifact.Type artType = null;
+        try {
+            artType = artifact.getType();
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, MessageFormat.format("Error getting the artifact type for artifact (artifact objID={0})", artifact.getId()), ex);
+        }
+        this.artifactType = artType;
+                        
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
                 srcContent = lookupContent;
@@ -268,6 +278,15 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, boolean lookupIsAssociatedFile) {
         super(artifact, createLookup(artifact, lookupIsAssociatedFile));
         this.artifact = artifact;
+        
+        BlackboardArtifact.Type artType = null;
+        try {
+            artType = artifact.getType();
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, MessageFormat.format("Error getting the artifact type for artifact (artifact objID={0})", artifact.getId()), ex);
+        }
+        this.artifactType = artType;
+        
         try {
             //The lookup for a file may or may not exist so we define the srcContent as the parent.
             srcContent = artifact.getParent();
@@ -640,13 +659,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                     NO_DESCR,
                     actualMimeType));
         }
-        
-        BlackboardArtifact.Type artifactType = null;
-        try {
-            artifactType = artifact.getType();
-        } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Unable to get type for artifact with id: " + artifact.getId());
-        }
 
         /*
          * If the type of the artifact represented by this node dictates the

From fdc0526a4e2e97cbd7ed79bb6684efcb4905cb86 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 18 Jun 2021 16:06:08 -0400
Subject: [PATCH 3/3] move to separate method

---
 .../datamodel/BlackboardArtifactNode.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index f0168936c1..e3bad44705 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -228,14 +228,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, String iconPath) {
         super(artifact, createLookup(artifact, false));
         this.artifact = artifact;
-        
-        BlackboardArtifact.Type artType = null;
-        try {
-            artType = artifact.getType();
-        } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, MessageFormat.format("Error getting the artifact type for artifact (artifact objID={0})", artifact.getId()), ex);
-        }
-        this.artifactType = artType;
+        this.artifactType = getType(artifact);
                         
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
@@ -278,14 +271,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact, boolean lookupIsAssociatedFile) {
         super(artifact, createLookup(artifact, lookupIsAssociatedFile));
         this.artifact = artifact;
-        
-        BlackboardArtifact.Type artType = null;
-        try {
-            artType = artifact.getType();
-        } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, MessageFormat.format("Error getting the artifact type for artifact (artifact objID={0})", artifact.getId()), ex);
-        }
-        this.artifactType = artType;
+        this.artifactType = getType(artifact);
         
         try {
             //The lookup for a file may or may not exist so we define the srcContent as the parent.
@@ -326,6 +312,20 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact) {
         this(artifact, IconsUtil.getIconFilePath(artifact.getArtifactTypeID()));
     }
+    
+    /**
+     * Returns the artifact type of the artifact.
+     * @param artifact The artifact.
+     * @return The artifact type or null if no type could be retrieved.
+     */
+    private static BlackboardArtifact.Type getType(BlackboardArtifact artifact) {
+        try {
+            return artifact.getType();
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, MessageFormat.format("Error getting the artifact type for artifact (artifact objID={0})", artifact.getId()), ex);
+            return null;
+        }
+    }
 
     /**
      * Creates a Lookup object for this node and populates it with both the