Repository: wicket Updated Branches: refs/heads/wicket-6.x d3fb459a0 -> cdc28993d
WICKET-5573 FilterToolbar generics broken Improve the javadoc and error messages Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed612acb Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed612acb Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed612acb Branch: refs/heads/wicket-6.x Commit: ed612acb03a5484e70389a6c8a04b3684023634e Parents: d3fb459 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon May 19 10:51:57 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon May 19 10:52:44 2014 +0300 ---------------------------------------------------------------------- .../examples/repeater/DataTableFilterToolbarPage.java | 2 +- .../html/repeater/data/table/filter/FilterToolbar.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ed612acb/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java index 6edd6ba..edb9a68 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java @@ -85,7 +85,7 @@ public class DataTableFilterToolbarPage extends ExamplePage add(filterForm); - FilterToolbar filterToolbar = new FilterToolbar(tableWithFilterForm, filterForm, dataProvider); + FilterToolbar filterToolbar = new FilterToolbar(tableWithFilterForm, filterForm, null); tableWithFilterForm.addTopToolbar(filterToolbar); tableWithFilterForm.addTopToolbar(new NavigationToolbar(tableWithFilterForm)); http://git-wip-us.apache.org/repos/asf/wicket/blob/ed612acb/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java index 713477f..1589d4d 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java @@ -53,9 +53,13 @@ public class FilterToolbar extends AbstractToolbar * @param form * the filter form * @param stateLocator - * locator responsible for finding object used to store filter's state + * locator responsible for finding object used to store filter's state. Deprecated! Not used. * @param <T> - * type of filter state object + * the type of the DataTable's model object + * @param <S> + * the type of the DataTable's sorting parameter + * @param <F> + * the type of the type of filter state object * */ public <T, S, F> FilterToolbar(final DataTable<T, S> table, final FilterForm<F> form, final IFilterStateLocator<F> stateLocator) @@ -151,7 +155,7 @@ public class FilterToolbar extends AbstractToolbar { if (findParent(FilterForm.class) == null) { - throw new IllegalStateException("FilterToolbar must be contained within a Form"); + throw new IllegalStateException("FilterToolbar must be contained within a FilterForm"); } super.onBeforeRender(); }
