Author: mgrigorov
Date: Fri May 27 15:03:54 2011
New Revision: 1128344
URL: http://svn.apache.org/viewvc?rev=1128344&view=rev
Log:
WICKET-3744 Add RestartResponseException constructors to specify a
RedirectPolicy
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseException.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseException.java?rev=1128344&r1=1128343&r2=1128344&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseException.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseException.java
Fri May 27 15:03:54 2011
@@ -21,6 +21,7 @@ import org.apache.wicket.request.flow.Re
import org.apache.wicket.request.handler.IPageProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.RenderPageRequestHandler;
+import
org.apache.wicket.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
@@ -61,7 +62,7 @@ public class RestartResponseException ex
public <C extends Page> RestartResponseException(final Class<C>
pageClass,
final PageParameters params)
{
- this(new PageProvider(pageClass, params));
+ this(new PageProvider(pageClass, params),
RedirectPolicy.AUTO_REDIRECT);
}
/**
@@ -72,11 +73,22 @@ public class RestartResponseException ex
*/
public RestartResponseException(final IRequestablePage page)
{
- this(new PageProvider(page));
+ this(new PageProvider(page), RedirectPolicy.AUTO_REDIRECT);
}
- private RestartResponseException(final IPageProvider pageProvider)
+ /**
+ * Redirects to the page provided by the passed {@code pageProvider}
using the explicit
+ * {@code redirectPolicy}
+ *
+ * @param pageProvider
+ * the provider for the page
+ * @param redirectPolicy
+ * the redirect policy to use
+ */
+ public RestartResponseException(final IPageProvider pageProvider,
+ final RedirectPolicy redirectPolicy)
{
- super(new RenderPageRequestHandler(pageProvider));
+ super(new RenderPageRequestHandler(pageProvider,
redirectPolicy));
}
+
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java?rev=1128344&r1=1128343&r2=1128344&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
Fri May 27 15:03:54 2011
@@ -185,7 +185,7 @@ public class WebPageRenderer extends Pag
response.writeTo((WebResponse)requestCycle.getResponse());
}
}
- else if ((!targetUrl.equals(currentUrl) && getRedirectPolicy()
== RedirectPolicy.ALWAYS_REDIRECT) //
+ else if (getRedirectPolicy() == RedirectPolicy.ALWAYS_REDIRECT
//
||
isRedirectToRender() //
|| (isAjax && targetUrl.equals(currentUrl)))
