From 7962a7c6bdafb843f65263d2b3c0dcedaf8f6742 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 16 Jul 2009 13:05:27 +0000 Subject: QPID-1991: dont create Type folder for the known top-level single mbeans git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@794662 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/management/ui/views/NavigationView.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'qpid/java/management/eclipse-plugin/src') diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java index 3322375b4f..ef9a75d702 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java @@ -26,8 +26,13 @@ import java.io.File; 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 @@ public class NavigationView extends ViewPart private PreferenceStore _preferences; // Map of connected servers private HashMap _managedServerMap = new HashMap(); + + private static HashSet _serverTopLevelMBeans = new HashSet(); + { + _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 @@ public class NavigationView extends ViewPart 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" -- cgit v1.2.1