[embjopr-commits] EMBJOPR SVN: r960 - in branches/EmbJopr_1_3: core/src/main/java/org/jboss/on/embedded/ui/nav and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ips
Date: 2010-07-21 16:55:37 -0400 (Wed, 21 Jul 2010)
New Revision: 960

Modified:
   branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java
   branches/EmbJopr_1_3/pom.xml
Log:
do not display subcat nodes that have no child types or child subcats (https://jira.jboss.org/browse/EMBJOPR-307)

Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java
===================================================================
--- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java	2010-07-20 01:47:28 UTC (rev 959)
+++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java	2010-07-21 20:55:37 UTC (rev 960)
@@ -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: branches/EmbJopr_1_3/pom.xml
===================================================================
--- branches/EmbJopr_1_3/pom.xml	2010-07-20 01:47:28 UTC (rev 959)
+++ branches/EmbJopr_1_3/pom.xml	2010-07-21 20:55:37 UTC (rev 960)
@@ -55,8 +55,8 @@
 
 
     <properties>
-        <jbas4.finalName>jbas4-admin-console</jbas4.finalName>
-        <jbas5.finalName>jbas5-admin-console</jbas5.finalName>
+        <jbas4.finalName>admin-console</jbas4.finalName>
+        <jbas5.finalName>admin-console</jbas5.finalName>
 
         <!-- dependency groupIds -->
         <rhq.groupId>org.rhq</rhq.groupId>
@@ -163,7 +163,7 @@
 
     <modules>
         <module>core</module>
-        <module>jbas4</module>
+        <!--<module>jbas4</module>-->
         <module>jbas5</module>
         <!--<module>jsfunit</module>-->
     </modules>