diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java index 219b4790f4..bd25438699 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNode.java @@ -35,7 +35,11 @@ public class CommonFileChildNode extends FileNode { super(fsContent); this.content = fsContent; this.dataSource = dataSource; - this.setDisplayName(fsContent.getName()); + } + + @Override + public T accept(DisplayableItemNodeVisitor visitor){ + return visitor.visit(this); } @Override @@ -76,14 +80,17 @@ 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.getName()); map.put(CommonFilePropertyType.DataSource.toString(), node.getDataSource()); } @NbBundle.Messages({ + "CommonFilePropertyType.fileColLbl=File", "CommonFilePropertyType.dataSourceColLbl=Data Source" }) public enum CommonFilePropertyType { + File(Bundle.CommonFilePropertyType_fileColLbl()), 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 4fe431bf87..c3dfb10d34 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java @@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.datamodel; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.lang3.StringUtils; import org.openide.nodes.Children; import org.openide.nodes.Sheet; import org.openide.util.NbBundle; @@ -41,6 +40,8 @@ public class CommonFileParentNode extends DisplayableItemNode { this.commonFileCount = commonFileCount; this.dataSources = dataSources; this.md5Hash = md5Hash; + + this.setDisplayName(md5Hash); } int getCommonFileCount() { @@ -63,7 +64,7 @@ public class CommonFileParentNode extends DisplayableItemNode { sheetSet = Sheet.createPropertiesSet(); sheet.put(sheetSet); } - + Map map = new LinkedHashMap<>(); fillPropertyMap(map, this); @@ -84,8 +85,7 @@ 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(), String.format("Match: %s", new String[]{node.getMd5()})); - map.put(CommonFileParentPropertyType.MD5.toString(), StringUtils.defaultString(node.getMd5())); + map.put(CommonFileParentPropertyType.File.toString(), node.getMd5()); map.put(CommonFileParentPropertyType.InstanceCount.toString(), node.getCommonFileCount()); map.put(CommonFileParentPropertyType.DataSource.toString(), node.getDataSources()); } @@ -107,13 +107,11 @@ public class CommonFileParentNode extends DisplayableItemNode { @NbBundle.Messages({ "CommonFileParentPropertyType.fileColLbl=File", - "CommonFileParentPropertyType.md5ColLbl=MD5 Hash", "CommonFileParentPropertyType.instanceColLbl=Instance Count", "CommonFileParentPropertyType.dataSourceColLbl=Data Source"}) public enum CommonFileParentPropertyType { File(Bundle.CommonFileParentPropertyType_fileColLbl()), - MD5(Bundle.CommonFileParentPropertyType_md5ColLbl()), InstanceCount(Bundle.CommonFileParentPropertyType_instanceColLbl()), DataSource(Bundle.CommonFileParentPropertyType_dataSourceColLbl()); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java index 8233215a88..ec54e37871 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java @@ -113,6 +113,8 @@ public interface DisplayableItemNodeVisitor { T visit (CommonFileParentNode cfpn); T visit (CommonFilesSearchNode cfsn); + + T visit (CommonFileChildNode cfcn); /* * Tags @@ -182,6 +184,11 @@ public interface DisplayableItemNodeVisitor { */ protected abstract T defaultVisit(DisplayableItemNode c); + @Override + public T visit(CommonFileChildNode c){ //TODO this may be fine but how do we add missing functions back to nows? or do we? + return defaultVisit(c); + } + @Override public T visit(CommonFileParentNode p){ //TODO this may be fine but how do we add missing functions back to nows? or do we? return defaultVisit(p);