From eb25ec3d809436d28c0d62b45a180e3b66826e9f Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dgrove" <dgrove@WIN-DGROV-4999.basistech.net>
Date: Thu, 15 Feb 2018 12:04:34 -0500
Subject: [PATCH] Cleanup.

---
 .../DataResultTopComponent.java               | 51 ++++---------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
index 674a52bbf8..6e4ceeb18f 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2011-2018 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,13 +18,9 @@
  */
 package org.sleuthkit.autopsy.corecomponents;
 
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JComponent;
 import org.openide.explorer.ExplorerManager;
@@ -61,18 +57,16 @@ import org.sleuthkit.autopsy.coreutils.Logger;
  * DataResultPanel.
  */
 @RetainLocation("editor")
-public class DataResultTopComponent extends TopComponent implements DataResult, FocusListener, ExplorerManager.Provider {
+public class DataResultTopComponent extends TopComponent implements DataResult, ExplorerManager.Provider {
 
     private static final Logger logger = Logger.getLogger(DataResultTopComponent.class.getName());
     private final ExplorerManager explorerManager = new ExplorerManager();
     private final DataResultPanel dataResultPanel; //embedded component with all the logic
-    private int dataContentTabIndex = 0;
     private boolean isMain;
     private String customModeName;
 
     //keep track of tcs opened for menu presenters
     private static final List<String> activeComponentIds = Collections.synchronizedList(new ArrayList<String>());
-    private static final Map<String, Integer> dataContentTabIndexes = Collections.synchronizedMap(new HashMap<String, Integer>());
 
     /**
      * Create a new data result top component
@@ -105,38 +99,24 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
         initComponents();
         customizeComponent(isMain, name);
     }
-    
-    @Override
-    public boolean requestFocusInWindow() {
-        return super.requestFocusInWindow();
-    }
-    
+
     @Override
     public void componentActivated() {
         super.componentActivated();
-        
+
+        /*
+         * Syncronize the data content viewer to show the currently selected
+         * item in the data results if only one is selected, or show nothing
+         * otherwise.
+         */
         DataContentTopComponent dataContentTopComponent = DataContentTopComponent.findInstance();
         Node[] nodeList = explorerManager.getSelectedNodes();
-        
+
         if (nodeList.length == 1) {
             dataContentTopComponent.setNode(nodeList[0]);
         } else {
             dataContentTopComponent.setNode(null);
         }
-        
-        int selectedIndex = dataContentTopComponent.getTabPanels().getSelectedIndex();
-        dataContentTabIndexes.put(dataResultPanel.getName(), selectedIndex);
-    }
-    
-    @Override
-    public void componentHidden() {
-        super.componentHidden();
-        
-        DataContentTopComponent dataContentTopComponent = DataContentTopComponent.findInstance();
-        Integer selectedIndex = dataContentTabIndexes.get(dataResultPanel.getName());
-        if (selectedIndex != null) {
-            dataContentTopComponent.getTabPanels().setSelectedIndex(selectedIndex);
-        }
     }
 
     private void customizeComponent(boolean isMain, String title) {
@@ -153,7 +133,6 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
         putClientProperty(TopComponent.PROP_CLOSING_DISABLED, isMain); // set option to close compoment in GUI
         putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, true);
         putClientProperty(TopComponent.PROP_DRAGGING_DISABLED, true);
-        addFocusListener(this);
 
         activeComponentIds.add(title);
     }
@@ -380,14 +359,4 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
     void setNumMatches(int matches) {
         this.dataResultPanel.setNumMatches(matches);
     }
-
-    @Override
-    public void focusGained(FocusEvent fe) {
-        System.out.println("focusGained");
-    }
-
-    @Override
-    public void focusLost(FocusEvent fe) {
-        System.out.println("focusLost");
-    }
 }