WICKET-6013 add css classes to AjaxFallbackOrderByBorder too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/db88fd29 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/db88fd29 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/db88fd29 Branch: refs/heads/lambdas Commit: db88fd29f5d21a8406638f9724c522173c3a558c Parents: 7b4c704 Author: Sven Meier <[email protected]> Authored: Wed Oct 28 20:59:28 2015 +0100 Committer: Sven Meier <[email protected]> Committed: Wed Oct 28 21:02:53 2015 +0100 ---------------------------------------------------------------------- .../data/sort/AjaxFallbackOrderByBorder.java | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/db88fd29/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java index 7355b23..f38e53c 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java @@ -20,7 +20,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.IAjaxCallListener; import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator; import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder; -import org.apache.wicket.markup.html.border.Border; +import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink; /** @@ -35,9 +35,10 @@ import org.apache.wicket.markup.html.border.Border; * @author Igor Vaynberg (ivaynberg) * */ -public abstract class AjaxFallbackOrderByBorder<S> extends Border +public abstract class AjaxFallbackOrderByBorder<S> extends OrderByBorder<S> { private static final long serialVersionUID = 1L; + private IAjaxCallListener ajaxCallListener; /** * Constructor @@ -63,9 +64,16 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border public AjaxFallbackOrderByBorder(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator, final IAjaxCallListener ajaxCallListener) { - super(id); - AjaxFallbackOrderByLink<S> link = new AjaxFallbackOrderByLink<S>("orderByLink", sortProperty, - stateLocator, ajaxCallListener) + super(id, sortProperty, stateLocator); + + this.ajaxCallListener = ajaxCallListener; + } + + @Override + protected OrderByLink<S> newOrderByLink(String id, S property, + ISortStateLocator<S> stateLocator) + { + return new AjaxFallbackOrderByLink<S>("orderByLink", property, stateLocator, ajaxCallListener) { private static final long serialVersionUID = 1L; @@ -83,10 +91,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border } }; - addToBorder(link); - link.add(getBodyContainer()); } - /** * This method is a hook for subclasses to perform an action after sort has changed */
