From a65e43d112e3ba45a837f45bf4aa23cb1e540ae4 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Mon, 23 Jul 2018 16:15:09 -0600
Subject: [PATCH] more merge conflicts

---
 .../commonfilessearch/InterCaseUtils.java     | 27 +++++++++----------
 .../commonfilessearch/IntraCaseUtils.java     |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
index 07e06332f8..f62348fc1e 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
@@ -50,14 +50,13 @@ import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
-import org.sleuthkit.autopsy.commonfilesearch.AbstractCommonAttributeInstanceNode;
+import org.sleuthkit.autopsy.commonfilesearch.AbstractCommonAttributeInstance;
+import org.sleuthkit.autopsy.commonfilesearch.CaseDBCommonAttributeInstanceNode;
+import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstance;
+import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstanceNode;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeSearchResults;
 import org.sleuthkit.autopsy.commonfilesearch.DataSourceLoader;
-import org.sleuthkit.autopsy.commonfilesearch.CaseDBCommonAttributeInstance;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValue;
-import org.sleuthkit.autopsy.commonfilesearch.InterCaseCommonAttributeInstanceNode;
-import org.sleuthkit.autopsy.commonfilesearch.InterCaseCommonAttributeSearchResults;
-import org.sleuthkit.autopsy.commonfilesearch.IntraCaseCommonAttributeInstanceNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.datamodel.AbstractFile;
 
@@ -299,19 +298,19 @@ class InterCaseUtils {
         
         int tally = 0;
         
-        for(Map.Entry<Integer, List<CommonAttributeValue>> entry : searchDomain.getValues().entrySet()){
+        for(Map.Entry<Integer, List<CommonAttributeValue>> entry : searchDomain.getMetadata().entrySet()){
             
-            for(CommonAttributeValue values : entry.getValue()){
+            for(CommonAttributeValue value : entry.getValue()){
                 
-                for(AbstractCommonAttributeInstanceNode commonAttribute : values.getMetadata()){
+                for(AbstractCommonAttributeInstance commonAttribute : value.getInstances()){
                     
-                    if(commonAttribute instanceof InterCaseCommonAttributeSearchResults){
-                        InterCaseCommonAttributeSearchResults results = (InterCaseCommonAttributeSearchResults) commonAttribute;
+                    if(commonAttribute instanceof CentralRepoCommonAttributeInstance){
+                        CentralRepoCommonAttributeInstance results = (CentralRepoCommonAttributeInstance) commonAttribute;
                         for (DisplayableItemNode din : results.generateNodes()){
                             
-                            if(din instanceof InterCaseCommonAttributeInstanceNode){
+                            if(din instanceof CentralRepoCommonAttributeInstanceNode){
                                 
-                                InterCaseCommonAttributeInstanceNode node = (InterCaseCommonAttributeInstanceNode) din;
+                                CentralRepoCommonAttributeInstanceNode node = (CentralRepoCommonAttributeInstanceNode) din;
                                 CorrelationAttributeInstance instance = node.getCorrelationAttributeInstance();
                                 
                                 final String fullPath = instance.getFilePath();
@@ -332,9 +331,9 @@ class InterCaseUtils {
                                 } 
                             }
                             
-                            if(din instanceof IntraCaseCommonAttributeInstanceNode){
+                            if(din instanceof CaseDBCommonAttributeInstanceNode){
                                 
-                                IntraCaseCommonAttributeInstanceNode node = (IntraCaseCommonAttributeInstanceNode) din;
+                                CaseDBCommonAttributeInstanceNode node = (CaseDBCommonAttributeInstanceNode) din;
                                 AbstractFile file = node.getContent();
                                 
                                 final String testFileName = file.getName();
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java
index 550d46be2a..035a16a0ed 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java
@@ -205,7 +205,7 @@ class IntraCaseUtils {
     static Map<Long, String> mapFileInstancesToDataSources(CommonAttributeSearchResults metadata) {
         Map<Long, String> instanceIdToDataSource = new HashMap<>();
 
-        for (Map.Entry<Integer, List<CommonAttributeValue>> entry : metadata.getValues().entrySet()) {
+        for (Map.Entry<Integer, List<CommonAttributeValue>> entry : metadata.getMetadata().entrySet()) {
             for (CommonAttributeValue md : entry.getValue()) {
                 for (AbstractCommonAttributeInstance fim : md.getInstances()) {
                     instanceIdToDataSource.put(fim.getAbstractFileObjectId(), fim.getDataSource());