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

Author: ppitonak(a)redhat.com Date: 2010-09-13 08:10:27 -0400 (Mon, 13 Sep 2010) New Revision: 19168 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java modules/tests/metamer/trunk/application/src/main/resources/log4j.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml Log: https://jira.jboss.org/browse/RFPL-729 * page for rich:column fixed, bean refactored and cleaned up Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-09-13 11:58:36 UTC (rev 19167) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-09-13 12:10:27 UTC (rev 19168) @@ -35,7 +35,7 @@ /** * Managed bean for rich:column * - * @author <a href="mailto:pjha@redhat.com">Prabhat Jha</a> + * @author <a href="mailto:pjha@redhat.com">Prabhat Jha</a>, <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @ManagedBean(name = "richColumnBean") @@ -56,16 +56,8 @@ attributes = Attributes.getUIComponentAttributes(UIColumn.class, getClass()); attributes.setAttribute("rendered", true); - attributes.setAttribute("columnSpan", 1); + attributes.setAttribute("colspan", 1); - /*breakRowBefore="" - colspan="" - comparator="" - filter="" - filterValue="" - rendered="" - rowspan="" - sortOrder=""*/ } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/resources/log4j.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/log4j.properties 2010-09-13 11:58:36 UTC (rev 19167) +++ modules/tests/metamer/trunk/application/src/main/resources/log4j.properties 2010-09-13 12:10:27 UTC (rev 19168) @@ -1,5 +1,5 @@ #### Use two appenders, one to log to console, another to log to a file -log4j.rootCategory=info, stdout +log4j.rootCategory=debug, stdout #### First appender writes to console log4j.appender.stdout=org.apache.log4j.ConsoleAppender Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2010-09-13 11:58:36 UTC (rev 19167) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2010-09-13 12:10:27 UTC (rev 19168) @@ -36,37 +36,53 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - + </ui:define> <ui:define name="component"> - - <rich:dataTable id="richDataTable" - rendered="true" - value="#{model.capitals}" - rows="5" - var="record" - > + + <rich:dataTable id="richDataTable" + rendered="true" + value="#{model.capitals}" + rows="5" + var="record"> + <rich:column id="columnState" - rendered="#{richColumnBean.attributes['rendered'].value}" - colspan="#{richColumnBean.attributes['colspan'].value}" - sortOrder="#{richColumnBean.attributes['sortOrder'].value}" - > + breakRowBefore="#{richColumnBean.attributes['breakRowBefore'].value}" + colspan="#{richColumnBean.attributes['colspan'].value}" + columnSpan="#{richColumnBean.attributes['columnSpan'].value}" + comparator="#{richColumnBean.attributes['comparator'].value}" + filter="#{richColumnBean.attributes['filter'].value}" + filterField="#{richColumnBean.attributes['filterField'].value}" + filterValue="#{richColumnBean.attributes['filterValue'].value}" + footer="#{richColumnBean.attributes['footer'].value}" + header="#{richColumnBean.attributes['header'].value}" + rendered="#{richColumnBean.attributes['rendered'].value}" + rowspan="#{richColumnBean.attributes['rowspan'].value}" + sortField="#{richColumnBean.attributes['sortField'].value}" + sortOrder="#{richColumnBean.attributes['sortOrder'].value}" + > <f:facet name="header"> <h:outputText id="columnHeaderState" value="State" /> </f:facet> - <h:outputText value="#{record.state}" /> + + <h:outputText id="state" value="#{record.state}" /> + <f:facet name="footer"> <h:outputText id="columnFooterState" value="State" /> </f:facet> </rich:column> - <rich:column id="columnCapital" - filter="#{richColumnBean.attributes['filter'].value}" - > + + <rich:column id="columnCapital"> <f:facet name="header"> - <h:outputText id="columnCapitalState" value="Capital" /> + <h:outputText id="columnHeaderCapital" value="Capital" /> </f:facet> - <h:outputText value="#{record.name}" /> + + <h:outputText id="capital" value="#{record.name}" /> + + <f:facet name="footer"> + <h:outputText id="columnFooterCapital" value="Capital" /> + </f:facet> </rich:column> </rich:dataTable> </ui:define>