[embjopr-commits] EMBJOPR SVN: r961 - in trunk: core/src/main/java/org/jboss/on/embedded/ui/nav and 1 other directory.
Author: ips
Date: 2010-07-21 16:56:47 -0400 (Wed, 21 Jul 2010)
New Revision: 961
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java
trunk/pom.xml
Log:
do not display subcat nodes that have no child types or child subcats
(https://jira.jboss.org/browse/EMBJOPR-307)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java
===================================================================
---
trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-21
20:55:37 UTC (rev 960)
+++
trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-21
20:56:47 UTC (rev 961)
@@ -71,7 +71,10 @@
Set<ResourceSubCategory> sortedSubCategories = new
TreeSet<ResourceSubCategory>(subCategories);
for (ResourceSubCategory subCategory : sortedSubCategories)
{
- addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory,
parentResource));
+ if (!subCategory.getChildSubCategories().isEmpty() ||
!subCategory.findTaggedResourceTypes().isEmpty())
+ {
+ addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory,
parentResource));
+ }
}
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-21 20:55:37 UTC (rev 960)
+++ trunk/pom.xml 2010-07-21 20:56:47 UTC (rev 961)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.B06</version>
+ <version>3.0.0</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -70,7 +70,7 @@
<jaxb.version>2.1.9</jaxb.version>
<jboss.web.version>3.0.0-beta-2</jboss.web.version>
<richfaces.version>3.3.3.Final</richfaces.version>
- <rhq.version>3.0.0.B06</rhq.version>
+ <rhq.version>3.0.0</rhq.version>
<jopr.version>${rhq.version}</jopr.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>