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

Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2

Browse Source 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
This commit is contained in:
Andrew Ziehl 2018-03-15 09:47:47 -07:00 committed by Brian Sweeney
parent 3b89d3b800
commit 86b61f4a02
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
View File

@ -27,7 +27,7 @@ import org.sleuthkit.autopsy.datamodel.CommonFileNode;
/** /**
* Makes nodes for common files search results. * Makes nodes for common files search results.
*/ */
final class CommonFilesChildren extends Children.Keys<AbstractFile> { //TODO extend ChildFactory rather than Children.Keys final class CommonFilesChildren extends ChildFactory<AbstractFile> {
private CommonFilesMetaData metaData; private CommonFilesMetaData metaData;

2
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
View File

@ -108,7 +108,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
title, title,
pathText, pathText,
tableFilterNode, tableFilterNode,
metadata.getDedupedFiles().size()); metadata.getFilesList().size());
component.requestActive(); // make it the active top component component.requestActive(); // make it the active top component

4
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
View File

@ -32,7 +32,9 @@ import org.sleuthkit.datamodel.AbstractFile;
*/ */
final class CommonFilesSearchNode extends AbstractNode { final class CommonFilesSearchNode extends AbstractNode {
private final CommonFilesChildren children; CommonFilesSearchNode(CommonFilesMetaData metaData) {
super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData));
}
CommonFilesSearchNode(CommonFilesMetaData metaData) { CommonFilesSearchNode(CommonFilesMetaData metaData) {
super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData)); super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData));
} }