JBoss Rich Faces SVN: r22617 - in modules/tests/metamer/trunk/application/src/main: webapp/templates and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-11 03:35:56 -0400 (Thu, 11 Aug 2011)
New Revision: 22617
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
Log:
bugs in templates' prefixes and IDs fixed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-08-10 13:49:44 UTC (rev 22616)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-08-11 07:35:56 UTC (rev 22617)
@@ -35,9 +35,9 @@
BLUEDIV("blueDiv", "Blue div", ""),
RICHACCORDION("richAccordion", "Rich Accordion", ""),
RICHCOLLAPSIBLEPANEL("richCollapsiblePanel", "Rich Collapsible Panel", ""),
- RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible Sub Table", "containerRichCollapsibleSubTable:2:"),
+ RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible Sub Table", "containerRichCollapsibleSubTable:0:richSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
- RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:1:"),
+ RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:3:"),
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Table", "containerRichExtendedDataTable:2:"),
RICHLIST("richList", "Rich List", "containerRichList:2:"),
RICHPANEL("richPanel", "Rich Panel", ""),
@@ -45,9 +45,9 @@
RICHTABPANEL("richTabPanel", "Rich Tab Panel", ""),
RICHTOGGLEPANEL("richTogglePanel", "Rich Toggle Panel", ""),
HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
- HPANELGRID("hPanelGrid", "JSF Panel Grid", "containerHPanelGrid:"),
+ HPANELGRID("hPanelGrid", "JSF Panel Grid", ""),
UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
- A4JREGION("a4jRegion", "A4J Region", "containerA4JRegion:"),
+ A4JREGION("a4jRegion", "A4J Region", ""),
A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
/**
* identifier of a template
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml 2011-08-10 13:49:44 UTC (rev 22616)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml 2011-08-11 07:35:56 UTC (rev 22617)
@@ -28,7 +28,7 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat">
<li><h:panelGroup rendered="#{containerA4JRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml 2011-08-10 13:49:44 UTC (rev 22616)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml 2011-08-11 07:35:56 UTC (rev 22617)
@@ -27,7 +27,7 @@
<ui:composition>
- <h:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
+ <h:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable">
<f:facet name="header">
JSF Data Table
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml 2011-08-10 13:49:44 UTC (rev 22616)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml 2011-08-11 07:35:56 UTC (rev 22617)
@@ -28,7 +28,7 @@
<ui:composition>
<ol>
- <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat2">
+ <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat">
<li><h:panelGroup rendered="#{containerUiRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>