[richfaces-svn-commits] JBoss Rich Faces SVN: r21332 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 4 other directories.

Author: lfryc(a)redhat.com Date: 2011-01-31 10:51:46 -0500 (Mon, 31 Jan 2011) New Revision: 21332 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 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: attribute cleaning Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -69,22 +69,6 @@ attributes.setAttribute("rendered", true); attributes.setAttribute("tokens", ", "); attributes.setAttribute("validatorMessage", "validator message"); - - attributes.remove("autocompleteMethod"); - attributes.remove("converter"); - attributes.remove("fetchValue"); - attributes.remove("itemConverter"); - attributes.remove("validator"); - attributes.remove("valueChangeListener"); - - // these are hidden attributes - attributes.remove("autocompleteList"); - attributes.remove("localValue"); - attributes.remove("localValueSet"); - attributes.remove("submittedValue"); - attributes.remove("valid"); - attributes.remove("validators"); - attributes.remove("valueChangeListeners"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -26,7 +26,7 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import org.richfaces.component.behavior.ComponentControlBehavior; import org.richfaces.tests.metamer.Attributes; @@ -40,7 +40,7 @@ * @version $Revision$ */ @ManagedBean(name = "richComponentControlBean") -@SessionScoped +@ViewScoped public class RichComponentControlBean implements Serializable { private static final long serialVersionUID = 4476643239809L; @@ -59,8 +59,8 @@ attributes.setAttribute("operation", "previous"); attributes.setAttribute("target", "scroller"); - - // TODO has to be tested in another way + + // The 'event' attribute for behavior tag must be a literal attributes.remove("event"); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -25,7 +25,7 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import org.richfaces.component.UIDataGrid; import org.richfaces.tests.metamer.Attributes; @@ -34,12 +34,12 @@ /** * Managed bean for rich:dataGrid. - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @ManagedBean(name = "richDataGridBean") -@SessionScoped +@ViewScoped public class RichDataGridBean implements Serializable { private static final long serialVersionUID = 4814439475400649809L; @@ -62,22 +62,14 @@ attributes.setAttribute("columns", 3); attributes.setAttribute("rendered", true); - // TODO has to be tested in other way - attributes.remove("componentState"); - attributes.remove("rowKeyVar"); - attributes.remove("rowKeyConverter"); - attributes.remove("stateVar"); + // attributes defined directly in page attributes.remove("value"); attributes.remove("var"); - // should be hidden - attributes.remove("rows"); - attributes.remove("rowAvailable"); - attributes.remove("rowCount"); - attributes.remove("rowData"); - attributes.remove("rowIndex"); - attributes.remove("rowKey"); - attributes.remove("relativeRowIndex"); + // TODO attributes which needs to be tested in another way + attributes.remove("iterationStatusVar"); + attributes.remove("rowKeyVar"); + attributes.remove("stateVar"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -22,10 +22,10 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; -import javax.annotation.PostConstruct; +import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import org.richfaces.component.UIDataScroller; import org.richfaces.tests.metamer.Attributes; @@ -39,13 +39,12 @@ * @version $Revision$ */ @ManagedBean(name = "richDataScrollerBean") -@SessionScoped +@ViewScoped public class RichDataScrollerBean implements Serializable { private static final long serialVersionUID = 122475400649809L; private static Logger logger; private Attributes attributes; - private int page = 1; private boolean state = true; /** @@ -60,18 +59,16 @@ attributes.setAttribute("boundaryControls", "show"); attributes.setAttribute("fastControls", "show"); + attributes.setAttribute("stepControls", "show"); attributes.setAttribute("fastStep", 1); attributes.setAttribute("lastPageMode", "short"); attributes.setAttribute("maxPages", 10); attributes.setAttribute("rendered", true); attributes.setAttribute("render", "richDataTable"); + attributes.setAttribute("page", 1); + attributes.setAttribute("renderIfSinglePage", true); + attributes.setAttribute("for", "richDataTable"); - // FIXME doesn't work: could not find dataTable for datascroller scroller1 - attributes.remove("for"); - - // will be tested in another way - attributes.remove("page"); - } public Attributes getAttributes() { @@ -83,22 +80,6 @@ } /** - * Getter for page. - * @return number of the page to which table is scrolled - */ - public int getPage() { - return page; - } - - /** - * Setter for page. - * @param page number of the page to which table is scrolled - */ - public void setPage(int page) { - this.page = page; - } - - /** * Getter for state. * @return true if non-empty data model should be used in table */ Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -92,35 +92,6 @@ attributes.setAttribute("rendered", true); attributes.setAttribute("rows", 10); - // hidden attributes - attributes.remove("filteringListeners"); - attributes.remove("sortingListeners"); - attributes.remove("filterVar"); - attributes.remove("iterationState"); - attributes.remove("iterationStatusVar"); - attributes.remove("rowAvailable"); - attributes.remove("rowCount"); - attributes.remove("rowData"); - attributes.remove("rowIndex"); - attributes.remove("rowKey"); - attributes.remove("rowKeyConverter"); - attributes.remove("relativeRowIndex"); - - // TODO these must be tested in other way - attributes.remove("componentState"); - attributes.remove("rowKeyVar"); - attributes.remove("stateVar"); - attributes.remove("selection"); - attributes.remove("var"); - attributes.remove("value"); - attributes.remove("keepSaved"); - - // TODO can be these set as attributes or only as facets? - attributes.remove("caption"); - attributes.remove("header"); - attributes.remove("footer"); - attributes.remove("noData"); - // facets initial values facets.put("noData", "There is no data."); facets.put("caption", "Caption"); @@ -129,6 +100,16 @@ facets.put("columnStateFooter", "State Footer"); facets.put("columnCapitalHeader", "Capital Header"); facets.put("columnCapitalFooter", "Capital Footer"); + + // attributes already in page + attributes.remove("value"); + attributes.remove("var"); + + // TODO needs to be tested another way + attributes.remove("filterVar"); + attributes.remove("iterationStatusVar"); + attributes.remove("rowKeyVar"); + attributes.remove("stateVar"); } public void setBinding(UIDataTable binding) { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-31 15:51:46 UTC (rev 21332) @@ -96,40 +96,18 @@ attributes.get("selection").setType(TreeSet.class); attributes.get("selection").setMemberType(Integer.class); - // hidden attributes + // attributes which are already in page + attributes.remove("value"); + attributes.remove("var"); + + // TODO attributes which needs to be tested another way attributes.remove("filterVar"); - attributes.remove("filteringListeners"); - attributes.remove("iterationState"); attributes.remove("iterationStatusVar"); - attributes.remove("relativeRowIndex"); - attributes.remove("rowAvailable"); - attributes.remove("rowCount"); - attributes.remove("rowData"); - attributes.remove("rowIndex"); - attributes.remove("rowIndex"); - attributes.remove("rowKey"); - attributes.remove("rowKeyConverter"); - attributes.remove("sortingListeners"); - attributes.remove("clientFirst"); - attributes.remove("clientRows"); - - // TODO these must be tested in other way - attributes.remove("componentState"); attributes.remove("rowKeyVar"); attributes.remove("stateVar"); - attributes.remove("value"); - attributes.remove("var"); - attributes.remove("keepSaved"); - // TODO can be these set as attributes or only as facets? - attributes.remove("caption"); - attributes.remove("header"); - attributes.remove("footer"); - attributes.remove("noData"); - // facets initial values facets.put("noData", "There is no data."); - facets.put("caption", "Caption"); facets.put("header", "Header"); facets.put("columnStateHeader", "State Header"); facets.put("columnStateFooter", "State Footer"); Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties 2011-01-31 15:51:46 UTC (rev 21332) @@ -7,4 +7,8 @@ attr.fastControls.auto=auto attr.lastPageMode.full=full -attr.lastPageMode.short=short \ No newline at end of file +attr.lastPageMode.short=short + +attr.stepControls.show=show +attr.stepControls.hide=hide +attr.stepControls.auto=auto \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties 2011-01-31 15:51:46 UTC (rev 21332) @@ -1,2 +1,9 @@ attr.sortMode.single=single -attr.sortMode.multi=multi \ No newline at end of file +attr.sortMode.multi=multi +attr.sortMode.null= + +attr.selectionMode.none=none +attr.selectionMode.single=single +attr.selectionMode.multiple=multiple +attr.selectionMode.multipleKeyboardFree=multipleKeyboardFree +attr.selectionMode.null= \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -46,24 +46,11 @@ </h:panelGroup> <rich:dataGrid id="richDataGrid" - captionFacet="#{richDataGridBean.attributes['captionFacet'].value}" columns="#{richDataGridBean.attributes['columns'].value}" - elements="#{richDataGridBean.attributes['elements'].value}" first="#{richDataGridBean.attributes['first'].value}" - footerFacet="#{richDataGridBean.attributes['footerFacet'].value}" - headerFacet="#{richDataGridBean.attributes['headerFacet'].value}" - iterationState="#{richDataGridBean.attributes['iterationState'].value}" - iterationStatusVar="#{richDataGridBean.attributes['iterationStatusVar'].value}" + elements="#{richDataGridBean.attributes['elements'].value}" keepSaved="#{richDataGridBean.attributes['keepSaved'].value}" - noDataFacet="#{richDataGridBean.attributes['noDataFacet'].value}" - relativeRowIndex="#{richDataGridBean.attributes['relativeRowIndex'].value}" rendered="#{richDataGridBean.attributes['rendered'].value}" - rowAvailable="#{richDataGridBean.attributes['rowAvailable'].value}" - rowCount="#{richDataGridBean.attributes['rowCount'].value}" - rowData="#{richDataGridBean.attributes['rowData'].value}" - rowIndex="#{richDataGridBean.attributes['rowIndex'].value}" - rowKey="#{richDataGridBean.attributes['rowKey'].value}" - rowKeyConverter="#{richDataGridBean.attributes['rowKeyConverter'].value}" rows="#{richDataGridBean.attributes['rows'].value}" value="#{richDataGridBean.state ? model.capitals : null}" var="record"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richDataTable" /> <ui:define name="head"> <f:metadata> @@ -46,25 +47,19 @@ </h:selectBooleanCheckbox> <br/><br/> <rich:dataScroller id="scroller1" + for="#{richDataScrollerBean.attributes['for'].value}" + boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}" - dataTable="#{richDataScrollerBean.attributes['dataTable'].value}" fastControls="#{richDataScrollerBean.attributes['fastControls'].value}" - fastForward="#{richDataScrollerBean.attributes['fastForward'].value}" - fastRewind="#{richDataScrollerBean.attributes['fastRewind'].value}" fastStep="#{richDataScrollerBean.attributes['fastStep'].value}" first="#{richDataScrollerBean.attributes['first'].value}" - for="richDataTable" - iterationState="#{richDataScrollerBean.attributes['iterationState'].value}" - last="#{richDataScrollerBean.attributes['last'].value}" lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}" - localPageSet="#{richDataScrollerBean.attributes['localPageSet'].value}" maxPages="#{richDataScrollerBean.attributes['maxPages'].value}" - page="#{richDataScrollerBean.page}" - pageCount="#{richDataScrollerBean.attributes['pageCount'].value}" + page="#{richDataScrollerBean.attributes['page'].value}" + render="#{richDataScrollerBean.attributes['render'].value} #{nestedComponentId}" + renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}" rendered="#{richDataScrollerBean.attributes['rendered'].value}" - render="#{richDataScrollerBean.attributes['render'].value}" - rowCount="#{richDataScrollerBean.attributes['rowCount'].value}" - scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners'].value}" + stepControls="#{richDataScrollerBean.attributes['stepControls'].value}" /> </ui:define> @@ -104,25 +99,18 @@ <f:facet name="footer"> <rich:dataScroller id="scroller2" + boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}" - dataTable="#{richDataScrollerBean.attributes['dataTable'].value}" fastControls="#{richDataScrollerBean.attributes['fastControls'].value}" - fastForward="#{richDataScrollerBean.attributes['fastForward'].value}" - fastRewind="#{richDataScrollerBean.attributes['fastRewind'].value}" fastStep="#{richDataScrollerBean.attributes['fastStep'].value}" first="#{richDataScrollerBean.attributes['first'].value}" - for="richDataTable" - iterationState="#{richDataScrollerBean.attributes['iterationState'].value}" - last="#{richDataScrollerBean.attributes['last'].value}" lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}" - localPageSet="#{richDataScrollerBean.attributes['localPageSet'].value}" maxPages="#{richDataScrollerBean.attributes['maxPages'].value}" - page="#{richDataScrollerBean.page}" - pageCount="#{richDataScrollerBean.attributes['pageCount'].value}" + page="#{richDataScrollerBean.attributes['page'].value}" + render="#{richDataScrollerBean.attributes['render'].value} scroller1" + renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}" rendered="#{richDataScrollerBean.attributes['rendered'].value}" - render="#{richDataScrollerBean.attributes['render'].value}" - rowCount="#{richDataScrollerBean.attributes['rowCount'].value}" - scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners'].value}" + stepControls="#{richDataScrollerBean.attributes['stepControls'].value}" /> </f:facet> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -51,27 +51,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" - iterationState="#{richDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richDataTableBean.attributes['rowCount'].value}" - rowData="#{richDataTableBean.attributes['rowData'].value}" - rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" - value="#{richDataTableBean.state ? model.employees : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -51,27 +51,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" - iterationState="#{richDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richDataTableBean.attributes['rowCount'].value}" - rowData="#{richDataTableBean.attributes['rowData'].value}" - rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" - value="#{richDataTableBean.state ? model.employees : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> @@ -107,7 +104,7 @@ </f:facet> <rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit"> - <a4j:ajax event="inputchange" render="@this"/> + <a4j:ajax event="change" render="@this"/> </rich:inplaceInput> <f:facet name="footer"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -50,15 +50,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" + value="#{richDataTableBean.state ? model.capitals : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - value="#{richDataTableBean.state ? model.capitals : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -51,15 +51,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - value="#{richDataTableBean.state ? model.employees : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -54,27 +54,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + value="#{richDataTableBean.state ? model.capitals : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" - iterationState="#{richDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richDataTableBean.attributes['rowCount'].value}" - rowData="#{richDataTableBean.attributes['rowData'].value}" - rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" - value="#{richDataTableBean.state ? model.capitals : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -50,15 +50,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" + value="#{richDataTableBean.state ? model.capitals : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - value="#{richDataTableBean.state ? model.capitals : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <rich:column id="columnState"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -52,15 +52,24 @@ <rich:dataTable id="richDataTable" binding="#{richDataTableBean.binding}" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - value="#{richDataTableBean.state ? model.employees : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -51,15 +51,24 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + + captionClass="#{richDataTableBean.attributes['captionClass'].value}" + columnClasses="#{richDataTableBean.attributes['columnClasses'].value}" + columns="#{richDataTableBean.attributes['columns'].value}" first="#{richDataTableBean.attributes['first'].value}" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" rendered="#{richDataTableBean.attributes['rendered'].value}" + rowClass="#{richDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richDataTableBean.attributes['rowClasses'].value}" rows="#{richDataTableBean.attributes['rows'].value}" + selection="#{richDataTableBean.attributes['selection'].value}" sortMode="#{richDataTableBean.attributes['sortMode'].value}" sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" - value="#{richDataTableBean.state ? model.employees : null}" - var="record" + style="#{richDataTableBean.attributes['style'].value}" + styleClass="#{richDataTableBean.attributes['styleClass'].value}" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -98,35 +98,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" - clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" - clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" - filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" - rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -91,35 +91,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" - clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" - clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" - filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" - rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" <f:facet name="noData"> @@ -155,7 +149,7 @@ </f:facet> <rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit"> - <a4j:ajax event="inputchange" render="@this"/> + <a4j:ajax event="change" render="@this"/> </rich:inplaceInput> <f:facet name="footer"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -55,31 +55,35 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" <f:facet name="noData"> <h:outputText value="#{richExtendedDataTableBean.facets['noData']}" style="color: red;"/> </f:facet> - <f:facet name="caption"> - <h:outputText id="captionFacet" value="#{richExtendedDataTableBean.facets['caption']}" - rendered="#{not empty richExtendedDataTableBean.facets['caption']}"/> - </f:facet> - <f:facet name="header"> <h:outputText id="header" value="#{richExtendedDataTableBean.facets['header']}" rendered="#{not empty richExtendedDataTableBean.facets['header']}"/> @@ -119,9 +123,6 @@ <h:outputLabel value="No Data Facet: " /> <h:inputText id="noDataInput" value="#{richExtendedDataTableBean.facets['noData']}" /> - <h:outputLabel value="Caption Facet: " /> - <h:inputText id="captionInput" value="#{richExtendedDataTableBean.facets['caption']}" /> - <h:outputLabel value="Header Facet:" /> <h:inputText id="headerInput" value="#{richExtendedDataTableBean.facets['header']}" /> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -88,35 +88,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" - clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" - clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" - filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" - rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -57,20 +57,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -63,20 +63,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -55,20 +55,30 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" + 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -90,20 +90,29 @@ <rich:extendedDataTable id="richEDT" binding="#{richExtendedDataTableBean.binding}" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" <f:facet name="noData"> 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 2011-01-31 15:50:13 UTC (rev 21331) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-01-31 15:51:46 UTC (rev 21332) @@ -90,20 +90,29 @@ <rich:extendedDataTable id="richEDT" binding="#{richExtendedDataTableBean.binding}" - beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + + columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}" + columns="#{richExtendedDataTableBean.attributes['columns'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}" frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" + headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}" + onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}" rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}" + rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" selection="#{richExtendedDataTableBean.attributes['selection'].value}" - selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" + selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" style="#{richExtendedDataTableBean.attributes['style'].value}" styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" <f:facet name="noData">