To make this management console with the java broker with no virtual host mbean implementation, default virtual host is assigned to all mbeans

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

6 files changed, 52 insertions, 23 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
index b3efc107da..5c3b45a8f2 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
@@ -41,6 +41,7 @@ public class Constants
     public final static String NOTIFICATION = "Notifications";
     public final static String RESULT = "Result";
     public final static String VIRTUAL_HOST = "VirtualHost";
+    public final static String DEFAULT_VH = "Default";
     
     // Attributes and operations are used to customize the GUI for Qpid. If these are changes in the
     // Qpid server, then these should be updated accordingly
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
index 4cdfffa459..41c33e6934 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
@@ -88,7 +88,8 @@ public abstract class ManagedBean extends ManagedObject
     
     public String getVirtualHostName()
     {
-        return _virtualHostName;
+        // To make it work with the broker with no virtual host implementation
+        return _virtualHostName == null ? Constants.DEFAULT_VH : _virtualHostName;
     }
     
     /**
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
index 37c0fba2ef..31650295ed 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
@@ -117,7 +117,8 @@ public class MBeanTypeTabControl
             {
                 try
                 {
-                    refresh(_type);
+                    // refresh the list from the broker server
+                    populateList();
                 }
                 catch (Exception ex)
                 {
@@ -131,6 +132,7 @@ public class MBeanTypeTabControl
             {
                 try
                 {
+                    // sort the stored list of items
                     java.util.List<String> list = new ArrayList<String>(_objectsMap.keySet());
                     Collections.sort(list);
                     _list.setItems(list.toArray(new String[0]));
@@ -147,6 +149,7 @@ public class MBeanTypeTabControl
             {
                 try
                 {
+                    // sort the stored list of items
                     sortQueuesByQueueDepth();
                 }
                 catch (Exception ex)
@@ -254,8 +257,6 @@ public class MBeanTypeTabControl
         _sortByConsumercountButton = _toolkit.createButton(sortingGroup, "Consumer Count", SWT.RADIO);
         gridData = new GridData(SWT.LEAD, SWT.CENTER, true, false);
         _sortByConsumercountButton.setLayoutData(gridData);
-        
-        selectDefaultSortingButton();
     }
     
     private void selectDefaultSortingButton()
@@ -269,6 +270,7 @@ public class MBeanTypeTabControl
     {
         _type = typeName;
         setHeader();
+        selectDefaultSortingButton();
         populateList();
         
         _listComposite.layout();
@@ -303,27 +305,41 @@ public class MBeanTypeTabControl
         {
             list = serverRegistry.getQueues(MBeanView.getVirtualHost());
             items = getQueueItems(list);
-            selectDefaultSortingButton();
+            // sort the refreshed list in the selected order
+            if (_sortBySizeButton.getSelection())
+            {
+                sortQueuesByQueueDepth();
+            }
+            else if (_sortByConsumercountButton.getSelection())
+            {
+                sortQueuesByConsumerCount();
+            }
+            else
+            {
+                _list.setItems(items);
+            }
             _sortingComposite.setVisible(true);
         }
-        else if (_type.equals(Constants.EXCHANGE))
-        {
-            list = serverRegistry.getExchanges(MBeanView.getVirtualHost());
-            items = getItems(list);
-            _sortingComposite.setVisible(false);
-        }
-        else if (_type.equals(Constants.CONNECTION))
-        {
-            list = serverRegistry.getConnections(MBeanView.getVirtualHost());
-            items = getItems(list);
-            _sortingComposite.setVisible(false);
-        }
         else
         {
-            throw new Exception("Unknown mbean type " + _type);
-        }
-        
-        _list.setItems(items);           
+            if (_type.equals(Constants.EXCHANGE))
+            {
+                list = serverRegistry.getExchanges(MBeanView.getVirtualHost());
+                items = getItems(list);
+                _sortingComposite.setVisible(false);
+            }
+            else if (_type.equals(Constants.CONNECTION))
+            {
+                list = serverRegistry.getConnections(MBeanView.getVirtualHost());
+                items = getItems(list);
+                _sortingComposite.setVisible(false);
+            }
+            else
+            {
+                throw new Exception("Unknown mbean type " + _type);
+            }
+            _list.setItems(items);  
+        }        
     }
     
     // sets the map with appropriate mbean and name
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index af429553dc..aee016202e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
@@ -295,6 +295,16 @@ public class NavigationView extends ViewPart
                 addManagedBean(domain, mbean);
             }
         }
+        // To make it work with the broker without virtual host implementation.
+        // This will add the default nodes to the domain node
+        for (TreeObject child : domain.getChildren())
+        {
+            if (!child.getName().startsWith(Constants.VIRTUAL_HOST))
+            {
+                addDefaultNodes(domain);
+            }
+            break;
+        }
     }
     
     /**
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index fc42561c75..c95c9e2bd1 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
@@ -153,7 +153,7 @@ public class OperationTabControl extends TabControl
     {
         _mbean = mbean;
         _opData = opData;
-        _virtualHostName = _mbean.getProperty(Constants.VIRTUAL_HOST);
+        _virtualHostName = _mbean.getVirtualHostName();
         
         // Setting the form to be invisible. Just in case the mbean server connection
         // is done and it takes time in getting the response, then the ui should be blank
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
index 29d6b2edc4..511c2d7150 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
@@ -101,7 +101,8 @@ public class TreeObject
     
     public String getVirtualHost()
     {
-        return _virtualHost;
+        // To make it work with the broker with no virtual host implementation
+        return _virtualHost == null ? Constants.DEFAULT_VH : _virtualHost;
     }
     
     public void setVirtualHost(String vHost)