From 2a9d8c816488d65bd9ba559c28e8875d55dfbad1 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Tue, 3 Apr 2018 13:36:20 -0600
Subject: [PATCH] tweaking stuff to try and get child selection working

---
 .../commonfilesearch/CommonFilesPanel.java    |  7 +++--
 .../corecomponents/DataResultPanel.java       |  9 -------
 .../DataResultTopComponent.java               |  5 ----
 .../corecomponents/DataResultViewerTable.java | 26 +++----------------
 4 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index b871779154..94f94156b9 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -167,13 +167,12 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
 
                     CommonFilesSearchNode commonFilesNode = new CommonFilesSearchNode(metadata);
 
-                    DataResultFilterNode dataResultFilterNode = new DataResultFilterNode(commonFilesNode, DirectoryTreeTopComponent.findInstance().getExplorerManager());
+                    DataResultTopComponent component = DataResultTopComponent.createInstance(title);
+                    
+                    DataResultFilterNode dataResultFilterNode = new DataResultFilterNode(commonFilesNode, DirectoryTreeTopComponent.getDefault().getExplorerManager());
 
                     TableFilterNode tableFilterWithDescendantsNode = new TableFilterNode(dataResultFilterNode);
 
-                    DataResultTopComponent component = DataResultTopComponent.createInstance(title);
-
-                    //component.enableTreeMode();
                     int totalNodes = 0;
                     for (CommonFilesMetaData meta : metadata) {
                         totalNodes += meta.getChildren().size();
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
index 4b921ad5f5..9751bb024a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
@@ -527,15 +527,6 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
         return explorerManager;
     }
 
-    //TODO do we need this???
-    void enableTreeMode() {
-        for(DataResultViewer viewer : this.resultViewers){
-            if(viewer instanceof DataResultViewerTable){
-                ((DataResultViewerTable)viewer).enableTreeMode();
-            }
-        }
-    }
-
     /**
      * Responds to node selection change events from the explorer manager.
      */
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
index 843dd2b6c2..88ad19fa25 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
@@ -118,11 +118,6 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
 
         activeComponentIds.add(title);
     }
-
-    //TODO do we need this???
-    public void enableTreeMode(){
-        this.dataResultPanel.enableTreeMode();
-    }
     
     /**
      * Initialize previously created tc instance with additional data
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 7405f8c9d1..5c2d17be6a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -139,7 +139,10 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
         initComponents();
         
         outlineView.setAllowedDragActions(DnDConstants.ACTION_NONE);
+        
         outline = outlineView.getOutline();
+        outline.setRowSelectionAllowed(true);
+        outline.setColumnSelectionAllowed(true);
         outline.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         outline.setRootVisible(false);    // don't show the root node
         outline.setDragEnabled(false);
@@ -171,8 +174,6 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
 
         outlineView.expandNode(n);
     }
-
-    //DataResultViewerTable.FIRST_COLUMN_LABEL
     
     /**
      * This method is called from within the constructor to initialize the form.
@@ -611,27 +612,6 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
 
     }
 
-    //TODO do we need this???
-    void enableTreeMode() {
-        this.outlineView.addPropertyColumn(title, title);   //TODO
-        
-        this.outlineView.addTreeExpansionListener(new TreeExpansionListener(){
-            @Override
-            public void treeExpanded(TreeExpansionEvent event) {
-                System.out.println(event.toString());
-            }
-
-            @Override
-            public void treeCollapsed(TreeExpansionEvent event) {
-                System.out.println(event.toString());
-            }
-        });
-        
-        for(Node node : this.currentRoot.getChildren().getNodes()){
-            this.outlineView.expandNode(node);
-        }
-    }
-
     /**
      * Encapsulates sorting information for a column to make loadSort simpler.
      */