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

fix in root factory

Browse Source
This commit is contained in:
Greg DiCristofaro 2022-03-31 20:02:12 -04:00
parent e9fd684378
commit c3709ee83f
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Core/src/org/sleuthkit/autopsy/mainui/nodes/RootFactory.java
View File

@ -18,8 +18,6 @@
*/ */
package org.sleuthkit.autopsy.mainui.nodes; package org.sleuthkit.autopsy.mainui.nodes;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -29,11 +27,9 @@ import java.util.Optional;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children; import org.openide.nodes.Children;
import org.openide.nodes.Node; import org.openide.nodes.Node;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.openide.util.WeakListeners;
import org.openide.util.lookup.Lookups; import org.openide.util.lookup.Lookups;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.CasePreferences; import org.sleuthkit.autopsy.casemodule.CasePreferences;
@ -107,11 +103,13 @@ public class RootFactory {
} }
} }
@SuppressWarnings("unchecked")
private TreeNode<Object> downCastNode(TreeNode<? extends Object> orig) { private TreeNode<Object> downCastNode(TreeNode<? extends Object> orig) {
return (TreeNode<Object>) orig; return (TreeNode<Object>) orig;
} }
@Override @Override
@SuppressWarnings("unchecked")
protected TreeNode<Object> createNewNode(TreeItemDTO<? extends Object> rowData) { protected TreeNode<Object> createNewNode(TreeItemDTO<? extends Object> rowData) {
if (rowData.getSearchParams() instanceof HostSearchParams) { if (rowData.getSearchParams() instanceof HostSearchParams) {
return downCastNode(HostNode.getPersonHostViewNode((TreeItemDTO<? extends HostSearchParams>) rowData)); return downCastNode(HostNode.getPersonHostViewNode((TreeItemDTO<? extends HostSearchParams>) rowData));
@ -124,8 +122,19 @@ public class RootFactory {
} }
} }
private TreeItemDTO<Object> downCastTreeItem(TreeItemDTO<? extends Object> orig) { /**
return (TreeItemDTO<Object>) orig; * This creates a modified tree item dto where the id has a prefix (to differentiate switches between person and host).
* @param orig The original tree item.
* @return The modified tree item
*/
private TreeItemDTO<Object> getModifiedIdTreeItem(TreeItemDTO<? extends Object> orig) {
return new TreeItemDTO<Object>(
orig.getTypeId(),
orig.getSearchParams(),
orig.getTypeId() + "_" + orig.getId(),
orig.getDisplayName(),
orig.getDisplayCount()
);
} }
@Override @Override
@ -135,11 +144,11 @@ public class RootFactory {
TreeResultsDTO<? extends PersonSearchParams> persons = MainDAO.getInstance().getHostPersonDAO().getAllPersons(); TreeResultsDTO<? extends PersonSearchParams> persons = MainDAO.getInstance().getHostPersonDAO().getAllPersons();
if (persons.getItems().isEmpty() || (persons.getItems().size() == 1 && persons.getItems().get(0).getSearchParams().getPerson() == null)) { if (persons.getItems().isEmpty() || (persons.getItems().size() == 1 && persons.getItems().get(0).getSearchParams().getPerson() == null)) {
toReturn.addAll(MainDAO.getInstance().getHostPersonDAO().getAllHosts().getItems().stream() toReturn.addAll(MainDAO.getInstance().getHostPersonDAO().getAllHosts().getItems().stream()
.map(this::downCastTreeItem) .map(this::getModifiedIdTreeItem)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} else { } else {
toReturn.addAll(persons.getItems().stream() toReturn.addAll(persons.getItems().stream()
.map(this::downCastTreeItem) .map(this::getModifiedIdTreeItem)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
} catch (ExecutionException | IllegalArgumentException ex) { } catch (ExecutionException | IllegalArgumentException ex) {