Author: lfryc(a)redhat.com Date: 2010-12-07 08:10:01 -0500 (Tue, 07 Dec 2010) New Revision: 20436 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml Log: reimplemented rich:dataTable and rich:extendedDataTable samples using absolute addressing (RFPL-952, RFPL-912, RFPL-918) Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -41,10 +42,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -174,7 +175,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,7 +27,8 @@ --> <ui:composition template="/templates/template.xhtml"> - + <ui:param name="componentId" value="richDataTable" /> + <ui:define name="head"> <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> @@ -41,10 +42,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -182,7 +183,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -41,7 +42,7 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId}"/> </h:selectBooleanCheckbox> <br/><br/> </ui:define> @@ -106,7 +107,7 @@ <ui:define name="outOfTemplateAfter"> - <a4j:ajax render="richDataTable"> + <a4j:ajax render="#{nestedComponentId}"> <h:panelGrid columns="2"> <h:outputLabel value="No Data Facet: " /> <h:inputText id="noDataInput" value="#{richDataTableBean.facets['noData']}" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -28,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -42,10 +43,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -160,7 +161,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -2,7 +2,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" + xmlns:c="http://java.sun.com/jsp/jstl/core"> <!-- JBoss, Home of Professional Open Source @@ -27,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -41,14 +43,16 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId}" /> </h:selectBooleanCheckbox> + <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> - + <rich:dataTable id="richDataTable" filterVar="#{richDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" @@ -108,14 +112,14 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> - + <fieldset> <legend>scroller1</legend> @@ -143,23 +147,25 @@ <br/> <fieldset> + <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> + <legend>scroller2</legend> <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> <f:param value="first" /> </rich:componentControl> </h:commandButton> <h:commandButton id="buttonPrev2" value="&lt; previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="previous" /> </h:commandButton> <h:commandButton id="buttonNext2" value="next &gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="next" /> </h:commandButton> <h:commandButton id="buttonLast2" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> <f:param value="last" /> </rich:componentControl> </h:commandButton> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,7 +27,8 @@ --> <ui:composition template="/templates/template.xhtml"> - + <ui:param name="componentId" value="richDataTable" /> + <ui:define name="head"> <f:metadata> <f:viewParam name="templates" value="#{templateBean.templates}"> @@ -41,7 +42,7 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId}" /> </h:selectBooleanCheckbox> <br/><br/> </ui:define> @@ -72,7 +73,6 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -41,10 +42,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -96,16 +97,17 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> - <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richDataTableBean.sorting.clear}" render="richDataTable" /> - </ui:define> <ui:define name="outOfTemplateAfter"> + <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richDataTableBean.sorting.clear}" render="#{nestedComponentId} scroller1" /> + + <br /><br /> <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -41,10 +42,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -111,17 +112,21 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable scroller1" /> </f:facet> </rich:dataTable> - <h:commandButton id="sortReset" value="Reset Sorting"> - <rich:componentControl event="click" target="richDataTable" operation="sort" /> - </h:commandButton> + </ui:define> <ui:define name="outOfTemplateAfter"> + <h:commandButton id="sortReset" value="Reset Sorting"> + <rich:componentControl event="click" target="#{nestedComponentId}" operation="sort" /> + </h:commandButton> + + <br /><br /> + <metamer:attributes value="#{richDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -88,10 +89,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -230,7 +231,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -81,10 +82,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -230,7 +231,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -46,7 +47,7 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> </ui:define> @@ -113,7 +114,7 @@ </ui:define> <ui:define name="outOfTemplateAfter"> - <a4j:ajax render="richEDT"> + <a4j:ajax render="#{nestedComponentId}"> <h:panelGrid columns="2"> <h:outputLabel value="No Data Facet: " /> <h:inputText id="noDataInput" value="#{richExtendedDataTableBean.facets['noData']}" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -28,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -79,10 +80,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -217,7 +218,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -2,7 +2,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"> + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" + xmlns:c="http://java.sun.com/jsp/jstl/core"> <!-- JBoss, Home of Professional Open Source @@ -27,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -46,10 +48,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -106,7 +108,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> @@ -137,24 +139,26 @@ </h:commandButton> </fieldset> + <c:set var="nestedScrollerId" value="#{nestedComponentId}:scroller2" /> + <fieldset> <legend>scroller2</legend> <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> <f:param value="first" /> </rich:componentControl> </h:commandButton> <h:commandButton id="buttonPrev2" value="&lt; previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="previous" /> </h:commandButton> <h:commandButton id="buttonNext2" value="next &gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="next" /> </h:commandButton> <h:commandButton id="buttonLast2" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{nestedScrollerId}" operation="switchToPage"> <f:param value="last" /> </rich:componentControl> </h:commandButton> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -39,6 +40,13 @@ width: 300px !important; height: 300px !important; } + .currentSelection { + font-weight: bold; + } + + .previousSelection { + color: gray; + } </style> </ui:define> @@ -46,10 +54,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -114,64 +122,21 @@ </f:facet> </rich:extendedDataTable> - - <h:panelGrid columns="2"> - <h:outputLabel value="Previous Selection:" /> - <h:outputText id="previousSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" /> - - <h:outputLabel value="CurrentSelection:" /> - <h:outputText id="currentSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" /> - </h:panelGrid> </ui:define> - + <ui:define name="outOfTemplateAfter"> - <fieldset> - <legend>scroller1</legend> + <h:panelGrid columns="2"> + <h:outputLabel ajaxRendered="true" value="CurrentSelection:" styleClass="currentSelection" /> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText id="currentSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="currentSelection" /> + </a4j:outputPanel> - <h:commandButton id="buttonFirst1" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> - - <h:commandButton id="buttonPrev1" value="&lt; previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> - </h:commandButton> - - <h:commandButton id="buttonNext1" value="next &gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> - </h:commandButton> - - <h:commandButton id="buttonLast1" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> - </fieldset> - - <fieldset> - <legend>scroller2</legend> - <h:commandButton id="buttonFirst2" value="&lt;&lt; first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> - - <h:commandButton id="buttonPrev2" value="&lt; previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> - </h:commandButton> - - <h:commandButton id="buttonNext2" value="next &gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> - </h:commandButton> - - <h:commandButton id="buttonLast2" value="last &gt;&gt;"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> - </fieldset> - + <h:outputLabel value="Previous Selection:" styleClass="previousSelection" /> + <h:outputText id="previousSelection" value="#{richExtendedDataTableBean.attributes['selection'].value}" styleClass="previousSelection" /> + </h:panelGrid> + + <br /><br /> + <metamer:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -46,7 +47,7 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -28,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -79,10 +80,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richEDT scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -139,7 +140,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> @@ -147,7 +148,7 @@ <ui:define name="outOfTemplateAfter"> - <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richExtendedDataTableBean.sorting.clear}" render="richEDT" /> + <a4j:commandButton id="sortReset" value="Reset Sorting" action="#{richExtendedDataTableBean.sorting.clear}" render="richEDT scroller1" /> <br/><br/> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2010-12-07 13:08:57 UTC (rev 20435) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2010-12-07 13:10:01 UTC (rev 20436) @@ -28,6 +28,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richEDT" /> <ui:define name="head"> <f:metadata> @@ -79,10 +80,10 @@ <br/> <h:outputText value="Show data in table: " /> <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}"> - <a4j:ajax render="richDataTable scroller1"/> + <a4j:ajax render="#{nestedComponentId} scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="#{nestedComponentId}"/> </ui:define> <ui:define name="component"> @@ -155,7 +156,7 @@ </rich:column> <f:facet name="footer"> - <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT scroller1" /> </f:facet> </rich:extendedDataTable> @@ -164,7 +165,7 @@ <ui:define name="outOfTemplateAfter"> <h:commandButton id="sortReset" value="Reset Sorting"> - <rich:componentControl event="click" target="richEDT" operation="sort" /> + <rich:componentControl event="click" target="#{nestedComponentId}" operation="sort" /> </h:commandButton> <br/><br/>