svn commit: r794662 - /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java

[ro...@apache.org]

Author: robbie
Date: Thu Jul 16 13:05:27 2009
New Revision: 794662

URL: http://svn.apache.org/viewvc?rev=794662&view=rev
Log:
QPID-1991: dont create Type folder for the known top-level single mbeans

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=794662&r1=794661&r2=794662&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 Thu Jul 16 13:05:27 2009
@@ -26,8 +26,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
+import org.apache.qpid.management.common.mbeans.ConfigurationManagement;
+import org.apache.qpid.management.common.mbeans.LoggingManagement;
+import org.apache.qpid.management.common.mbeans.ServerInformation;
+import org.apache.qpid.management.common.mbeans.UserManagement;
 import org.apache.qpid.management.ui.ApplicationRegistry;
 import org.apache.qpid.management.ui.ManagedBean;
 import org.apache.qpid.management.ui.ManagedServer;
@@ -88,6 +93,14 @@
     private PreferenceStore _preferences;
     // Map of connected servers
     private HashMap<ManagedServer, TreeObject> _managedServerMap = new HashMap<ManagedServer, TreeObject>();
+    
+    private static HashSet<String> _serverTopLevelMBeans = new HashSet<String>();
+    {
+        _serverTopLevelMBeans.add(UserManagement.TYPE); 
+        _serverTopLevelMBeans.add(LoggingManagement.TYPE);
+        _serverTopLevelMBeans.add(ConfigurationManagement.TYPE);
+        _serverTopLevelMBeans.add(ServerInformation.TYPE);
+    }
 
     private void createTreeViewer(Composite parent)
     {
@@ -566,6 +579,14 @@
         for (int i = 0; i < types.length; i++)
         {
             String type = types[i];
+            
+            if(types.length == 1 && _serverTopLevelMBeans.contains(type))
+            {
+                //This mbean is not to be contained in a type hierarchy
+                //Just add it as a child of the server node.
+                break;
+            }
+            
             String valueOftype = mbean.getProperty(type);
             // If value is not null, then there will be a parent node for this mbean
             // eg. for type=VirtualHost the value is "test"



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org