modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
| 47 ++++++----
2 files changed, 30 insertions(+), 19 deletions(-)
New commits:
commit 33102e3c93fe12e53beec85fa2e62cea625e2da6
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 24 14:56:15 2011 -0500
fix several bugs on the Administration/Configuration/Templates view: 1) no platform
services were getting loaded, 2) server type tree was flat, and 3) even leaf nodes in
server type tree had an expand icon
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
index 4e4a549..9df8f83 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
@@ -202,8 +202,6 @@ public class ResourceTypeTreeNodeBuilder {
setAttribute(ATTRIB_DISABLED_ALERT_TEMPLATES,
composite.getDisabledAlertCount());
setAttribute(ATTRIB_DISABLED_METRIC_TEMPLATES,
composite.getEnabledMetricCount());
setAttribute(ATTRIB_ENABLED_METRIC_TEMPLATES,
composite.getDisabledMetricCount());
-
- setIsFolder(true);
}
@Override
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
index e225f7e..f153c81 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
@@ -397,7 +397,16 @@ public class ResourceTypeManagerBean implements
ResourceTypeManagerLocal, Resour
@SuppressWarnings("unchecked")
List<ResourceTypeTemplateCountComposite> results =
(List<ResourceTypeTemplateCountComposite>) templateCountQuery.getResultList();
- // we don't need to send all the data in resource types over the wire, so
we'll be scrubbing the types
+ for (ResourceTypeTemplateCountComposite result : results) {
+ ResourceType type = result.getType();
+
+ // TODO (ips, 01/24/11): I tried to fetch the parents via the
+ // ResourceType.FIND_ALL_TEMPLATE_COUNT_COMPOSITES
named query,
+ // but was unable to get it working. This will suffice
for the time being.
+ type.getParentResourceTypes().size();
+ }
+
+ // we don't need to send all the data in resource types over the wire, so
we'll be scrubbing the types;
// to avoid the scrubbed types getting persisted back to the db, let's clear
the persistence context
entityManager.clear();
@@ -405,23 +414,9 @@ public class ResourceTypeManagerBean implements
ResourceTypeManagerLocal, Resour
for (ResourceTypeTemplateCountComposite result : results) {
ResourceType type = result.getType();
- // scrub it to avoid sending data over the wire we don't need
+ // scrub it to avoid sending data over the wire we don't need;
// some of these are eagerly loaded, but my paranoia says assume everything
is eagerly loaded to purge it all
- type.setBundleType(null);
- type.setChildResourceTypes(null);
- type.setChildSubCategories(null);
- type.setClassLoaderType(null);
- type.setEventDefinitions(null);
- type.setMetricDefinitions(null);
- type.setOperationDefinitions(null);
- type.setPackageTypes(null);
- type.setPluginConfigurationDefinition(null);
- type.setProcessScans(null);
- type.setProductVersions(null);
- type.setResourceConfigurationDefinition(null);
- type.setResourceGroups(null);
- type.setResources(null);
- type.setSubCategory(null);
+ scrubType(type);
compositeMap.put(type.getId(), result);
}
@@ -429,6 +424,24 @@ public class ResourceTypeManagerBean implements
ResourceTypeManagerLocal, Resour
return compositeMap;
}
+ private void scrubType(ResourceType type) {
+ type.setBundleType(null);
+ type.setChildResourceTypes(null);
+ type.setChildSubCategories(null);
+ type.setClassLoaderType(null);
+ type.setEventDefinitions(null);
+ type.setMetricDefinitions(null);
+ type.setOperationDefinitions(null);
+ type.setPackageTypes(null);
+ type.setPluginConfigurationDefinition(null);
+ type.setProcessScans(null);
+ type.setProductVersions(null);
+ type.setResourceConfigurationDefinition(null);
+ type.setResourceGroups(null);
+ type.setResources(null);
+ type.setSubCategory(null);
+ }
+
@SuppressWarnings("unchecked")
public List<ResourceType> getResourceTypesByPlugin(String pluginName) {
final String queryName = ResourceType.QUERY_FIND_BY_PLUGIN;
Show replies by date