From f03eb1c7d39e9d5f526e965b6e75c03388055179 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 26 Jan 2009 17:16:11 +0000 Subject: QPID-1591 : Patch from Robbert Gemmell : Moves the server list to be the main entries in the left panel. Having a Qpid Connections node that the user had to open to see their severs was just an extra click too much. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@737755 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/management/ui/views/NavigationView.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'java/management/eclipse-plugin/src') 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 1da13a9b56..ec8a612d41 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 @@ -80,7 +80,6 @@ public class NavigationView extends ViewPart private static final String INI_EXCHANGES = EXCHANGE + "s"; private TreeViewer _treeViewer = null; - private TreeObject _rootNode = null; private TreeObject _serversRootNode = null; private PreferenceStore _preferences; @@ -444,7 +443,6 @@ public class NavigationView extends ViewPart * @throws IOException * @throws Exception */ - @SuppressWarnings("unchecked") private void populateDomain(TreeObject domain) throws IOException, Exception { ManagedServer server = (ManagedServer) domain.getParent().getManagedObject(); @@ -466,14 +464,18 @@ public class NavigationView extends ViewPart } // To make it work with the broker without virtual host implementation. // This will add the default nodes to the domain node + boolean hasVirtualHost = false; for (TreeObject child : domain.getChildren()) { - if (!child.getName().startsWith(VIRTUAL_HOST)) + if (child.getName().startsWith(VIRTUAL_HOST)) { - addDefaultNodes(domain); + hasVirtualHost = true; + break; } - - break; + } + + if (!hasVirtualHost){ + addDefaultNodes(domain); } } @@ -954,11 +956,9 @@ public class NavigationView extends ViewPart composite.setLayout(gridLayout); createTreeViewer(composite); - _rootNode = new TreeObject("ROOT", "ROOT"); _serversRootNode = new TreeObject(NAVIGATION_ROOT, "ROOT"); - _serversRootNode.setParent(_rootNode); - _treeViewer.setInput(_rootNode); + _treeViewer.setInput(_serversRootNode); // set viewer as selection event provider for MBeanView getSite().setSelectionProvider(_treeViewer); -- cgit v1.2.1