diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 69c44def64..7405f8c9d1 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -172,6 +172,8 @@ public class DataResultViewerTable extends AbstractDataResultViewer { outlineView.expandNode(n); } + //DataResultViewerTable.FIRST_COLUMN_LABEL + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java index 6e32266cc6..219b4790f4 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java @@ -76,19 +76,14 @@ public class CommonFileChildNode extends FileNode { * @param node The item to get properties for. */ static private void fillPropertyMap(Map map, CommonFileChildNode node) { - map.put(CommonFilePropertyType.File.toString(), node.getContent().getName()); - map.put(CommonFilePropertyType.InstanceCount.toString(), ""); map.put(CommonFilePropertyType.DataSource.toString(), node.getDataSource()); } @NbBundle.Messages({ - "CommonFilePropertyType.fileColLbl=File", - "CommonFilePropertyType.instanceColLbl1=Instance Count", - "CommonFilePropertyType.dataSourceColLbl=Data Source"}) + "CommonFilePropertyType.dataSourceColLbl=Data Source" + }) public enum CommonFilePropertyType { - File(Bundle.CommonFilePropertyType_fileColLbl()), - InstanceCount(Bundle.CommonFilePropertyType_instanceColLbl1()), 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 2a702041eb..4fe431bf87 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java @@ -84,7 +84,8 @@ public class CommonFileParentNode extends DisplayableItemNode { * @param node The item to get properties for. */ static private void fillPropertyMap(Map map, CommonFileParentNode node) { - map.put(CommonFileParentPropertyType.File.toString(), StringUtils.defaultString(node.getMd5())); + map.put(CommonFileParentPropertyType.File.toString(), String.format("Match: %s", new String[]{node.getMd5()})); + map.put(CommonFileParentPropertyType.MD5.toString(), StringUtils.defaultString(node.getMd5())); map.put(CommonFileParentPropertyType.InstanceCount.toString(), node.getCommonFileCount()); map.put(CommonFileParentPropertyType.DataSource.toString(), node.getDataSources()); } @@ -106,12 +107,14 @@ public class CommonFileParentNode extends DisplayableItemNode { @NbBundle.Messages({ "CommonFileParentPropertyType.fileColLbl=File", - "CommonFileParentPropertyType.instanceColLbl1=Instance Count", + "CommonFileParentPropertyType.md5ColLbl=MD5 Hash", + "CommonFileParentPropertyType.instanceColLbl=Instance Count", "CommonFileParentPropertyType.dataSourceColLbl=Data Source"}) public enum CommonFileParentPropertyType { File(Bundle.CommonFileParentPropertyType_fileColLbl()), - InstanceCount(Bundle.CommonFileParentPropertyType_instanceColLbl1()), + MD5(Bundle.CommonFileParentPropertyType_md5ColLbl()), + InstanceCount(Bundle.CommonFileParentPropertyType_instanceColLbl()), DataSource(Bundle.CommonFileParentPropertyType_dataSourceColLbl()); final private String displayString;