From facf4ca4cdfd26b1c95179f719aebd28e090ea4e Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Mon, 26 Mar 2018 09:25:01 -0600
Subject: [PATCH] harmonizing columns between the two node types

---
 .../sleuthkit/autopsy/datamodel/CommonFileChildNode.java   | 5 +----
 .../sleuthkit/autopsy/datamodel/CommonFileParentNode.java  | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java
index c79cb0f851..222e73ecb0 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java
@@ -79,7 +79,6 @@ public class CommonFileChildNode extends FileNode {
         map.put(CommonFilePropertyType.Name.toString(), node.getContent().getName());
         map.put(CommonFilePropertyType.Md5Hash.toString(), "");
         map.put(CommonFilePropertyType.InstanceCount.toString(), "");
-        map.put(CommonFilePropertyType.DataSources.toString(), "");
         map.put(CommonFilePropertyType.DataSource.toString(), node.getDataSource());
     }
     
@@ -87,15 +86,13 @@ public class CommonFileChildNode extends FileNode {
         "CommonFilePropertyType.nameColLbl=Name",
         "CommonFilePropertyType.instanceColLbl1=Instance Count",
         "CommonFilePropertyType.md5HashColLbl=MD5 Hash",
-        "CommonFilePropertyType.dataSourcesColLbl=Data Sources",
         "CommonFilePropertyType.dataSourceColLbl=Data Source"})
     public enum CommonFilePropertyType {
         
         Name(Bundle.CommonFilePropertyType_nameColLbl()),
         Md5Hash(Bundle.CommonFilePropertyType_md5HashColLbl()),
         InstanceCount(Bundle.CommonFilePropertyType_instanceColLbl1()),
-        DataSources(Bundle.CommonFilePropertyType_dataSourcesColLbl()),
-        DataSource(Bundle.CommonFilePropertyType_dataSourcesColLbl());
+        DataSource(Bundle.CommonFilePropertyType_dataSourceColLbl());
         
         final private String displayString;
         
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java
index fe5f99f485..2a697a7de4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java
@@ -87,8 +87,7 @@ public class CommonFileParentNode extends DisplayableItemNode {
         map.put(CommonFileParentPropertyType.Name.toString(), "");
         map.put(CommonFileParentPropertyType.Md5Hash.toString(), StringUtils.defaultString(node.getMd5()));
         map.put(CommonFileParentPropertyType.InstanceCount.toString(), node.getCommonFileCount());
-        map.put(CommonFileParentPropertyType.DataSources.toString(), node.getDataSources());
-        map.put(CommonFileParentPropertyType.DataSource.toString(), "");
+        map.put(CommonFileParentPropertyType.DataSource.toString(), node.getDataSources());
     }
 
     @Override
@@ -110,15 +109,13 @@ public class CommonFileParentNode extends DisplayableItemNode {
         "CommonFileParentPropertyType.nameColLbl=Name",
         "CommonFileParentPropertyType.instanceColLbl1=Instance Count",
         "CommonFileParentPropertyType.md5HashColLbl=MD5 Hash",
-        "CommonFileParentPropertyType.dataSourcesColLbl=Data Sources",
         "CommonFileParentPropertyType.dataSourceColLbl=Data Source"})
     public enum CommonFileParentPropertyType {
 
         Name(Bundle.CommonFileParentPropertyType_nameColLbl()),
         Md5Hash(Bundle.CommonFileParentPropertyType_md5HashColLbl()),
         InstanceCount(Bundle.CommonFileParentPropertyType_instanceColLbl1()),
-        DataSources(Bundle.CommonFileParentPropertyType_dataSourcesColLbl()),
-        DataSource(Bundle.CommonFileParentPropertyType_dataSourcesColLbl());
+        DataSource(Bundle.CommonFileParentPropertyType_dataSourceColLbl());
 
         final private String displayString;