Author: abelevich Date: 2010-01-11 08:40:25 -0500 (Mon, 11 Jan 2010) New Revision: 16254 Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml Log: Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-01-11 13:40:25 UTC (rev 16254) @@ -9,6 +9,7 @@ import org.richfaces.demo.utils.EmployeeUtils; import org.richfaces.event.ToggleEvent; import org.richfaces.model.visual.DataTableVisualModel; +import org.richfaces.model.visual.SubTableVisualModel; @ManagedBean(name="dataBean") @SessionScoped @@ -17,14 +18,14 @@ private List<Employee> employeeList; private boolean state = true; - private DataTableVisualModel visualModel; + private DataTableVisualModel dataTableVisualModel; - public DataTableVisualModel getVisualModel() { - return visualModel; + public DataTableVisualModel getDataTableVisualModel() { + return dataTableVisualModel; } - public void setVisualModel(DataTableVisualModel visualModel) { - this.visualModel = visualModel; + public void setDataTableVisualModel(DataTableVisualModel dataTableVisualModel) { + this.dataTableVisualModel = dataTableVisualModel; } public void setEmployeeList(List<Employee> employeeList) { @@ -38,10 +39,6 @@ return employeeList; } - public void processToggle(ToggleEvent event) { - System.out.println("DataBean.processToggle()"); - } - public boolean isState() { return state; } Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java 2010-01-11 13:40:25 UTC (rev 16254) @@ -1,6 +1,8 @@ package org.richfaces.demo.model; +import org.richfaces.model.visual.SubTableVisualModel; + public class Company { private String name; @@ -9,7 +11,16 @@ private String phone; + SubTableVisualModel model; + public SubTableVisualModel getModel() { + return model; + } + + public void setModel(SubTableVisualModel model) { + this.model = model; + } + public Company(String name) { this.name = name; } Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-01-11 13:40:25 UTC (rev 16254) @@ -13,7 +13,7 @@ <h:body> <h:form id="form1"> - <rich:dataTable var="record" value="#{dataBean.employeeList}" rows="20" > + <rich:dataTable var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single" visualModel="#{dataBean.dataTableVisualModel}"> <f:facet name="caption"> <h:outputText id="captioFacet1" value="Caption Facet" /> </f:facet> @@ -24,7 +24,7 @@ <rich:column colspan="2"><h:outputText id="headerFacet14" value="header column 3"></h:outputText></rich:column> </rich:colGroup> </f:facet> - <rich:column id="column_name"> + <rich:column id="column_name" sortBy="test1" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif"> <f:facet name="header"> <h:outputText id="columnHeader1" value="Column Header Facet"/> </f:facet> @@ -32,11 +32,14 @@ <rich:toggleControl forId="expandedSubTable" expandControl="resources/images/+.gif" collapseControl="resources/images/-.gif" /> <h:outputText value="#{record.name}" /> <f:facet name="footer"> - <h:outputText id="columnFooter1" value="Column Footer Facet"/> + <h:outputText id="columnFooter1" value="Column Footer Facet 1"/> </f:facet> </rich:column> - <rich:column id="column_title"> + <rich:column id="column_title" sortBy="test2" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif"> + <f:facet name="header"> + <h:outputText id="columnHeader2" value="Column Header Facet 2"/> + </f:facet> <h:outputText value="#{record.title}" /> </rich:column> @@ -46,7 +49,7 @@ - <rich:subTable id="expandedSubTable" var="company" value="#{record.company}" rows="20" switchType="server" expanded="true" toggleListener="#{record.toggle}"> + <rich:subTable id="expandedSubTable" var="company" value="#{record.company}" rows="20" switchType="ajax" expanded="true"> <f:facet name="header"> <rich:colGroup id="headerFacet1" > <rich:column><h:outputText id="headerFacet12" value="company"> </h:outputText></rich:column> @@ -77,7 +80,7 @@ </f:facet> </rich:dataTable> - <h:commandLink value="test" /> + <h:commandButton value="submit" /> </h:form> </h:body> </html>