From 009f90c3ed88b2e02592e422e4bd4d3aad1df3aa Mon Sep 17 00:00:00 2001 From: Brian Sweeney Date: Thu, 15 Mar 2018 15:42:23 -0600 Subject: [PATCH] added data result filter node back --- .../commonfilesearch/CommonFilesPanel.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java index d811934981..229ee57686 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java @@ -32,6 +32,8 @@ import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent; import org.sleuthkit.autopsy.corecomponents.TableFilterNode; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; +import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; +import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; @@ -74,6 +76,8 @@ public final class CommonFilesPanel extends javax.swing.JPanel { @Override @SuppressWarnings("FinallyDiscardsException") protected List doInBackground() throws TskCoreException, NoCurrentCaseException { + + //contents of this function should be wrapped in a BL class for the sake of testing Case currentCase = Case.getOpenCase(); SleuthkitCase tskDb = currentCase.getSleuthkitCase(); @@ -86,13 +90,15 @@ public final class CommonFilesPanel extends javax.swing.JPanel { try { super.done(); - List contentList = get(); - - CommonFilesMetaData metadata = CommonFilesMetaData.DeDupeFiles(contentList); - + List contentList = get(); // + //// To background thread + CommonFilesMetaData metadata = CommonFilesMetaData.DeDupeFiles(contentList); // + CommonFilesSearchNode contentFilesNode = new CommonFilesSearchNode(metadata); - TableFilterNode tableFilterNode = new TableFilterNode(contentFilesNode, true); + DataResultFilterNode dataResultFilterNode = new DataResultFilterNode(contentFilesNode, DirectoryTreeTopComponent.findInstance().getExplorerManager()); + + TableFilterNode tableFilterNode = new TableFilterNode(dataResultFilterNode, true); TopComponent component = DataResultTopComponent.createInstance( title,