[BZ 1069545] Updates to the tree build structure.

rhq-project · Apr 30, 2014 · 79eab8e · 79eab8e
1 parent 916d0f3
commit 79eab8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.../client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/.../client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
@@ -265,6 +265,7 @@ private ResourceType parseServerDescriptor(ServerDescriptor serverDescriptor, Re
             serverResourceType = new ResourceType(serverDescriptor.getName(), pluginDescriptor.getName(),
                 ResourceCategory.SERVER, parentServerType);
             serverResourceType.setDescription(serverDescriptor.getDescription());
+            serverResourceType.setSubCategory(serverDescriptor.getSubCategory());
             serverResourceType.setCreationDataType(convertCreationDataType(serverDescriptor.getCreationDataType()));
             serverResourceType
                 .setCreateDeletePolicy(convertCreateDeletePolicy(serverDescriptor.getCreateDeletePolicy()));
@@ -387,6 +388,7 @@ private ResourceType parseServiceDescriptor(ServiceDescriptor serviceDescriptor,
             serviceResourceType = new ResourceType(serviceDescriptor.getName(), pluginDescriptor.getName(),
                 ResourceCategory.SERVICE, parentType);
             serviceResourceType.setDescription(serviceDescriptor.getDescription());
+            serviceResourceType.setSubCategory(serviceDescriptor.getSubCategory());
             serviceResourceType.setCreationDataType(convertCreationDataType(serviceDescriptor.getCreationDataType()));
             serviceResourceType.setCreateDeletePolicy(convertCreateDeletePolicy(serviceDescriptor
                 .getCreateDeletePolicy()));

diff --git a/...i/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/...i/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -486,10 +486,9 @@ public void loadTree(ResourceGroupEnhancedTreeNode parentNode, ClusterFlyweight
 
                 // Insert subcategory node(s) if the type has a subcategory.
                 if (childType.getSubCategory() != null) {
-                    ResourceGroupEnhancedTreeNode lastSubcategoryNode = null;
-
-                    String[] subcategoryHierarchy = childType.getSubCategory().split("|");
+                    String[] subcategoryHierarchy = childType.getSubCategory().split("\\|");
                     ResourceGroupEnhancedTreeNode parentSubcategory = null;
+
                     for(String currentSubCategory: subcategoryHierarchy){
                         ResourceGroupEnhancedTreeNode currentSubcategoryNode = subCategoryNodesByName
                             .get(currentSubCategory);

diff --git a/...rc/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/...rc/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -317,15 +317,15 @@ private static List<TreeNode> introduceTypeAndCategoryNodes(final List<ResourceT
     private static void addSubCategoryNodes(List<TreeNode> allNodes, Set<String> allNodeIds, Resource resource) {
         Resource parentResource = resource.getParentResource();
         ResourceType type = resource.getResourceType();
-        String subCategory = type.getSubCategory();
+
         String subCategoryNodeId = null;
 
-        String[] subCategories = subCategory.split("|");
+        String[] subCategories = type.getSubCategory().split("\\|");
         for (String currentSubCategory : subCategories) {
             subCategoryNodeId = SubCategoryTreeNode.idOf(currentSubCategory, parentResource);
 
             if (!allNodeIds.contains(subCategoryNodeId)) {
-                SubCategoryTreeNode subCategoryNode = new SubCategoryTreeNode(subCategory, parentResource);
+                SubCategoryTreeNode subCategoryNode = new SubCategoryTreeNode(currentSubCategory, parentResource);
                 allNodeIds.add(subCategoryNodeId);
                 allNodes.add(subCategoryNode);
             }

diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -10464,7 +10464,7 @@
            discovery="SubsystemDiscovery"
            description="JBoss Diagnostic Reporter (JDR) Subsystem."
            singleton="true"
-           subCategory="Subsystems">
+           subCategory="Subsystems|Weird">
 
     <runs-inside>
       <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>