From 86b61f4a02f84880d5628b80574a40ebc168564c Mon Sep 17 00:00:00 2001
From: Andrew Ziehl <aziehl@ciphertechsolutions.com>
Date: Thu, 15 Mar 2018 09:47:47 -0700
Subject: [PATCH] Merge branch '3602-common-case-files_r2' of
 https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2

# 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
---
 .../autopsy/commonfilesearch/CommonFilesChildren.java         | 2 +-
 .../sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java  | 2 +-
 .../autopsy/commonfilesearch/CommonFilesSearchNode.java       | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
index 37a88eaf39..0e6a1c35e8 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
@@ -27,7 +27,7 @@ import org.sleuthkit.autopsy.datamodel.CommonFileNode;
 /**
  * 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;
 
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index a9fd06b37d..efff6a1da1 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -108,7 +108,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                             title,
                             pathText,
                             tableFilterNode,
-                            metadata.getDedupedFiles().size());
+                            metadata.getFilesList().size());
 
                     component.requestActive(); // make it the active top component
 
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
index 04c4f01c67..59299b7e5f 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
@@ -32,7 +32,9 @@ import org.sleuthkit.datamodel.AbstractFile;
  */
 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) {
         super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData));
 }