Updated Branches: refs/heads/master 2746e87a4 -> 361a57f99
WICKET-4719 Allow a list of a subclass of IColumn in DataTable constructor Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/361a57f9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/361a57f9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/361a57f9 Branch: refs/heads/master Commit: 361a57f99dbba089315ba204a6eea30cf3424108 Parents: 2746e87 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Wed Aug 22 10:48:17 2012 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed Aug 22 10:48:17 2012 +0300 ---------------------------------------------------------------------- .../data/table/AjaxFallbackDefaultDataTable.java | 2 +- .../markup/html/repeater/data/table/DataTable.java | 6 +++--- .../html/repeater/data/table/DefaultDataTable.java | 2 +- .../html/repeater/tree/DefaultTableTree.java | 4 ++-- .../markup/html/repeater/tree/TableTree.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/361a57f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java index b4877b1..3efc392 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java @@ -65,7 +65,7 @@ public class AjaxFallbackDefaultDataTable<T, S> extends DataTable<T, S> * @param rowsPerPage * number of rows per page */ - public AjaxFallbackDefaultDataTable(final String id, final List<IColumn<T, S>> columns, + public AjaxFallbackDefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns, final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage) { super(id, columns, dataProvider, rowsPerPage); http://git-wip-us.apache.org/repos/asf/wicket/blob/361a57f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java index c6912e7..a04e60b 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java @@ -105,7 +105,7 @@ public class DataTable<T, S> extends Panel implements IPageableItems private final WebMarkupContainer body; - private final List<IColumn<T, S>> columns; + private final List<? extends IColumn<T, S>> columns; private final ToolbarsContainer topToolbars; @@ -125,7 +125,7 @@ public class DataTable<T, S> extends Panel implements IPageableItems * @param rowsPerPage * number of rows per page */ - public DataTable(final String id, final List<IColumn<T, S>> columns, + public DataTable(final String id, final List<? extends IColumn<T, S>> columns, final IDataProvider<T> dataProvider, final long rowsPerPage) { super(id); @@ -248,7 +248,7 @@ public class DataTable<T, S> extends Panel implements IPageableItems /** * @return array of column objects this table displays */ - public final List<IColumn<T, S>> getColumns() + public final List<? extends IColumn<T, S>> getColumns() { return columns; } http://git-wip-us.apache.org/repos/asf/wicket/blob/361a57f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java index 0cc30d8..d29d6b7 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java @@ -57,7 +57,7 @@ public class DefaultDataTable<T, S> extends DataTable<T, S> * @param rowsPerPage * number of rows per page */ - public DefaultDataTable(final String id, final List<IColumn<T, S>> columns, + public DefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns, final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage) { super(id, columns, dataProvider, rowsPerPage); http://git-wip-us.apache.org/repos/asf/wicket/blob/361a57f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java index 61c1d48..039b324 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java @@ -58,7 +58,7 @@ public class DefaultTableTree<T, S> extends TableTree<T, S> * @param rowsPerPage * rows to show on each page */ - public DefaultTableTree(String id, List<IColumn<T, S>> columns, + public DefaultTableTree(String id, List<? extends IColumn<T, S>> columns, ISortableTreeProvider<T, S> provider, int rowsPerPage) { this(id, columns, provider, rowsPerPage, null); @@ -78,7 +78,7 @@ public class DefaultTableTree<T, S> extends TableTree<T, S> * @param state * expansion state */ - public DefaultTableTree(String id, List<IColumn<T, S>> columns, + public DefaultTableTree(String id, List<? extends IColumn<T, S>> columns, ISortableTreeProvider<T, S> provider, int rowsPerPage, IModel<Set<T>> state) { super(id, columns, provider, rowsPerPage, state); http://git-wip-us.apache.org/repos/asf/wicket/blob/361a57f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java index d95596f..c0bfe5a 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java @@ -63,7 +63,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T> * @param rowsPerPage * number of rows per page */ - public TableTree(final String id, final List<IColumn<T, S>> columns, + public TableTree(final String id, final List<? extends IColumn<T, S>> columns, final ITreeProvider<T> dataProvider, final long rowsPerPage) { this(id, columns, dataProvider, rowsPerPage, null); @@ -83,7 +83,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T> * @param state * the expansion state */ - public TableTree(final String id, final List<IColumn<T, S>> columns, + public TableTree(final String id, final List<? extends IColumn<T, S>> columns, final ITreeProvider<T> provider, final long rowsPerPage, IModel<Set<T>> state) { super(id, provider, state); @@ -116,7 +116,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T> * @param rowsPerPage * @return nested data table */ - protected DataTable<T, S> newDataTable(String id, List<IColumn<T, S>> columns, + protected DataTable<T, S> newDataTable(String id, List<? extends IColumn<T, S>> columns, IDataProvider<T> dataProvider, long rowsPerPage) { return new DataTable<T, S>(id, columns, dataProvider, rowsPerPage)
