You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/01/19 18:18:40 UTC

wicket git commit: WICKET-5797 Convenience method to call setResponsePage with forward option

Repository: wicket
Updated Branches:
  refs/heads/master c40490ba9 -> 41601d890


WICKET-5797 Convenience method to call setResponsePage with forward option


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/41601d89
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/41601d89
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/41601d89

Branch: refs/heads/master
Commit: 41601d890e49e77e373b0603b4e9464136b1dfb0
Parents: c40490b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 19 19:18:14 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 19 19:18:14 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/Component.java  |  2 +-
 .../wicket/request/cycle/RequestCycle.java      | 38 +++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/41601d89/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 097e3d9..eb8dc01 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3163,7 +3163,7 @@ public abstract class Component
 	 */
 	public final <C extends IRequestablePage> void setResponsePage(final Class<C> cls)
 	{
-		getRequestCycle().setResponsePage(cls, null);
+		getRequestCycle().setResponsePage(cls, (PageParameters)null);
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/wicket/blob/41601d89/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index e6ada70..04baf9e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -668,32 +668,60 @@ public class RequestCycle implements IRequestCycle, IEventSink
 			RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
 	}
 
-
 	/**
 	 * Convenience method for setting next page to be rendered.
 	 * 
 	 * @param pageClass
+	 *              The class of the page to render
 	 */
 	public void setResponsePage(Class<? extends IRequestablePage> pageClass)
 	{
-		IPageProvider provider = new PageProvider(pageClass, null);
-		scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(provider,
-			RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT));
+		setResponsePage(pageClass, null, RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT);
 	}
 
+	/**
+	 * Convenience method for setting next page to be rendered.
+	 *
+	 * @param pageClass
+	 *              The class of the page to render
+	 * @param redirectPolicy
+	 *              The policy to use when deciding whether to redirect or not
+	 */
+	public void setResponsePage(Class<? extends IRequestablePage> pageClass, RenderPageRequestHandler.RedirectPolicy redirectPolicy)
+	{
+		setResponsePage(pageClass, null, redirectPolicy);
+	}
 
 	/**
 	 * Convenience method for setting next page to be rendered.
 	 * 
 	 * @param pageClass
+	 *              The class of the page to render
 	 * @param parameters
+	 *              The query parameters for the page to be rendered
 	 */
 	public void setResponsePage(Class<? extends IRequestablePage> pageClass,
 		PageParameters parameters)
 	{
+		setResponsePage(pageClass, parameters, RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT);
+	}
+
+	/**
+	 * Convenience method for setting next page to be rendered.
+	 *
+	 * @param pageClass
+	 *              The class of the page to render
+	 * @param parameters
+	 *              The query parameters for the page to be rendered
+	 * @param redirectPolicy
+	 *              The policy to use when deciding whether to redirect or not
+	 */
+	public void setResponsePage(Class<? extends IRequestablePage> pageClass,
+	                            PageParameters parameters, RenderPageRequestHandler.RedirectPolicy redirectPolicy)
+	{
 		IPageProvider provider = new PageProvider(pageClass, parameters);
 		scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(provider,
-			RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT));
+				redirectPolicy));
 	}
 
 	/**