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

Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into delete_kws_results_8275

Browse Source
This commit is contained in:
Eugene Livis 2022-01-20 11:04:32 -05:00
commit 15efe8b5d7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
@ -515,7 +516,7 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
return getSetTreeItem(type,
dataSourceId,
entry.getKey(),
entry.getKey() == null ? nullSetName : entry.getKey(),
StringUtils.isBlank(entry.getKey()) ? nullSetName : entry.getKey(),
displayCount);
})
.collect(Collectors.toList());

7
Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java
View File

@ -23,6 +23,7 @@ import java.util.Comparator;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import org.apache.commons.lang3.StringUtils;
import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children;
import org.openide.util.NbBundle.Messages;
@ -86,8 +87,7 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
protected TreeNode<AnalysisResultSearchParam> createNewNode(TreeResultsDTO.TreeItemDTO<? extends AnalysisResultSearchParam> rowData) {
if (BlackboardArtifact.Type.TSK_KEYWORD_HIT.equals(rowData.getSearchParams().getArtifactType())) {
return new TreeTypeNode(rowData, new KeywordSetFactory(dataSourceId));
} else if ((rowData instanceof AnalysisResultTreeItem && ((AnalysisResultTreeItem) rowData).getHasChildren().orElse(false))
|| rowData.getSearchParams() instanceof AnalysisResultSetSearchParam) {
} else if (rowData instanceof AnalysisResultTreeItem && ((AnalysisResultTreeItem) rowData).getHasChildren().orElse(false)) {
return new TreeTypeNode(rowData, new TreeSetFactory(rowData.getSearchParams().getArtifactType(), dataSourceId, Bundle.AnalysisResultTypeFactory_nullSetName()));
} else {
return new AnalysisResultTypeTreeNode(rowData);
@ -107,7 +107,8 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
if (originalTreeItem instanceof AnalysisResultTreeItem) {
hasChildren = ((AnalysisResultTreeItem) originalTreeItem).getHasChildren().orElse(null);
} else if (originalTreeItem.getSearchParams() instanceof AnalysisResultSetSearchParam) {
hasChildren = true;
String setName = ((AnalysisResultSetSearchParam) originalTreeItem.getSearchParams()).getSetName();
hasChildren = StringUtils.isNotBlank(setName);
}
// generate new type so that if it is a subtree event (i.e. keyword hits), the right tree item is created.