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 2016/04/16 22:36:12 UTC
wicket git commit: WICKET-6129 javadoc and deprecated: removeAll is
removeScheduled now
Repository: wicket
Updated Branches:
refs/heads/WICKET-6129-scheduled-handler-notification 95c06fb98 -> e1d6ba425
WICKET-6129 javadoc and deprecated: removeAll is removeScheduled now
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e1d6ba42
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e1d6ba42
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e1d6ba42
Branch: refs/heads/WICKET-6129-scheduled-handler-notification
Commit: e1d6ba4258fb0340a53a65636fe3fd1789085e1d
Parents: 95c06fb
Author: Sven Meier <sv...@apache.org>
Authored: Sat Apr 16 22:35:38 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sat Apr 16 22:35:38 2016 +0200
----------------------------------------------------------------------
.../wicket/NonResettingRestartException.java | 5 ++---
.../wicket/request/RequestHandlerExecutor.java | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e1d6ba42/wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java b/wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java
index 3262445..07f2dd5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/NonResettingRestartException.java
@@ -95,9 +95,8 @@ public class NonResettingRestartException extends RequestHandlerExecutor.Replace
*
* @param handler
* the IRequestHandler to use
- * @param removeAll
- * a flag indicating whether to ignore all already scheduled IRequestHandlers before throwing
- * this exception
+ * @param removeScheduled
+ * a flag indicating whether to remove already a scheduled IRequestHandler
*/
public NonResettingRestartException(final IRequestHandler handler, boolean removeAll)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/e1d6ba42/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
index be7e2ec..4c0e5e5 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
@@ -184,7 +184,7 @@ public abstract class RequestHandlerExecutor
{
private static final long serialVersionUID = 1L;
- private final boolean removeAll;
+ private final boolean removeScheduled;
private final IRequestHandler replacementRequestHandler;
@@ -192,21 +192,29 @@ public abstract class RequestHandlerExecutor
* Construct.
*
* @param replacementRequestHandler
- * @param removeAll
+ * @param removeScheduled should a possibly scheduled handler be removed
*/
public ReplaceHandlerException(final IRequestHandler replacementRequestHandler,
- final boolean removeAll)
+ final boolean removeScheduled)
{
this.replacementRequestHandler = replacementRequestHandler;
- this.removeAll = removeAll;
+ this.removeScheduled = removeScheduled;
}
/**
- * Should any scheduled handler be removed before replacing the handler
+ * @deprecated use {@link #getRemoveScheduledl()} instead
*/
public boolean isRemoveAll()
{
- return removeAll;
+ return removeScheduled;
+ }
+
+ /**
+ * Should a scheduled handler be removed before replacing the handler
+ */
+ public boolean getRemoveScheduledl()
+ {
+ return removeScheduled;
}
/**