QPID-1947: leave the components visible during update to prevent focus-switching issues during automated refresh

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793925 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 14 insertions, 77 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index 587556e8a0..2408faae3a 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
@@ -557,7 +557,7 @@ public class AttributesTabControl extends TabControl
                         AttributeData data = (AttributeData)button.getParent().getData();
                         MBeanUtility.updateAttribute(_mbean, data, text.getText());
                         button.getShell().close();
-                        refresh();
+                        refresh(_mbean);
                     }
                     catch (Exception ex)
                     {
@@ -569,14 +569,6 @@ public class AttributesTabControl extends TabControl
         return updateButton;
     }    
 
-    // Refresh from the server registry
-    public void refresh()
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(_mbean);
-        ManagedAttributeModel attributesList = serverRegistry.getAttributeModel(_mbean);
-        _tableViewer.setInput(attributesList);
-    }
-    
     /**
      * Refreshes the attribute tab by querying the mbean server for latest values
      */ 
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
index ebb7a7bada..95598689fb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
@@ -117,13 +117,6 @@ public class ConnectionOperationsTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;  
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-        
         _channels = null;
         try
         {
@@ -135,9 +128,8 @@ public class ConnectionOperationsTabControl extends TabControl
             MBeanUtility.handleException(mbean,e);
         }
         
-        _form.setVisible(false);
         _tableViewer.setInput(_channels);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index f05df554cd..2ad47ff4db 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
@@ -122,13 +122,6 @@ public class ExchangeOperationsTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;  
-        if (_mbean == null)
-        {
-            _keysTableViewer.setInput(null);
-            return;
-        }
-        
         _bindings = null;
         try
         {
@@ -140,9 +133,8 @@ public class ExchangeOperationsTabControl extends TabControl
             MBeanUtility.handleException(mbean,e);
         }
 
-        _form.setVisible(false);
         _keysTableViewer.setInput(_bindings);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index 82f035326b..66c077f876 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
@@ -123,13 +123,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;  
-        if (_mbean == null)
-        {
-            _bindingNumberTableViewer.setInput(null);
-            return;
-        }
-        
+
         _bindings = null;
         try
         {
@@ -141,9 +135,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
             MBeanUtility.handleException(mbean,e);
         }
 
-        _form.setVisible(false);
         _bindingNumberTableViewer.setInput(_bindings);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
index 5303c2e077..e5e81b769c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
@@ -125,13 +125,6 @@ public class ConfigurationFileTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-
         String configFileRootLoggerLevel = "-";
         try
         {
@@ -162,7 +155,6 @@ public class ConfigurationFileTabControl extends TabControl
             MBeanUtility.handleException(_mbean, e3);
         }
         
-        _form.setVisible(false);                
         _configFileRootLoggerLevelLabel.setText(String.valueOf(configFileRootLoggerLevel));
         if (log4jLogWatchInterval == 0)
         {
@@ -173,7 +165,7 @@ public class ConfigurationFileTabControl extends TabControl
             _logWatchIntervalLabel.setText(String.valueOf(log4jLogWatchInterval) + " seconds");
         }
         _tableViewer.setInput(_configFileLoggerLevels);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
index c0110d7506..a43506fc50 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
@@ -124,13 +124,6 @@ public class RuntimeTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;  
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-        
         String runtimeRootLoggerLevel = "-";
         try
         {
@@ -151,10 +144,9 @@ public class RuntimeTabControl extends TabControl
             MBeanUtility.handleException(_mbean, e2);
         }
         
-        _form.setVisible(false);
         _runtimeRootLoggerLevelLabel.setText(String.valueOf(runtimeRootLoggerLevel));
         _tableViewer.setInput(_runtimeLoggerLevels);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index 4fdc384850..6f5e0f48d2 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
@@ -131,13 +131,6 @@ public class QueueOperationsTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;  
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-        
         _messages = null;
         try
         {
@@ -154,9 +147,8 @@ public class QueueOperationsTabControl extends TabControl
             MBeanUtility.handleException(mbean,e);
         }
         
-        _form.setVisible(false);
         _tableViewer.setInput(_messages);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
index 53ed86901b..a16fbf8c98 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
@@ -104,9 +104,9 @@ public abstract class MBeanTypeTabControl extends TabControl
     public void refresh(ManagedBean mbean)
     {
         _mbeans = getMbeans();
-        _form.setVisible(false);
+        
         _tableViewer.setInput(_mbeans);
-        _form.setVisible(true);
+
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
index 61ac67d732..b2f7a964c3 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
@@ -113,13 +113,7 @@ public class UserManagementTabControl extends TabControl
     @Override
     public void refresh(ManagedBean mbean)
     {
-        _mbean = mbean;
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-        
+        _userDetails = null;
         try
         {
             _userDetails = (TabularDataSupport) _ummb.viewUsers();
@@ -127,12 +121,11 @@ public class UserManagementTabControl extends TabControl
         catch(Exception e)
         {
             MBeanUtility.handleException(_mbean, e);
-            _userDetails = null;
+            
         }
 
-        _form.setVisible(false);
         _tableViewer.setInput(_userDetails);
-        _form.setVisible(true);
+        
         layout();
     }
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
index 9b18901d86..79e8c6612e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
@@ -125,10 +125,9 @@ public class VHostTabControl extends TabControl
         queues = serverRegistry.getQueues(MBeanView.getVirtualHost());
         exchanges = serverRegistry.getExchanges(MBeanView.getVirtualHost());
 
-        _form.setVisible(false);
         _queueTableViewer.setInput(queues);
         _exchangeTableViewer.setInput(exchanges);
-        _form.setVisible(true);
+        
         layout();
     }