diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CentralRepositoryFileInstanceNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/CentralRepositoryFileInstanceNode.java index a47c9ef589..6b5dd72810 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CentralRepositoryFileInstanceNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CentralRepositoryFileInstanceNode.java @@ -131,6 +131,8 @@ public class CentralRepositoryFileInstanceNode extends DisplayableItemNode { final String fullPath = centralRepoFile.getFilePath(); final File file = new File(fullPath); + final String caseName = centralRepoFile.getCorrelationCase().getDisplayName(); + final String name = file.getName(); final String parent = file.getParent(); @@ -139,6 +141,7 @@ public class CentralRepositoryFileInstanceNode extends DisplayableItemNode { map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.File.toString(), name); map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.ParentPath.toString(), parent); map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.HashsetHits.toString(), ""); + map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.Case.toString(), caseName); map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.DataSource.toString(), caseQualifiedDataSource); map.put(CentralRepositoryFileInstanceNode.CentralRepoFileInstancesPropertyType.MimeType.toString(), ""); } @@ -151,6 +154,7 @@ public class CentralRepositoryFileInstanceNode extends DisplayableItemNode { "CentralRepoFileInstancesPropertyType.fileColLbl=File", "CentralRepoFileInstancesPropertyType.pathColLbl=Parent Path", "CentralRepoFileInstancesPropertyType.hashsetHitsColLbl=Hash Set Hits", + "CentralRepoFileInstancesPropertyType.caseColLbl=Case", "CentralRepoFileInstancesPropertyType.dataSourceColLbl=Data Source", "CentralRepoFileInstancesPropertyType.mimeTypeColLbl=MIME Type" }) @@ -159,6 +163,7 @@ public class CentralRepositoryFileInstanceNode extends DisplayableItemNode { File(Bundle.CentralRepoFileInstancesPropertyType_fileColLbl()), ParentPath(Bundle.CentralRepoFileInstancesPropertyType_pathColLbl()), HashsetHits(Bundle.CentralRepoFileInstancesPropertyType_hashsetHitsColLbl()), + Case(Bundle.CentralRepoFileInstancesPropertyType_caseColLbl()), DataSource(Bundle.CentralRepoFileInstancesPropertyType_dataSourceColLbl()), MimeType(Bundle.CentralRepoFileInstancesPropertyType_mimeTypeColLbl()); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java index b171354fb4..fe6c40bdff 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java @@ -128,6 +128,7 @@ public class Md5Node extends DisplayableItemNode { static private void fillPropertyMap(Map map, Md5Node node) { map.put(CommonFileParentPropertyType.File.toString(), node.getMd5()); map.put(CommonFileParentPropertyType.InstanceCount.toString(), node.getCommonFileCount()); + map.put(CommonFileParentPropertyType.Case.toString(), "TODO"); map.put(CommonFileParentPropertyType.DataSource.toString(), node.getDataSources()); } @@ -176,11 +177,13 @@ public class Md5Node extends DisplayableItemNode { @NbBundle.Messages({ "CommonFileParentPropertyType.fileColLbl=File", "CommonFileParentPropertyType.instanceColLbl=Instance Count", + "CommonFileParentPropertyType.caseColLbl=Case", "CommonFileParentPropertyType.dataSourceColLbl=Data Source"}) public enum CommonFileParentPropertyType { File(Bundle.CommonFileParentPropertyType_fileColLbl()), InstanceCount(Bundle.CommonFileParentPropertyType_instanceColLbl()), + Case(Bundle.CommonFileParentPropertyType_caseColLbl()), DataSource(Bundle.CommonFileParentPropertyType_dataSourceColLbl()); final private String displayString; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java index 539e435743..5a3da91eff 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java @@ -95,6 +95,7 @@ public class SleuthkitCaseFileInstanceNode extends FileNode { map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.File.toString(), node.getName()); map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.ParentPath.toString(), node.getContent().getParentPath()); map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.HashsetHits.toString(), getHashSetHitsForFile(node.getContent())); + map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.Case.toString(), "TODO"); map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.DataSource.toString(), node.getDataSource()); map.put(SleuthkitCaseFileInstanceNode.SleuthkitCaseFileInstanceNodePropertyType.MimeType.toString(), StringUtils.defaultString(node.content.getMIMEType())); } @@ -107,6 +108,7 @@ public class SleuthkitCaseFileInstanceNode extends FileNode { "SleuthkitCaseFileInstanceNodePropertyType.fileColLbl=File", "SleuthkitCaseFileInstanceNodePropertyType.pathColLbl=Parent Path", "SleuthkitCaseFileInstanceNodePropertyType.hashsetHitsColLbl=Hash Set Hits", + "SleuthkitCaseFileInstanceNodePropertyType.caseColLbl=Case", "SleuthkitCaseFileInstanceNodePropertyType.dataSourceColLbl=Data Source", "SleuthkitCaseFileInstanceNodePropertyType.mimeTypeColLbl=MIME Type" }) @@ -115,6 +117,7 @@ public class SleuthkitCaseFileInstanceNode extends FileNode { File(Bundle.SleuthkitCaseFileInstanceNodePropertyType_fileColLbl()), ParentPath(Bundle.SleuthkitCaseFileInstanceNodePropertyType_pathColLbl()), HashsetHits(Bundle.SleuthkitCaseFileInstanceNodePropertyType_hashsetHitsColLbl()), + Case(Bundle.SleuthkitCaseFileInstanceNodePropertyType_caseColLbl()), DataSource(Bundle.SleuthkitCaseFileInstanceNodePropertyType_dataSourceColLbl()), MimeType(Bundle.SleuthkitCaseFileInstanceNodePropertyType_mimeTypeColLbl());