Updated Branches: refs/heads/master 9a6a06be9 -> c880f171e
WICKET-4535 Inconsistent use of generics in sorting APIs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c880f171 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c880f171 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c880f171 Branch: refs/heads/master Commit: c880f171e3a24b9f5ac0c73809ccd6acc688b6c3 Parents: 9a6a06b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu May 10 15:06:14 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu May 10 15:06:14 2012 +0300 ---------------------------------------------------------------------- .../html/repeater/data/sort/OrderByBorder.java | 18 +++++++------- 1 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c880f171/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java index 5f645e5..82ec252 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java @@ -39,23 +39,23 @@ public class OrderByBorder<S> extends Border /** * @param id * see - * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param property * see - * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param stateLocator * see - * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param cssProvider * see - * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } */ public OrderByBorder(final String id, final S property, final ISortStateLocator<S> stateLocator, final OrderByLink.ICssProvider<String> cssProvider) { super(id); - OrderByLink link = newOrderByLink("orderByLink", property, stateLocator); + OrderByLink<S> link = newOrderByLink("orderByLink", property, stateLocator); addToBorder(link); add(new OrderByLink.CssModifier(link, cssProvider)); link.add(getBodyContainer()); @@ -72,7 +72,7 @@ public class OrderByBorder<S> extends Border * sort state locator * @return link */ - protected OrderByLink newOrderByLink(final String id, final S property, + protected OrderByLink<S> newOrderByLink(final String id, final S property, final ISortStateLocator<S> stateLocator) { return new OrderByLink(id, property, stateLocator, @@ -98,11 +98,11 @@ public class OrderByBorder<S> extends Border /** * @param id - * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} * @param property - * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} * @param stateLocator - * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} */ public OrderByBorder(final String id, final S property, final ISortStateLocator<S> stateLocator)
