You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/01/26 18:16:15 UTC
svn commit: r737755 -
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Author: ritchiem
Date: Mon Jan 26 17:16:11 2009
New Revision: 737755
URL: http://svn.apache.org/viewvc?rev=737755&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java?rev=737755&r1=737754&r2=737755&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java Mon Jan 26 17:16:11 2009
@@ -80,7 +80,6 @@
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 @@
* @throws IOException
* @throws Exception
*/
- @SuppressWarnings("unchecked")
private void populateDomain(TreeObject domain) throws IOException, Exception
{
ManagedServer server = (ManagedServer) domain.getParent().getManagedObject();
@@ -466,14 +464,18 @@
}
// 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 @@
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);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org