From db4d65a3c6fc36b64146035d3e763817b50d653d Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 28 Jan 2022 08:16:59 -0500
Subject: [PATCH] code cleanup

---
 .../mainui/datamodel/AnalysisResultDAO.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
index 0241e26795..3c43527283 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
@@ -362,7 +362,7 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
                                 ? TreeDisplayCount.INDETERMINATE
                                 : TreeDisplayCount.getDeterminate(entry.getValue().getLeft());
 
-                        return getTreeItem(entry.getKey(), null, dataSourceId, displayCount, entry.getValue().getRight());
+                        return new AnalysisResultTreeItem(entry.getKey(), null, dataSourceId, displayCount, entry.getValue().getRight());
                     })
                     .sorted(Comparator.comparing(countRow -> countRow.getDisplayName()))
                     .collect(Collectors.toList());
@@ -1107,7 +1107,12 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
                     displayCount
             );
         } else {
-            return getTreeItem(arEvt.getArtifactType(), arEvt.getConfiguration(), arEvt.getDataSourceId(), displayCount, null);
+            return getConfigTreeItem(
+                    arEvt.getArtifactType(), 
+                    arEvt.getDataSourceId(), 
+                    arEvt.getConfiguration(), 
+                    StringUtils.isBlank(arEvt.getConfiguration()) ? arEvt.getArtifactType().getDisplayName() : arEvt.getConfiguration(), 
+                    displayCount);
         }
     }
 
@@ -1134,11 +1139,6 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
                 displayCount);
     }
 
-    private TreeItemDTO<AnalysisResultSearchParam> getTreeItem(BlackboardArtifact.Type type, String configuration,
-            Long dataSourceId, TreeDisplayCount displayCount, Boolean hasChildren) {
-        return new AnalysisResultTreeItem(type, configuration, dataSourceId, displayCount, hasChildren);
-    }
-
     @Override
     Set<? extends DAOEvent> handleIngestComplete() {
         return SubDAOUtils.getIngestCompleteEvents(this.treeCounts, (arEvt, count) -> getTreeItem(arEvt, count));