Author: ppitonak(a)redhat.com
Date: 2010-10-25 05:41:01 -0400 (Mon, 25 Oct 2010)
New Revision: 19663
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml
Log:
https://jira.jboss.org/browse/RFPL-729
* new version of attribute retrieving
* xhtml cleaned
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-10-25
09:02:13 UTC (rev 19662)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-10-25
09:41:01 UTC (rev 19663)
@@ -54,10 +54,10 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIColumn.class, getClass());
+ attributes = Attributes.getUIComponentAttributes(UIColumn.class, getClass(),
false);
+ attributes.setAttribute("colspan", 1);
attributes.setAttribute("rendered", true);
- attributes.setAttribute("colspan", 1);
-
+ attributes.setAttribute("rowspan", 1);
}
public Attributes getAttributes() {
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-10-25
09:02:13 UTC (rev 19662)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2010-10-25
09:41:01 UTC (rev 19663)
@@ -51,16 +51,11 @@
<rich:column id="columnState"
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">