You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2015/10/30 09:19:28 UTC
wicket git commit: WICKET-6015 updateAjaxAttributes(),
deprecated constructor with IAjaxCallListener
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x ab9753744 -> ec1c0f466
WICKET-6015 updateAjaxAttributes(), deprecated constructor with IAjaxCallListener
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ec1c0f46
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec1c0f46
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec1c0f46
Branch: refs/heads/wicket-7.x
Commit: ec1c0f466dcef164f69720d4053b27644de0d101
Parents: ab97537
Author: Sven Meier <sv...@apache.org>
Authored: Fri Oct 30 09:19:02 2015 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Fri Oct 30 09:19:02 2015 +0100
----------------------------------------------------------------------
.../data/sort/AjaxFallbackOrderByBorder.java | 16 +++++++++++++++-
.../repeater/data/sort/AjaxFallbackOrderByLink.java | 9 +++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec1c0f46/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 f38e53c..00ca27c 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
@@ -17,6 +17,7 @@
package org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
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;
@@ -60,6 +61,8 @@ public abstract class AjaxFallbackOrderByBorder<S> extends OrderByBorder<S>
* @param sortProperty
* @param stateLocator
* @param ajaxCallListener
+ *
+ * @deprecated override {@link #updateAjaxAttributes(AjaxRequestAttributes)} instead
*/
public AjaxFallbackOrderByBorder(final String id, final S sortProperty,
final ISortStateLocator<S> stateLocator, final IAjaxCallListener ajaxCallListener)
@@ -69,6 +72,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends OrderByBorder<S>
this.ajaxCallListener = ajaxCallListener;
}
+ @SuppressWarnings("deprecation")
@Override
protected OrderByLink<S> newOrderByLink(String id, S property,
ISortStateLocator<S> stateLocator)
@@ -79,6 +83,12 @@ public abstract class AjaxFallbackOrderByBorder<S> extends OrderByBorder<S>
private static final long serialVersionUID = 1L;
@Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
+ {
+ AjaxFallbackOrderByBorder.this.updateAjaxAttributes(attributes);
+ }
+
+ @Override
protected void onSortChanged()
{
AjaxFallbackOrderByBorder.this.onSortChanged();
@@ -88,10 +98,14 @@ public abstract class AjaxFallbackOrderByBorder<S> extends OrderByBorder<S>
public void onClick(final AjaxRequestTarget target)
{
AjaxFallbackOrderByBorder.this.onAjaxClick(target);
-
}
};
}
+
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
+ {
+ }
+
/**
* This method is a hook for subclasses to perform an action after sort has changed
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec1c0f46/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
index 8f8a02a..65a1848 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
@@ -66,6 +66,8 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen
* @param sortProperty
* @param stateLocator
* @param ajaxCallListener
+ *
+ * @deprecated override {@link #updateAjaxAttributes(AjaxRequestAttributes)} instead
*/
public AjaxFallbackOrderByLink(final String id, final S sortProperty,
final ISortStateLocator<S> stateLocator, final IAjaxCallListener ajaxCallListener)
@@ -106,15 +108,22 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen
{
super.updateAjaxAttributes(attributes);
attributes.setPreventDefault(true);
+
if (ajaxCallListener != null) {
attributes.getAjaxCallListeners().add(ajaxCallListener);
}
+
+ AjaxFallbackOrderByLink.this.updateAjaxAttributes(attributes);
}
};
}
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
+ {
+ }
+
/**
* Callback method when an ajax click occurs. All the behavior of changing the sort, etc is
* already performed before this is called so this method should primarily be used to configure