From 23a0573fcc673f9e1ee348db771d20e1dc7533dc Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jwallace@basistech.com>
Date: Fri, 4 Oct 2013 14:20:04 -0400
Subject: [PATCH] Fixed redundant calls to setupTable/tabs do to node listener.

---
 .../autopsy/corecomponents/DataResultPanel.java  | 14 +++++++++-----
 .../corecomponents/DataResultViewerTable.java    | 16 ++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
index 01929ba341..f7a72f2fbd 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
@@ -612,19 +612,23 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
     
     private class DummyNodeListener implements NodeListener {
         private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
+        private boolean reload = false;
         
         @Override
         public void childrenAdded(final NodeMemberEvent nme) {
-            Node added = nme.getNode();
-            if (added.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
-                // don't set up tabs if the new node is a waiting node
-                return;
+            if (reload) {
+                setupTabs(nme.getNode());
+                reload = false;
             }
-            setupTabs(nme.getNode());
         }
 
         @Override
         public void childrenRemoved(NodeMemberEvent nme) {
+            Node removed = nme.getNode();
+            if (removed.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
+                // set up tabs if the node removed is a waiting node
+                reload = false;
+            }
         }
 
         @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 6c42c9f7bf..ba68cf7a69 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -478,21 +478,21 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
     
     private class DummyNodeListener implements NodeListener {
         private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
-        
+        private boolean reload = false;
         @Override
         public void childrenAdded(NodeMemberEvent nme) {
-            Node added = nme.getNode();
-            if (added.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
-                // If it's the dummy waiting node, we don't want
-                // to reload the table headers
-                return;
+            if (reload = true) {
+                setupTable(nme.getNode());
+                reload = false;
             }
-            setupTable(added);
         }
 
         @Override
         public void childrenRemoved(NodeMemberEvent nme) {
-            
+            Node removed = nme.getNode();
+            if (removed.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
+                reload = true;
+            }
         }
 
         @Override