WICKET-6095 Multiline headers in DataTable Make it clearer that the colspan and rowspan are only taken into account for the header (HeadersToolbar)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/642fa433 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/642fa433 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/642fa433 Branch: refs/heads/lambdas Commit: 642fa4331f69426f4c09acc07cf0107c8bcbdf81 Parents: d0b83ef Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 19 09:09:09 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 19 09:09:09 2016 +0100 ---------------------------------------------------------------------- .../markup/html/repeater/data/table/HeadersToolbar.java | 8 ++++---- .../extensions/markup/html/repeater/data/table/IColumn.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/642fa433/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java index 153b5bf..ab37e17 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java @@ -109,12 +109,12 @@ public class HeadersToolbar<S> extends AbstractToolbar header.add(cssAttributeBehavior); } - if (column.getColspan() > 1) { - header.add(AttributeModifier.replace("colspan", column.getColspan())); + if (column.getHeaderColspan() > 1) { + header.add(AttributeModifier.replace("colspan", column.getHeaderColspan())); } - if (column.getRowspan() > 1) { - header.add(AttributeModifier.replace("rowspan", column.getRowspan())); + if (column.getHeaderRowspan() > 1) { + header.add(AttributeModifier.replace("rowspan", column.getHeaderRowspan())); } item.add(header); http://git-wip-us.apache.org/repos/asf/wicket/blob/642fa433/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java index 7f3314d..6eba7b0 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java @@ -61,14 +61,14 @@ public interface IColumn<T, S> extends ICellPopulator<T> /** * @return The number of rows the header of this column should span */ - default int getRowspan() { + default int getHeaderRowspan() { return 1; } /** * @return The number of columns the header of this column should span */ - default int getColspan() { + default int getHeaderColspan() { return 1; } }
