From 7d62a9cfca5f541ecffb56d7557a6ccd20574a99 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Thu, 15 Mar 2018 09:28:26 -0600
Subject: [PATCH] cleanup, notes, narrower access on a few items

---
 .../autopsy/commonfilesearch/CommonFilesChildren.java       | 5 +++--
 .../autopsy/commonfilesearch/CommonFilesSearchNode.java     | 6 ++----
 .../src/org/sleuthkit/autopsy/datamodel/CommonFileNode.java | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
index fd340ef72d..54b8a4d651 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
@@ -28,7 +28,7 @@ import org.sleuthkit.autopsy.datamodel.CommonFileNode;
 /**
  * Makes nodes for common files search results.
  */
-final class CommonFilesChildren extends Children.Keys<AbstractFile> {
+final class CommonFilesChildren extends Children.Keys<AbstractFile> {   //TODO extend ChildFactory rather than Children.Keys
 
     private final java.util.Map<String, Integer> instanceCountMap;
     private final java.util.Map<String, String> dataSourceMap;
@@ -50,7 +50,8 @@ final class CommonFilesChildren extends Children.Keys<AbstractFile> {
         String dataSources = this.dataSourceMap.get(md5Hash);
         
         Node[] node = new Node[1];
-        node[0] = new CommonFileNode(t, instanceCount, dataSources);
+        final CommonFileNode commonFileNode = new CommonFileNode(t, instanceCount, dataSources);
+        node[0] = commonFileNode;
         
         return node;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
index bac59f6de9..382b11ec68 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.commonfilesearch;
 
-import java.util.ArrayList;
 import java.util.List;
 import org.openide.nodes.AbstractNode;
 import org.openide.util.NbBundle;
@@ -28,10 +27,9 @@ import org.sleuthkit.datamodel.AbstractFile;
  * Encapsulates data used to display common files search results in the top
  * right pane.
  */
-//TODO rename to CommonFilesSearchNode
 final class CommonFilesSearchNode extends AbstractNode {
 
-    private CommonFilesChildren children;
+    private final CommonFilesChildren children;
 
     CommonFilesSearchNode(List<AbstractFile> keys, java.util.Map<String, Integer> instanceCountMap, java.util.Map<String, String> dataSourceMap) {
         super(new CommonFilesChildren(true, keys, instanceCountMap, dataSourceMap));
@@ -39,7 +37,7 @@ final class CommonFilesSearchNode extends AbstractNode {
     }
 
     @NbBundle.Messages({
-        "CommonFilesNode.getName.text=CommonFiles"})
+        "CommonFilesNode.getName.text=Common Files"})
     @Override
     public String getName() {
         return Bundle.CommonFilesNode_getName_text();
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileNode.java
index c46288e02f..6d70b92bb1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileNode.java
@@ -30,7 +30,7 @@ import org.sleuthkit.datamodel.AbstractFile;
 /**
  * Encapsulates data being pushed to Common Files component in top right pane.
  */
-public class CommonFileNode extends AbstractNode {
+public class CommonFileNode extends AbstractNode {  //TODO FileNode
 
     private final AbstractFile content;