mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-20 11:26:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8277-fix' of https://github.com/gdicristofaro/autopsy into REALLY_delete_kws_8276

Browse Source
This commit is contained in:
Eugene Livis 2022-01-28 13:47:10 -05:00
commit ae2760dff9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
View File

@ -361,7 +361,7 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
? TreeDisplayCount.INDETERMINATE ? TreeDisplayCount.INDETERMINATE
: TreeDisplayCount.getDeterminate(entry.getValue().getLeft()); : 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())) .sorted(Comparator.comparing(countRow -> countRow.getDisplayName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -1106,7 +1106,12 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
displayCount displayCount
); );
} else { } 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);
} }
} }
@ -1133,11 +1138,6 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
displayCount); 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 @Override
Set<? extends DAOEvent> handleIngestComplete() { Set<? extends DAOEvent> handleIngestComplete() {
return SubDAOUtils.getIngestCompleteEvents(this.treeCounts, (arEvt, count) -> getTreeItem(arEvt, count)); return SubDAOUtils.getIngestCompleteEvents(this.treeCounts, (arEvt, count) -> getTreeItem(arEvt, count));