You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/05/19 16:57:28 UTC
[3/4] git commit: WICKET-5573 FilterToolbar generics broken
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/dceb444c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dceb444c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dceb444c
Branch: refs/heads/master
Commit: dceb444c463e2d7b1d82f2de0174138d3044c3a6
Parents: 8e6b4fc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 19 10:46:42 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 19 10:52:50 2014 +0300
----------------------------------------------------------------------
.../html/repeater/data/table/filter/FilterToolbar.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dceb444c/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 62fe752..f7222c3 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,7 +53,11 @@ public class FilterToolbar extends AbstractToolbar
* @param form
* the filter form
* @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 filter state object
*
*/
public <T, S, F> FilterToolbar(final DataTable<T, S> table, final FilterForm<F> form)
@@ -149,7 +153,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();
}