From 572c1af5a3967831a3984d6e13bffe0815c1ef4c Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Mon, 11 Mar 2019 14:02:23 -0400
Subject: [PATCH] 4792 adjustments to support intra-case other ocurrences again

---
 .../DataContentViewerOtherCases.java           | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
index 7853fcaeed..75b6875f2c 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
@@ -774,10 +774,19 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
             // get correlation and reference set instances from DB
             correlatedNodeDataMap.putAll(getCorrelatedInstances(corAttr, dataSourceName, deviceId));
             for (OtherOccurrenceNodeInstanceData nodeData : correlatedNodeDataMap.values()) {
-                try {
-                    caseNames.put(nodeData.getCorrelationAttributeInstance().getCorrelationCase().getCaseUUID(), nodeData.getCorrelationAttributeInstance().getCorrelationCase());
-                } catch (EamDbException ex) {
-                    System.out.println("can't get correlation case");
+                if (nodeData.isCentralRepoNode()) {
+                    try {
+                        caseNames.put(nodeData.getCorrelationAttributeInstance().getCorrelationCase().getCaseUUID(), nodeData.getCorrelationAttributeInstance().getCorrelationCase());
+                    } catch (EamDbException ex) {
+                        System.out.println("can't get correlation case");
+                    }
+                } else {
+                    try {
+                    caseNames.put(Case.getCurrentCaseThrows().getName(), new CorrelationCase(Case.getCurrentCaseThrows().getName(), Case.getCurrentCaseThrows().getDisplayName()));
+                    } catch (NoCurrentCaseException ex){
+                        System.out.println("NO cURRENT CASE");
+                    }
+                    
                 }
             }
         }
@@ -852,7 +861,6 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
                         try {
                             if (((CorrelationCase) casesTableModel.getRow(caseTable.convertRowIndexToModel(selectedCaseRow))).getCaseUUID().equals(nodeData.getCorrelationAttributeInstance().getCorrelationCase().getCaseUUID())
                                     && dataSourceModel.getValueAt(dataSourceTable.convertRowIndexToModel(selectedDataSourceRow), 1).toString().equals(nodeData.getDeviceID())) {
-                                System.out.println(((CorrelationCase) casesTableModel.getRow(caseTable.convertRowIndexToModel(selectedCaseRow))).getCaseUUID());
                                 tableModel.addNodeData(nodeData);
                             }
                         } catch (EamDbException ex) {