5:23 p.m.
Author: ips
Date: 2009-07-28 18:23:19 -0400 (Tue, 28 Jul 2009)
New Revision: 611
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
trunk/core/src/main/webapp/WEB-INF/pages.xml
trunk/core/src/main/webapp/include/resourceDataScroller.xhtml
trunk/core/src/main/webapp/secure/categorySummary.xhtml
trunk/core/src/main/webapp/secure/repeatNav.xhtml
Log:
some minor refactoring (renaming of variables etc.) while investigating
https://jira.jboss.org/jira/browse/EMBJOPR-197; also added a commented-out a4j:log tag on
resourceDataScroller.xhtml that can be uncommented to further debug EMBJOPR-197
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java 2009-07-28
18:43:52 UTC (rev 610)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java 2009-07-28
22:23:19 UTC (rev 611)
@@ -47,9 +47,9 @@
*/
public static final String ROOT = "root";
/**
- * action outcome indicating that a category summary table should be displayed
+ * action outcome indicating that a subCategory summary table should be displayed
*/
- public static final String CATEGORY_TABLE = "table";
+ public static final String SUB_CATEGORY = "subCategory";
/**
* action outcome indicating that the navigation should simply be repeated
*/
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2009-07-28
18:43:52 UTC (rev 610)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2009-07-28
22:23:19 UTC (rev 611)
@@ -55,7 +55,12 @@
import org.jboss.on.embedded.ui.nav.SubCategoryTreeNode;
/**
- * blah
+ * The Seam component that backs all three Summary tab pages:
+ * <ul>
+ * <li>/secure/resourceInstanceSummary.xhtml
+ * <li>/secure/resourceTypeSummary.xhtml
+ * <li>/secure/categorySummary.xhtml
+ * </ul>
*
* @author Jessica Sant
*/
@@ -67,11 +72,10 @@
private transient FacesMessages facesMessages;
/**
- * the category that was selected based on the path request parameter
+ * the subCategory that was selected based on the path request parameter
*/
- // TODO should be renamed categoryNode or subCategoryNode
- @Out(required = false)
- private SubCategoryTreeNode category;
+ @Out(required = false, scope = ScopeType.PAGE)
+ private SubCategoryTreeNode subCategory;
/**
* the resourceType that was selected based on the path request parameter
@@ -197,12 +201,12 @@
String outcome = FacesOutcomes.REPEAT_NAV;
if (!this.selectedNode.isLeaf())
{
- outcome = FacesOutcomes.CATEGORY_TABLE;
+ outcome = FacesOutcomes.SUB_CATEGORY;
outcome = addResourcesToList(outcome, this.selectedNode);
}
- // whatever happens make sure we set the categoryNode
- SummaryAction.this.category = this.selectedNode;
+ // Whatever happens, make sure we set the subCategory field.
+ SummaryAction.this.subCategory = this.selectedNode;
return outcome;
}
@@ -304,7 +308,7 @@
public SubCategoryTreeNode getSubCategoryNode()
{
- return category;
+ return subCategory;
}
@@ -334,7 +338,7 @@
{
SubCategoryTreeNode subCatTreeNode = (SubCategoryTreeNode)selectedNode;
addResourcesToList("", subCatTreeNode);
- this.category = subCatTreeNode;
+ this.subCategory = subCatTreeNode;
}
}
FacesContext.getCurrentInstance().renderResponse();
Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/pages.xml 2009-07-28 18:43:52 UTC (rev 610)
+++ trunk/core/src/main/webapp/WEB-INF/pages.xml 2009-07-28 22:23:19 UTC (rev 611)
@@ -54,7 +54,7 @@
<rule if-outcome="repeatNav">
<render view-id="/secure/repeatNav.xhtml"/>
</rule>
- <rule if-outcome="table">
+ <rule if-outcome="subCategory">
<render view-id="/secure/categorySummary.xhtml"/>
</rule>
<rule if-outcome="root">
Modified: trunk/core/src/main/webapp/include/resourceDataScroller.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-07-28 18:43:52 UTC
(rev 610)
+++ trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-07-28 22:23:19 UTC
(rev 611)
@@ -128,7 +128,11 @@
<f:selectItems value="#{tableManager.pageSizes}"/>
</h:selectOneListbox>
</h:panelGroup>
+
+ <a4j:log rendered="false" popup="false"
level="ALL" style="width: 800px; height: 400px;"/>
+
</ui:composition>
+
</f:view>
</body>
Modified: trunk/core/src/main/webapp/secure/categorySummary.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-07-28 18:43:52 UTC (rev
610)
+++ trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-07-28 22:23:19 UTC (rev
611)
@@ -33,7 +33,7 @@
<f:view>
<ui:composition template="/layout.xhtml">
- <ui:define
name="pagetitle">#{category.subCategory.name}</ui:define>
+ <ui:define
name="pagetitle">#{subCategory.subCategory.name}</ui:define>
<ui:define name="tabmenu">
<ui:include src="/include/tabMenu.xhtml">
<ui:param name="activeTab" value="summary"/>
@@ -47,7 +47,7 @@
<ui:include
src="../include/displayGlobalMessages.xhtml"/>
<div class="instructionalText">
- #{category.subCategory.description}
+ #{subCategory.subCategory.description}
</div>
<div class="actionHeader">
<div class="floatright">
@@ -138,7 +138,7 @@
</h:form>
</div>
</ui:define>
- </ui:composition>
+ </ui:composition>
</f:view>
</body>
</html>
Modified: trunk/core/src/main/webapp/secure/repeatNav.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/repeatNav.xhtml 2009-07-28 18:43:52 UTC (rev 610)
+++ trunk/core/src/main/webapp/secure/repeatNav.xhtml 2009-07-28 22:23:19 UTC (rev 611)
@@ -31,14 +31,14 @@
<f:view>
<ui:composition template="/layout.xhtml">
- <ui:define
name="pagetitle">#{category.subCategory.name}</ui:define>
+ <ui:define
name="pagetitle">#{subCategory.subCategory.name}</ui:define>
<ui:define name="body">
<div class="noborderbox">
<ui:include
src="../include/displayGlobalMessages.xhtml"/>
<div style="width:100%;">
- #{category.subCategory.description}
+ #{subCategory.subCategory.description}
<hr style="border: 0px; border-bottom: 1px solid #eff2f4;
"/>
</div>
@@ -46,7 +46,7 @@
<div class="sectionalLinks">
<ol>
<!-- display all child categories/resource types -->
- <ui:repeat value="#{category.childNodesAsList}"
var="childNode">
+ <ui:repeat
value="#{subCategory.childNodesAsList}" var="childNode">
<li>
<s:link
view="/secure/summary.xhtml">#{childNode.name}
<f:param name="path"
value="#{childNode.path}"/>