From c2eea78f65107f1932deadbaab6e27c19bf0ae4d Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Thu, 21 Jun 2018 17:15:14 -0600
Subject: [PATCH] merge problems - wip

---
 Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java         | 4 ++--
 .../autopsy/datamodel/SleuthkitCaseFileInstanceNode.java      | 2 +-
 .../sleuthkit/autopsy/directorytree/DataResultFilterNode.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
index 8b56443b69..8c1f1c0ba1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
@@ -185,13 +185,13 @@ public class Md5Node extends DisplayableItemNode {
         }
 
         @Override
-        protected Node createNodeForKey(FileInstanceMetadata file) {
+        protected Node createNodeForKey(SleuthkitCaseFileInstanceMetadata file) {
             try {
                 Case currentCase = Case.getCurrentCaseThrows();
                 SleuthkitCase tskDb = currentCase.getSleuthkitCase();
                 AbstractFile abstractFile = tskDb.findAllFilesWhere(String.format("obj_id in (%s)", file.getObjectId())).get(0);
                 
-                return new FileInstanceNode(abstractFile, file.getDataSourceName());
+                return new SleuthkitCaseFileInstanceNode(abstractFile, file.getDataSourceName());
             } catch (NoCurrentCaseException | TskCoreException ex) {
                 LOGGER.log(Level.SEVERE, String.format("Unable to create node for file with obj_id: %s.", new Object[]{file.getObjectId()}), ex);
             }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java
index de90bbc650..8cb5916115 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java
@@ -46,7 +46,7 @@ public class SleuthkitCaseFileInstanceNode extends FileNode {
      * @param fsContent
      * @param dataSource 
      */
-    public FileInstanceNode(AbstractFile fsContent, String dataSource) {
+    public SleuthkitCaseFileInstanceNode(AbstractFile fsContent, String caseName, String dataSource) {
         super(fsContent);
         this.content = fsContent;
         this.caseName = caseName;
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
index 7c0937c67e..ee94355707 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
@@ -51,7 +51,6 @@ import org.sleuthkit.autopsy.datamodel.DataModelActionsFactory;
 import org.sleuthkit.autopsy.datamodel.DirectoryNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
-import org.sleuthkit.autopsy.datamodel.FileInstanceNode;
 import org.sleuthkit.autopsy.datamodel.FileNode;
 import org.sleuthkit.autopsy.datamodel.FileTypeExtensions;
 import org.sleuthkit.autopsy.datamodel.FileTypes.FileTypesNode;
@@ -63,6 +62,7 @@ import org.sleuthkit.autopsy.datamodel.Md5Node;
 import org.sleuthkit.autopsy.datamodel.NodeSelectionInfo;
 import org.sleuthkit.autopsy.datamodel.Reports;
 import org.sleuthkit.autopsy.datamodel.SlackFileNode;
+import org.sleuthkit.autopsy.datamodel.SleuthkitCaseFileInstanceNode;
 import org.sleuthkit.autopsy.datamodel.VirtualDirectoryNode;
 import static org.sleuthkit.autopsy.directorytree.Bundle.*;
 import org.sleuthkit.autopsy.modules.embeddedfileextractor.ExtractArchiveWithPasswordAction;
@@ -540,7 +540,7 @@ public class DataResultFilterNode extends FilterNode {
         }
         
         @Override
-        public AbstractAction visit(FileInstanceNode fin){
+        public AbstractAction visit(SleuthkitCaseFileInstanceNode fin){
             return null;
         }