svn commit: r540592 - in /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./ protocol/http/ request/target/component/

[al...@apache.org]

Author: almaw
Date: Tue May 22 07:09:09 2007
New Revision: 540592

URL: http://svn.apache.org/viewvc?view=rev&rev=540592
Log:
RequestCycle.getRedirect() -> WebRequestCycle.isRedirect(), with deprecated delegate.

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?view=diff&rev=540592&r1=540591&r2=540592
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java Tue May 22 07:09:09 2007
@@ -342,8 +342,19 @@
 	 * Gets whether the page for this request should be redirected.
 	 * 
 	 * @return whether the page for this request should be redirected
+	 * @deprecated Use {@link #isRedirect()} instead
 	 */
-	public boolean getRedirect()
+	public final boolean getRedirect()
+	{
+		return isRedirect();
+	}
+
+	/**
+	 * Gets whether the page for this request should be redirected.
+	 * 
+	 * @return whether the page for this request should be redirected
+	 */
+	public boolean isRedirect()
 	{
 		return redirect;
 	}
@@ -1178,7 +1189,7 @@
 			getSession().detach();
 		}
 
-		if (getRedirect())
+		if (isRedirect())
 		{
 			// Since we are explicitly redirecting to a page already, we do not
 			// want a second redirect to occur automatically

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=540592&r1=540591&r2=540592
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Tue May 22 07:09:09 2007
@@ -258,11 +258,11 @@
 	}
 
 	/**
-	 * If it's an ajax request we always redirects.
+	 * If it's an ajax request we always redirect.
 	 * 
-	 * @see org.apache.wicket.RequestCycle#getRedirect()
+	 * @see org.apache.wicket.RequestCycle#isRedirect()
 	 */
-	public final boolean getRedirect()
+	public final boolean isRedirect()
 	{
 		if (getWebRequest().isAjax())
 		{
@@ -270,7 +270,7 @@
 		}
 		else
 		{
-			return super.getRedirect();
+			return super.isRedirect();
 		}
 	}
 }

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?view=diff&rev=540592&r1=540591&r2=540592
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java Tue May 22 07:09:09 2007
@@ -198,7 +198,7 @@
 	 */
 	public void processEvents(RequestCycle requestCycle)
 	{
-		if (!requestCycle.getRedirect())
+		if (!requestCycle.isRedirect())
 		{
 			page = getPage(requestCycle);
 		}
@@ -211,7 +211,7 @@
 	{
 		if (pageClass != null)
 		{
-			if (requestCycle.getRedirect())
+			if (requestCycle.isRedirect())
 			{
 				IRequestCycleProcessor processor = requestCycle.getProcessor();
 				String redirectUrl = processor.getRequestCodingStrategy().encode(requestCycle, this).toString();
@@ -270,7 +270,7 @@
 	 */
 	protected final Page getPage(RequestCycle requestCycle)
 	{
-		if (page == null && pageClass != null && !requestCycle.getRedirect())
+		if (page == null && pageClass != null && !requestCycle.isRedirect())
 		{
 			page = newPage(pageClass, requestCycle);
 		}

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java?view=diff&rev=540592&r1=540591&r2=540592
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java Tue May 22 07:09:09 2007
@@ -53,7 +53,7 @@
 	public void respond(RequestCycle requestCycle)
 	{
 		// Should page be redirected to?
-		if (requestCycle.getRedirect())
+		if (requestCycle.isRedirect())
 		{
 			// Redirect to the page
 			requestCycle.redirectTo(page);