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] 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