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/07/09 15:05:57 UTC
wicket git commit: WICKET-5929 use IPartialPageUpdate instead of
RequestTarget were applicable
Repository: wicket
Updated Branches:
refs/heads/master 0ac0d60cc -> 1d224a5ab
WICKET-5929 use IPartialPageUpdate instead of RequestTarget were applicable
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d224a5a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d224a5a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d224a5a
Branch: refs/heads/master
Commit: 1d224a5ab5cbea379d43d5b9488841718004e724
Parents: 0ac0d60
Author: Sven Meier <sv...@apache.org>
Authored: Thu Jul 9 15:02:47 2015 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Thu Jul 9 15:02:47 2015 +0200
----------------------------------------------------------------------
.../wicket/cdi/ConversationExpiryChecker.java | 4 ++--
.../wicket/cdi/ConversationExpiryChecker.java | 4 ++--
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 17 ++++++++++-------
.../apache/wicket/markup/head/CssHeaderItem.java | 4 ++--
.../wicket/markup/head/JavaScriptHeaderItem.java | 4 ++--
.../wicket/markup/head/ResourceAggregator.java | 4 ++--
.../head/filter/FilteringHeaderResponse.java | 4 ++--
.../org/apache/wicket/markup/html/image/Image.java | 4 ++--
.../wicket/extensions/yui/calendar/DatePicker.java | 3 ++-
.../ajax/markup/html/AjaxEditableLabel.java | 3 ++-
.../ajax/markup/html/AjaxIndicatorAppender.java | 4 ++--
.../ajax/markup/html/modal/ModalWindow.java | 7 ++++---
.../markup/html/repeater/tree/AbstractTree.java | 9 +++++----
.../markup/html/repeater/tree/NestedTree.java | 5 +++--
.../markup/html/repeater/tree/TableTree.java | 5 +++--
15 files changed, 45 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
index 62d1cd4..1d6d89a 100644
--- a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
+++ b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
@@ -21,8 +21,8 @@ import javax.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.application.IComponentOnBeforeRenderListener;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Objects;
import org.slf4j.Logger;
@@ -55,7 +55,7 @@ public class ConversationExpiryChecker implements IComponentOnBeforeRenderListen
@Override
public void onBeforeRender(Component component)
{
- if (component instanceof Page || RequestCycle.get().find(AjaxRequestTarget.class) != null)
+ if (component instanceof Page || RequestCycle.get().find(IPartialPageRequestHandler.class) != null)
{
Page page = component.getPage();
String cid = ConversationPropagator.getConversationIdFromPage(page);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
index d58b417..2c442ad 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
@@ -21,8 +21,8 @@ import javax.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.application.IComponentOnBeforeRenderListener;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Objects;
import org.slf4j.Logger;
@@ -57,7 +57,7 @@ public class ConversationExpiryChecker implements IComponentOnBeforeRenderListen
@Override
public void onBeforeRender(Component component)
{
- if (component instanceof Page || RequestCycle.get().find(AjaxRequestTarget.class) != null)
+ if (component instanceof Page || RequestCycle.get().find(IPartialPageRequestHandler.class) != null)
{
Page page = component.getPage();
String cid = container.getConversationMarker(page);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 147f470..ec1ef4e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -18,6 +18,7 @@ package org.apache.wicket.ajax;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.util.time.Duration;
@@ -28,8 +29,10 @@ import org.apache.wicket.util.time.Duration;
* @since 1.2
*
* @author Igor Vaynberg (ivaynberg)
+ *
* @see #onTimer(AjaxRequestTarget)
- * @see #restart(AjaxRequestTarget)
+ * @see #restart(IPartialPageRequestHandler)
+ * @see #stop(IPartialPageRequestHandler)
*/
public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehavior
{
@@ -86,7 +89,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
{
super.renderHead(component, response);
- if (component.getRequestCycle().find(AjaxRequestTarget.class) == null)
+ if (component.getRequestCycle().find(IPartialPageRequestHandler.class) == null)
{
// complete page is rendered, so timeout has to be rendered again
hasTimeout = false;
@@ -159,7 +162,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
protected abstract void onTimer(final AjaxRequestTarget target);
/**
- * @return {@code true} if has been stopped via {@link #stop(AjaxRequestTarget)}
+ * @return {@code true} if has been stopped via {@link #stop(IPartialPageRequestHandler)}
*/
public final boolean isStopped()
{
@@ -172,7 +175,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
* @param target
* may be null
*/
- public final void restart(final AjaxRequestTarget target)
+ public final void restart(final IPartialPageRequestHandler target)
{
if (stopped == true)
{
@@ -212,7 +215,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
* @param target
* may be null
*/
- public final void stop(final AjaxRequestTarget target)
+ public final void stop(final IPartialPageRequestHandler target)
{
if (stopped == false)
{
@@ -228,7 +231,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
@Override
public void onRemove(Component component)
{
- AjaxRequestTarget target = component.getRequestCycle().find(AjaxRequestTarget.class);
+ IPartialPageRequestHandler target = component.getRequestCycle().find(IPartialPageRequestHandler.class);
if (target != null)
{
clearTimeout(target.getHeaderResponse());
@@ -238,7 +241,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
@Override
protected void onUnbind()
{
- AjaxRequestTarget target = getComponent().getRequestCycle().find(AjaxRequestTarget.class);
+ IPartialPageRequestHandler target = getComponent().getRequestCycle().find(IPartialPageRequestHandler.class);
if (target != null)
{
clearTimeout(target.getHeaderResponse());
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java
index dab463c..4f25a75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.head;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -275,7 +275,7 @@ public abstract class CssHeaderItem extends HeaderItem
boolean hasCondition = Strings.isEmpty(condition) == false;
if (hasCondition)
{
- if (RequestCycle.get().find(AjaxRequestTarget.class) != null)
+ if (RequestCycle.get().find(IPartialPageRequestHandler.class) != null)
{
// WICKET-4894
logger.warn("IE CSS engine doesn't support dynamically injected links in " +
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java
index 3708f8a..41f8372 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.head;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -360,7 +360,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem
response.write("]>");
}
- boolean isAjax = RequestCycle.get().find(AjaxRequestTarget.class) != null;
+ boolean isAjax = RequestCycle.get().find(IPartialPageRequestHandler.class) != null;
// the url needs to be escaped when Ajax, because it will break the Ajax Response XML (WICKET-4777)
CharSequence escapedUrl = isAjax ? Strings.escapeMarkup(url): url;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
index 3de2aec..2defe59 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
@@ -27,8 +27,8 @@ import java.util.Set;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.DecoratingHeaderResponse;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.ResourceReference;
@@ -279,7 +279,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
{
renderHeaderItems();
- if (RequestCycle.get().find(AjaxRequestTarget.class) == null)
+ if (RequestCycle.get().find(IPartialPageRequestHandler.class) == null)
{
renderCombinedEventScripts();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
index f19226b..9c79a9a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.ResourceAggregator;
@@ -281,7 +281,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse
protected void render(HeaderItem item, List<HeaderItem> filteredItems)
{
- if (RequestCycle.get().find(AjaxRequestTarget.class) != null)
+ if (RequestCycle.get().find(IPartialPageRequestHandler.class) != null)
{
// we're in an ajax request, so we don't filter and separate stuff....
getRealResponse().render(item);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index 7504a53..f96e66c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebComponent;
@@ -511,7 +511,7 @@ public class Image extends WebComponent implements IResourceListener
*/
protected boolean shouldAddAntiCacheParameter()
{
- return getRequestCycle().find(AjaxRequestTarget.class) != null;
+ return getRequestCycle().find(IPartialPageRequestHandler.class) != null;
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
index 3fcc548..45f58eb 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
@@ -35,6 +35,7 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.extensions.yui.YuiLib;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -269,7 +270,7 @@ public class DatePicker extends Behavior
// remove previously generated markup (see onRendered) via javascript in
// ajax requests to not render the yui calendar multiple times
- AjaxRequestTarget target = component.getRequestCycle().find(AjaxRequestTarget.class);
+ IPartialPageRequestHandler target = component.getRequestCycle().find(IPartialPageRequestHandler.class);
if (target != null)
{
String escapedComponentMarkupId = getEscapedComponentMarkupId();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index 1a9b1a4..81a9e33 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.markup.ComponentTag;
@@ -101,7 +102,7 @@ public class AjaxEditableLabel<T> extends Panel implements IGenericComponent<T>
{
super.renderHead(component, response);
- AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class);
+ IPartialPageRequestHandler target = getRequestCycle().find(IPartialPageRequestHandler.class);
if (target != null)
{
CharSequence callbackScript = getCallbackScript(component);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
index 120eb4b..9d32372 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
@@ -18,9 +18,9 @@ package org.apache.wicket.extensions.ajax.markup.html;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxIndicatorAware;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Response;
@@ -65,7 +65,7 @@ public class AjaxIndicatorAppender extends Behavior
{
super.renderHead(component, response);
- AjaxRequestTarget target = component.getRequestCycle().find(AjaxRequestTarget.class);
+ IPartialPageRequestHandler target = component.getRequestCycle().find(IPartialPageRequestHandler.class);
if (target != null)
{
final String javascript = "var e = Wicket.$('" + getMarkupId() +
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
index 4a99f43..6537130 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
@@ -21,6 +21,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
@@ -358,7 +359,7 @@ public class ModalWindow extends Panel
* @param target
* Request target associated with current ajax request.
*/
- public void show(final AjaxRequestTarget target)
+ public void show(final IPartialPageRequestHandler target)
{
if (shown == false)
{
@@ -377,7 +378,7 @@ public class ModalWindow extends Panel
* @param target
* Request target associated with current ajax request.
*/
- public static void closeCurrent(final AjaxRequestTarget target)
+ public static void closeCurrent(final IPartialPageRequestHandler target)
{
target.appendJavaScript(getCloseJavacriptInternal());
}
@@ -388,7 +389,7 @@ public class ModalWindow extends Panel
* @param target
* Request target associated with current ajax request.
*/
- public void close(final AjaxRequestTarget target)
+ public void close(final IPartialPageRequestHandler target)
{
getContent().setVisible(false);
if (isCustomComponent())
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
index daf7c4d..da0815f 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
@@ -21,6 +21,7 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.IGenericComponent;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.repeater.util.ProviderSubset;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.DefaultItemReuseStrategy;
@@ -201,7 +202,7 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent
getModelObject().add(t);
modelChanged();
- updateBranch(t, getRequestCycle().find(AjaxRequestTarget.class));
+ updateBranch(t, getRequestCycle().find(IPartialPageRequestHandler.class));
}
/**
@@ -221,7 +222,7 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent
getModelObject().remove(t);
modelChanged();
- updateBranch(t, getRequestCycle().find(AjaxRequestTarget.class));
+ updateBranch(t, getRequestCycle().find(IPartialPageRequestHandler.class));
}
/**
@@ -300,7 +301,7 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent
* @param target
* request target
*/
- public abstract void updateBranch(T node, final AjaxRequestTarget target);
+ public abstract void updateBranch(T node, final IPartialPageRequestHandler target);
/**
* Convenience method to update a single node on an {@link AjaxRequestTarget}. Does nothing if
@@ -311,7 +312,7 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent
* @param target
* request target or {@code null}
*/
- public abstract void updateNode(T node, final AjaxRequestTarget target);
+ public abstract void updateNode(T node, final IPartialPageRequestHandler target);
/**
* The state of a node.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
index e3fd69c..1fc431e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
@@ -20,6 +20,7 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.repeater.tree.nested.BranchItem;
import org.apache.wicket.extensions.markup.html.repeater.tree.nested.Subtree;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -105,7 +106,7 @@ public abstract class NestedTree<T> extends AbstractTree<T>
* Overridden to update the corresponding {@link BranchItem} only.
*/
@Override
- public void updateBranch(T t, final AjaxRequestTarget target)
+ public void updateBranch(T t, final IPartialPageRequestHandler target)
{
if (target != null)
{
@@ -131,7 +132,7 @@ public abstract class NestedTree<T> extends AbstractTree<T>
* Overridden to update the corresponding {@link Node} only.
*/
@Override
- public void updateNode(T node, final AjaxRequestTarget target)
+ public void updateNode(T node, final IPartialPageRequestHandler target)
{
if (target != null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d224a5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
index a0cff81..46b6b71 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.tree.table.ITreeColumn;
@@ -170,7 +171,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T>
* For updating of a single branch the whole table is added to the ART.
*/
@Override
- public void updateBranch(T node, AjaxRequestTarget target)
+ public void updateBranch(T node, IPartialPageRequestHandler target)
{
if (target != null)
{
@@ -183,7 +184,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T>
* For an update of a node the complete row item is added to the ART.
*/
@Override
- public void updateNode(T t, final AjaxRequestTarget target)
+ public void updateNode(T t, final IPartialPageRequestHandler target)
{
if (target != null)
{