You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lf...@apache.org on 2006/08/22 08:42:38 UTC
svn commit: r433545 - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/custom/column/
core/src/main/java/org/apache/myfaces/custom/crosstable/
core/src/main/java/org/apache/myfaces/renderkit/html/ext/
core/src/main/tld/tomahawk-entitie...
Author: lfrohman
Date: Mon Aug 21 23:42:37 2006
New Revision: 433545
URL: http://svn.apache.org/viewvc?rev=433545&view=rev
Log:
Fix for TOMAHAWK-66 -- Add colspan parameter to DataTable
Added:
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Cell.java
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/CellLineBean.java
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Line.java
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/TestColspanBean.java
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/colspan.jsp
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumn.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumnTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_column_attributes.xml
myfaces/tomahawk/trunk/core/src/site/xdoc/column.xml
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumn.java?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumn.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumn.java Mon Aug 21 23:42:37 2006
@@ -205,4 +205,16 @@
void setWidth(String width);
+ String getColspan();
+
+ void setColspan(String colspan);
+
+ String getHeadercolspan();
+
+ void setHeadercolspan(String headercolspan);
+
+ String getFootercolspan();
+
+ void setFootercolspan(String footercolspan);
+
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumnTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumnTag.java?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumnTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlColumnTag.java Mon Aug 21 23:42:37 2006
@@ -30,6 +30,7 @@
private String _headerstyle;
private String _headerstyleClass;
private String _headertitle;
+ private String _headercolspan;
//HTML event handler attributes for header
private String _headeronclick;
@@ -49,6 +50,7 @@
private String _footerstyle;
private String _footerstyleClass;
private String _footertitle;
+ private String _footercolspan;
//HTML event handler attributes for footer
private String _footeronclick;
@@ -63,6 +65,7 @@
private String _footeronmouseup;
private String _width;
+ private String _colspan;
private String _groupBy;
//sort related attributes
@@ -85,6 +88,7 @@
_headerstyle = null;
_headerstyleClass = null;
_headertitle = null;
+ _headercolspan = null;
_headeronclick = null;
_headerondblclick = null;
_headeronkeydown = null;
@@ -101,6 +105,7 @@
_footerstyle = null;
_footerstyleClass = null;
_footertitle = null;
+ _footercolspan = null;
_footeronclick = null;
_footerondblclick = null;
_footeronkeydown = null;
@@ -113,6 +118,7 @@
_footeronmouseup = null;
_width = null;
+ _colspan = null;
_groupBy = null;
_defaultSorted = null;
@@ -126,6 +132,7 @@
setStringProperty(component, "headerlang", _headerlang);
setStringProperty(component, "headerstyle", _headerstyle);
setStringProperty(component, "headertitle", _headertitle);
+ setStringProperty(component, "headercolspan", _headercolspan);
setStringProperty(component, "headerstyleClass", _headerstyleClass);
setStringProperty(component, "headeronclick", _headeronclick);
setStringProperty(component, "headerondblclick", _headerondblclick);
@@ -142,6 +149,7 @@
setStringProperty(component, "footerlang", _footerlang);
setStringProperty(component, "footerstyle", _footerstyle);
setStringProperty(component, "footertitle", _footertitle);
+ setStringProperty(component, "footercolspan", _footercolspan);
setStringProperty(component, "footerstyleClass", _footerstyleClass);
setStringProperty(component, "footeronclick", _footeronclick);
setStringProperty(component, "footerondblclick", _footerondblclick);
@@ -155,6 +163,7 @@
setStringProperty(component, "footeronkeyup", _footeronkeyup);
setStringProperty(component, "width", _width);
+ setStringProperty(component, "colspan", _colspan);
setBooleanProperty(component, "groupBy", _groupBy);
setBooleanProperty(component, "defaultSorted", _defaultSorted);
@@ -218,6 +227,11 @@
_footerstyleClass = footerstyleClass;
}
+ public void setFootercolspan(String footercolspan)
+ {
+ _footercolspan = footercolspan;
+ }
+
public void setFootertitle(String footertitle) {
_footertitle = footertitle;
}
@@ -282,8 +296,18 @@
_headertitle = headertitle;
}
+ public void setHeadercolspan(String headercolspan)
+ {
+ _headercolspan = headercolspan;
+ }
+
public void setWidth(String width) {
_width = width;
+ }
+
+ public void setColspan(String colspan)
+ {
+ _colspan = colspan;
}
public void setGroupBy(String groupBy) {
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java Mon Aug 21 23:42:37 2006
@@ -31,6 +31,7 @@
private String _headerstyle;
private String _headerstyleClass;
private String _headertitle;
+ private String _headercolspan;
//HTML event handler attributes for header
private String _headeronclick;
@@ -50,6 +51,7 @@
private String _footerstyle;
private String _footerstyleClass;
private String _footertitle;
+ private String _footercolspan;
//HTML event handler attributes for footer
private String _footeronclick;
@@ -83,6 +85,7 @@
private String _onmouseup;
private String _width;
+ private String _colspan;
private Boolean _groupBy;
private Boolean _defaultSorted;
@@ -357,6 +360,22 @@
}
/**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#getFootercolspan()
+ */
+ public String getFootercolspan()
+ {
+ return (String) getLocalOrValueBindingValue(_footercolspan, "footercolspan");
+ }
+
+ /**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#setFootercolspan(java.lang.String)
+ */
+ public void setFootercolspan(String footercolspan)
+ {
+ _footercolspan = footercolspan;
+ }
+
+ /**
* @see org.apache.myfaces.custom.column.HtmlColumn#getHeaderdir()
*/
public String getHeaderdir()
@@ -608,6 +627,22 @@
}
/**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#getHeadercolspan()
+ */
+ public String getHeadercolspan()
+ {
+ return (String) getLocalOrValueBindingValue(_headercolspan, "headercolspan");
+ }
+
+ /**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#setHeadercolspan(java.lang.String)
+ */
+ public void setHeadercolspan(String headercolspan)
+ {
+ _headercolspan = headercolspan;
+ }
+
+ /**
* @see org.apache.myfaces.custom.column.HtmlColumn#getDir()
*/
public String getDir()
@@ -863,6 +898,22 @@
_width = width;
}
+ /**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#getColspan()
+ */
+ public String getColspan()
+ {
+ return (String) getLocalOrValueBindingValue(_colspan, "colspan");
+ }
+
+ /**
+ * @see org.apache.myfaces.custom.column.HtmlColumn#setColspan(java.lang.String)
+ */
+ public void setColspan(String colspan)
+ {
+ _colspan = colspan;
+ }
+
public boolean isGroupBy()
{
if (_groupBy != null) return _groupBy.booleanValue();
@@ -917,7 +968,7 @@
*/
public Object saveState(FacesContext context)
{
- Object[] values = new Object[51];
+ Object[] values = new Object[54];
values[0] = super.saveState(context);
values[1] = _headerdir;
@@ -974,6 +1025,9 @@
values[48] = _defaultSorted;
values[49] = _sortable;
values[50] = _sortPropertyName;
+ values[51] = _headercolspan;
+ values[52] = _footercolspan;
+ values[53] = _colspan;
return values;
}
@@ -1040,5 +1094,8 @@
_defaultSorted = (Boolean) values[48];
_sortable = (Boolean) values[49];
_sortPropertyName = (String) values[50];
+ _headercolspan = (String) values[51];
+ _footercolspan = (String) values[52];
+ _colspan = (String) values[53];
}
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java Mon Aug 21 23:42:37 2006
@@ -542,6 +542,14 @@
_sortPropertyName = sortPropertyName;
}
+ // the following are not implemented, but are in the HtmlColumn interface
+ public String getColspan() {return null;}
+ public void setColspan(String colspan) {}
+ public String getHeadercolspan() {return null;}
+ public void setHeadercolspan(String headercolspan) {}
+ public String getFootercolspan() {return null;}
+ public void setFootercolspan(String footercolspan) {}
+
/**
* @see javax.faces.component.UIData#saveState(javax.faces.context.FacesContext)
*/
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java Mon Aug 21 23:42:37 2006
@@ -40,6 +40,7 @@
import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTableRendererBase;
+import org.apache.myfaces.shared_tomahawk.util.ArrayUtils;
import javax.faces.component.ValueHolder;
import javax.faces.convert.Converter;
@@ -578,6 +579,8 @@
}
else if (component instanceof HtmlColumn)
{
+ if (amISpannedOver(null, component))
+ return;
writer.startElement(HTML.TD_ELEM, uiData);
String styleClass = ((HtmlColumn) component).getStyleClass();
if(styles.hasColumnStyle())
@@ -662,6 +665,8 @@
{
if (uiComponent instanceof HtmlColumn)
{
+ if (amISpannedOver("header", uiComponent))
+ return;
writer.startElement(HTML.TH_ELEM, uiComponent);
if (colspan > 1)
{
@@ -702,6 +707,8 @@
{
if (uiComponent instanceof HtmlColumn)
{
+ if (amISpannedOver("footer", uiComponent))
+ return;
writer.startElement(HTML.TD_ELEM, uiComponent);
if (colspan > 1)
{
@@ -735,7 +742,7 @@
protected void renderHtmlColumnAttributes(ResponseWriter writer,
UIComponent uiComponent, String prefix) throws IOException
{
- String[] attrs = HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE;
+ String[] attrs = (String[]) ArrayUtils.concat(HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE, new String[] {HTML.COLSPAN_ATTR});
for (int i = 0, size = attrs.length; i < size; i++)
{
String attributeName = attrs[i];
@@ -873,5 +880,38 @@
}
else if (sortedColumnVar != null)
requestMap.remove(sortedColumnVar);
+ }
+
+ /**
+ * specify if the header, footer or <td> is spanned over (not shown) because
+ * of a colspan in a cell in a previous column
+ *
+ * @param prefix header, footer or null
+ * @param uiComponent
+ */
+ protected boolean amISpannedOver(String prefix, UIComponent component) {
+ UIComponent table = component.getParent();
+ int span = 0;
+ for (Iterator it = table.getChildren().iterator(); it.hasNext();) {
+ UIComponent columnComponent = (UIComponent) it.next();
+ if (!(columnComponent instanceof HtmlColumn))
+ return false;
+ if (span > 0)
+ span--;
+ if (columnComponent == component)
+ return span > 0;
+ if (span == 0) {
+ try {
+ if (prefix == null && ((HtmlColumn)columnComponent).getColspan() != null)
+ span = Integer.parseInt(((HtmlColumn)columnComponent).getColspan());
+ if ("header".equals(prefix) && ((HtmlColumn)columnComponent).getHeadercolspan() != null)
+ span = Integer.parseInt(((HtmlColumn)columnComponent).getHeadercolspan());
+ if ("footer".equals(prefix) && ((HtmlColumn)columnComponent).getFootercolspan() != null)
+ span = Integer.parseInt(((HtmlColumn)columnComponent).getFootercolspan());
+ }
+ catch (NumberFormatException ex) { }
+ }
+ }
+ return false;
}
}
Modified: myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_column_attributes.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_column_attributes.xml?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_column_attributes.xml (original)
+++ myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_column_attributes.xml Mon Aug 21 23:42:37 2006
@@ -1,82 +1,90 @@
- <!-- header attributes -->
- <attribute><name>headerdir</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headerlang</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headerstyle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headertitle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute>
- <name>headerstyleClass</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>Corresponds to the HTML class attribute.</description>
- </attribute>
- <attribute><name>headeronclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headerondblclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronmousedown</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronmouseup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronmouseover</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronmousemove</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronmouseout</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronkeypress</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronkeydown</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>headeronkeyup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
-
- <!-- footer attributes -->
- <attribute><name>footerdir</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footerlang</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footerstyle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footertitle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute>
- <name>footerstyleClass</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>Corresponds to the HTML class attribute.</description>
- </attribute>
- <attribute><name>footeronclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footerondblclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronmousedown</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronmouseup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronmouseover</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronmousemove</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronmouseout</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronkeypress</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronkeydown</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
- <attribute><name>footeronkeyup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
-
- <attribute>
- <name>width</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>This attribute can be used to set the width of the <TD> elements</description>
- </attribute>
- <attribute>
- <name>groupBy</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>This attribute tells the datatable to group by data in this column</description>
- </attribute>
- <attribute>
- <name>defaultSorted</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- This attribute tells the datatable to make this column the default sorted, when
- sortable=true
- </description>
- </attribute>
- <attribute>
- <name>sortable</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- This attribute makes this column automaticaly sortable by a row object's property
- </description>
- </attribute>
- <attribute>
- <name>sortPropertyName</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- This attribute tells row object's property by which sorting will be performed on this column
- </description>
- </attribute>
-
+ <!-- header attributes -->
+ <attribute><name>headerdir</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headerlang</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headerstyle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headertitle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headercolspan</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute>
+ <name>headerstyleClass</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>Corresponds to the HTML class attribute.</description>
+ </attribute>
+ <attribute><name>headeronclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headerondblclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronmousedown</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronmouseup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronmouseover</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronmousemove</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronmouseout</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronkeypress</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronkeydown</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>headeronkeyup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+
+ <!-- footer attributes -->
+ <attribute><name>footerdir</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footerlang</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footerstyle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footertitle</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footercolspan</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute>
+ <name>footerstyleClass</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>Corresponds to the HTML class attribute.</description>
+ </attribute>
+ <attribute><name>footeronclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footerondblclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronmousedown</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronmouseup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronmouseover</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronmousemove</name><required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronmouseout</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronkeypress</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronkeydown</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+ <attribute><name>footeronkeyup</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
+
+ <attribute>
+ <name>width</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>This attribute can be used to set the width of the <TD> elements</description>
+ </attribute>
+ <attribute>
+ <name>colspan</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>This attribute specifies the colspan attribute for the cell</description>
+ </attribute>
+ <attribute>
+ <name>groupBy</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>This attribute tells the datatable to group by data in this column</description>
+ </attribute>
+ <attribute>
+ <name>defaultSorted</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ This attribute tells the datatable to make this column the default sorted, when
+ sortable=true
+ </description>
+ </attribute>
+ <attribute>
+ <name>sortable</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ This attribute makes this column automaticaly sortable by a row object's property
+ </description>
+ </attribute>
+ <attribute>
+ <name>sortPropertyName</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ This attribute tells row object's property by which sorting will be performed on this column
+ </description>
+ </attribute>
+
Modified: myfaces/tomahawk/trunk/core/src/site/xdoc/column.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/site/xdoc/column.xml?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/site/xdoc/column.xml (original)
+++ myfaces/tomahawk/trunk/core/src/site/xdoc/column.xml Mon Aug 21 23:42:37 2006
@@ -66,7 +66,8 @@
<section name="Syntax">
<blockquote><h3><t:column/></h3>
- <code>witdh - the width of the column.</code><br/>
+ <code>width - the width of the column.</code><br/>
+ <code>colspan - html colspan passthru.</code><br/>
<br/>
<code>dir - row cell, ltr | rtl.</code><br/>
<code>lang - row cell, language see RFC 1766</code><br/>
@@ -87,6 +88,7 @@
<code>headerdir - header cell, ltr | rtl.</code><br/>
<code>headerlang - header cell, language see RFC 1766</code><br/>
<code>headertitle - header cell, title (tooltip)</code><br/>
+ <code>headercolspan - colspan passthru for header column</code><br/>
<code>headerstyle - header cell, inline css-style</code><br/>
<code>headerstyleClass - header cell, css style class</code><br/>
<code>headeronclick - header cell, onclick event</code><br/>
@@ -103,6 +105,7 @@
<code>footerdir - footer cell, ltr | rtl.</code><br/>
<code>footerlang - footer cell, language see RFC 1766</code><br/>
<code>footertitle - footer cell, title (tooltip)</code><br/>
+ <code>footercolspan - colspan passthru for footer column</code><br/>
<code>footerstyle - footer cell, inline css-style</code><br/>
<code>footerstyleClass - footer cell, css style class</code><br/>
<code>footeronclick - footer cell, onclick event</code><br/>
Added: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Cell.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Cell.java?rev=433545&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Cell.java (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Cell.java Mon Aug 21 23:42:37 2006
@@ -0,0 +1,15 @@
+package org.apache.myfaces.examples.colspanexample;
+
+public class Cell {
+ private String text;
+ public Cell(String text) {
+ super();
+ this.text = text;
+ }
+ public String getText() {
+ return text;
+ }
+ public void setText(String text) {
+ this.text = text;
+ }
+}
Added: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/CellLineBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/CellLineBean.java?rev=433545&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/CellLineBean.java (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/CellLineBean.java Mon Aug 21 23:42:37 2006
@@ -0,0 +1,19 @@
+package org.apache.myfaces.examples.colspanexample;
+
+import java.util.ArrayList;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+
+public class CellLineBean {
+ public DataModel getCells() {
+ ArrayList a = new ArrayList();
+ a.add(new Cell("1"));
+ a.add(new Cell("2"));
+ a.add(new Cell("3"));
+ a.add(new Cell("4"));
+ a.add(new Cell("5"));
+ DataModel testModel = new ListDataModel();
+ testModel.setWrappedData(a);
+ return testModel;
+ }
+}
Added: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Line.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Line.java?rev=433545&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Line.java (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/Line.java Mon Aug 21 23:42:37 2006
@@ -0,0 +1,47 @@
+package org.apache.myfaces.examples.colspanexample;
+
+public class Line {
+ private String col1;
+ private String col2;
+ private String col3;
+ private String col4;
+ private String col5;
+ public Line(String col1, String col2, String col3, String col4, String col5) {
+ super();
+ this.col1 = col1;
+ this.col2 = col2;
+ this.col3 = col3;
+ this.col4 = col4;
+ this.col5 = col5;
+ }
+ public String getCol1() {
+ return col1;
+ }
+ public void setCol1(String col1) {
+ this.col1 = col1;
+ }
+ public String getCol2() {
+ return col2;
+ }
+ public void setCol2(String col2) {
+ this.col2 = col2;
+ }
+ public String getCol3() {
+ return col3;
+ }
+ public void setCol3(String col3) {
+ this.col3 = col3;
+ }
+ public String getCol4() {
+ return col4;
+ }
+ public void setCol4(String col4) {
+ this.col4 = col4;
+ }
+ public String getCol5() {
+ return col5;
+ }
+ public void setCol5(String col5) {
+ this.col5 = col5;
+ }
+}
Added: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/TestColspanBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/TestColspanBean.java?rev=433545&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/TestColspanBean.java (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/colspanexample/TestColspanBean.java Mon Aug 21 23:42:37 2006
@@ -0,0 +1,29 @@
+package org.apache.myfaces.examples.colspanexample;
+
+import java.util.ArrayList;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+
+public class TestColspanBean {
+ public DataModel getLines() {
+ ArrayList a = new ArrayList();
+ a.add(new Line("1-1", "1-2", "1-3", "1-4", "1-5"));
+ a.add(new Line("2-1", "2-2", "2-3", "2-4", "2-5"));
+ a.add(new Line("3-1", "3-2", "3-3", "3-4", "3-5"));
+ a.add(new Line("4-1", "4-2", "4-3", "4-4", "4-5"));
+ DataModel testModel = new ListDataModel();
+ testModel.setWrappedData(a);
+ return testModel;
+ }
+
+ public DataModel getCellLines() {
+ ArrayList a = new ArrayList();
+ a.add(new CellLineBean());
+ a.add(new CellLineBean());
+ a.add(new CellLineBean());
+ a.add(new CellLineBean());
+ DataModel testModel = new ListDataModel();
+ testModel.setWrappedData(a);
+ return testModel;
+ }
+}
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml Mon Aug 21 23:42:37 2006
@@ -540,6 +540,13 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+ <!-- Managed Beans for colspan.jsp -->
+
+ <managed-bean>
+ <managed-bean-name>testColspanBean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.examples.colspanexample.TestColspanBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
<!-- NAVIGATION RULES -->
Added: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/colspan.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/colspan.jsp?rev=433545&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/colspan.jsp (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/colspan.jsp Mon Aug 21 23:42:37 2006
@@ -0,0 +1,187 @@
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
+<html>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//-->
+
+<body>
+
+<f:view>
+ <h:form id="test">
+ <h:panelGrid columns="1">
+ <t:dataTable id="data1" value="#{testColspanBean.lines}" var="line" border="2" width="100%">
+ <t:column colspan="2">
+ <f:facet name="header">
+ <f:verbatim escape="false">head 1</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 1</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col1}" />
+ </t:column>
+ <t:column headercolspan="3">
+ <f:facet name="header">
+ <f:verbatim escape="false">head 2</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 2</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col2}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 3</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 3</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col3}" />
+ </t:column>
+ <t:column footercolspan="2">
+ <f:facet name="header">
+ <f:verbatim escape="false">head 4</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 4</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col4}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 5</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 5</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col5}" />
+ </t:column>
+ </t:dataTable>
+
+ <f:verbatim> </f:verbatim>
+
+ <t:dataTable id="data2" value="#{testColspanBean.lines}" var="line" border="2" width="100%">
+ <t:column >
+ <f:facet name="header">
+ <f:verbatim escape="false">head 1</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 1</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col1}" />
+ </t:column>
+ <t:column colspan="2" >
+ <f:facet name="header">
+ <f:verbatim escape="false">head 2</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 2</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col2}" />
+ </t:column>
+ <t:column headercolspan="3" footercolspan="3">
+ <f:facet name="header">
+ <f:verbatim escape="false">head 3</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 3</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col3}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 4</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 4</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col4}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 5</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 5</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col5}" />
+ </t:column>
+ </t:dataTable>
+
+ <f:verbatim> </f:verbatim>
+
+ <t:dataTable id="data3" value="#{testColspanBean.lines}" var="line" border="2" width="100%">
+ <t:column headercolspan="2" >
+ <f:facet name="header">
+ <f:verbatim escape="false">head 1</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 1</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col1}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 2</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 2</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col2}" />
+ </t:column>
+ <t:column colspan="3" >
+ <f:facet name="header">
+ <f:verbatim escape="false">head 3</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 3</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col3}" />
+ </t:column>
+ <t:column headercolspan="2" >
+ <f:facet name="header">
+ <f:verbatim escape="false">head 4</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 4</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col4}" />
+ </t:column>
+ <t:column>
+ <f:facet name="header">
+ <f:verbatim escape="false">head 5</f:verbatim>
+ </f:facet>
+ <f:facet name="footer">
+ <f:verbatim escape="false">foot 5</f:verbatim>
+ </f:facet>
+ <h:outputText value="#{line.col5}" />
+ </t:column>
+ </t:dataTable>
+ </h:panelGrid>
+ </h:form>
+</f:view>
+
+<%@include file="inc/page_footer.jsp" %>
+
+</body>
+
+</html>
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp?rev=433545&r1=433544&r2=433545&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp Mon Aug 21 23:42:37 2006
@@ -44,6 +44,7 @@
<h:outputLink value="optDataTable.jsf" ><f:verbatim>Optional Header/Footer</f:verbatim></h:outputLink>
<h:outputLink value="simpleGroupBy.jsf" ><f:verbatim>Group by columns</f:verbatim></h:outputLink>
<h:outputLink value="newspaperTable.jsf" ><f:verbatim>Newspaper Table</f:verbatim></h:outputLink>
+ <h:outputLink value="colspan.jsf" ><f:verbatim>Colspan</f:verbatim></h:outputLink>
</h:panelGrid>
<h:outputLink value="selectbox.jsf" ><f:verbatim>Select boxes</f:verbatim></h:outputLink>
<h:outputLink value="fileupload.jsf" ><f:verbatim>File upload</f:verbatim></h:outputLink>