svn commit: r628494 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java

[kn...@apache.org]

Author: knopp
Date: Sun Feb 17 07:38:18 2008
New Revision: 628494

URL: http://svn.apache.org/viewvc?rev=628494&view=rev
Log:
WICKET-1343

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java?rev=628494&r1=628493&r2=628494&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java Sun Feb 17 07:38:18 2008
@@ -52,7 +52,7 @@
  * an immediate redirect after hitting bookmarkable URL, e.g. it immediately redirects from
  * /mount/path to /mount/path.3 where 3 is the next page id. This preserves the page instance on
  * subsequent page refresh.
- * 
+ *
  * @author Matej Knopp
  */
 public class HybridUrlCodingStrategy extends AbstractRequestTargetUrlCodingStrategy
@@ -64,7 +64,7 @@
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param mountPath
 	 * @param pageClass
 	 * @param redirectOnBookmarkableRequest
@@ -81,7 +81,7 @@
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param mountPath
 	 * @param pageClass
 	 */
@@ -92,7 +92,7 @@
 
 	/**
 	 * Returns the amount of trailing slashes in the given string
-	 * 
+	 *
 	 * @param seq
 	 * @return
 	 */
@@ -116,7 +116,7 @@
 	/**
 	 * Returns whether after hitting bookmarkable url the request should be redirected to a hybrid
 	 * URL. This is recommended for pages with Ajax.
-	 * 
+	 *
 	 * @return
 	 */
 	protected boolean isRedirectOnBookmarkableRequest()
@@ -126,7 +126,7 @@
 
 	/**
 	 * Returns whether to redirect when there is pageMap specified in bookmarkable URL
-	 * 
+	 *
 	 * @return
 	 */
 	protected boolean alwaysRedirectWhenPageMapIsSpecified()
@@ -239,11 +239,11 @@
 	 * Handles the case where a non-bookmarkable url with a hybrid base refers to a page that is no
 	 * longer in session. eg <code>/context/hybrid-mount.0.23?wicket:interface=...</code>. The
 	 * default behavior is to throw a <code>PageExpiredException</code>.
-	 * 
+	 *
 	 * This method can be overwritten to, for example, return the user to a new instance of the
 	 * bookmarkable page that was mounted using hybrid strategy - this, however, should only be used
 	 * in cases where the page expects no page parameters because they are no longer available.
-	 * 
+	 *
 	 * @param pageMapName
 	 *            page map name this page is mounted in
 	 * @param pageClass
@@ -264,7 +264,7 @@
 	/**
 	 * Returns the number of trailing slashes in the url when the page in request target was created
 	 * or null if the number can't be determined.
-	 * 
+	 *
 	 * @param requestTarget
 	 * @return
 	 */
@@ -281,7 +281,7 @@
 
 	/**
 	 * Extracts the PageParameters from given request target
-	 * 
+	 *
 	 * @param requestTarget
 	 * @return
 	 */
@@ -306,7 +306,7 @@
 
 	/**
 	 * Extracts the PageInfo from given request target
-	 * 
+	 *
 	 * @param requestTarget
 	 * @return
 	 */
@@ -340,7 +340,7 @@
 	/**
 	 * Sets the initial page parameters for page instance. Use this only if you know what you are
 	 * doing.
-	 * 
+	 *
 	 * @param page
 	 * @param pageParameters
 	 */
@@ -401,7 +401,7 @@
 
 	/**
 	 * Fix the amount of trailing slashes in the specified buffer.
-	 * 
+	 *
 	 * @param buffer
 	 * @param desiredCount
 	 */
@@ -476,7 +476,7 @@
 
 	/**
 	 * Class that encapsulates {@link PageInfo} instance and the URL part prior the PageInfo part
-	 * 
+	 *
 	 * @author Matej Knopp
 	 */
 	protected static class PageInfoExtraction
@@ -487,7 +487,7 @@
 
 		/**
 		 * Construct.
-		 * 
+		 *
 		 * @param urlAfterExtraction
 		 * @param pageInfo
 		 */
@@ -516,7 +516,7 @@
 
 	/**
 	 * Extracts the PageInfo string.
-	 * 
+	 *
 	 * @param url
 	 * @return
 	 */
@@ -569,7 +569,7 @@
 
 	/**
 	 * Encodes the PageInfo part to the URL
-	 * 
+	 *
 	 * @param url
 	 * @param pageInfo
 	 * @return
@@ -596,7 +596,7 @@
 	 * <li>pageMap.pageId.version
 	 * <li>pageMap.pageId (only if pageMap name starts with a letter)
 	 * </ul>
-	 * 
+	 *
 	 * @author Matej Knopp
 	 */
 	protected static class PageInfo
@@ -607,7 +607,7 @@
 
 		/**
 		 * Construct.
-		 * 
+		 *
 		 * @param pageId
 		 * @param versionNumber
 		 * @param pageMapName
@@ -727,7 +727,7 @@
 
 		/**
 		 * Method that rigidly checks if the string consists of digits only.
-		 * 
+		 *
 		 * @param string
 		 * @return
 		 */
@@ -756,7 +756,7 @@
 		 * <li>pageMap.pageId (only in if pageMap name starts with a letter)
 		 * <li>pageMap.pageId.version
 		 * </ul>
-		 * 
+		 *
 		 * @param src
 		 * @return
 		 */
@@ -838,7 +838,7 @@
 	/**
 	 * BookmarkablePage request target that does a redirect after bookmarkable page was rendered
 	 * (only if the bookmarkable page is stateful though)
-	 * 
+	 *
 	 * @author Matej Knopp
 	 */
 	public static class HybridBookmarkablePageRequestTarget extends BookmarkablePageRequestTarget
@@ -848,7 +848,7 @@
 
 		/**
 		 * Construct.
-		 * 
+		 *
 		 * @param pageMapName
 		 * @param pageClass
 		 * @param pageParameters
@@ -866,7 +866,7 @@
 		protected Page newPage(Class pageClass, RequestCycle requestCycle)
 		{
 			Page page = super.newPage(pageClass, requestCycle);
-			page.setMetaData(PAGE_PARAMETERS_META_DATA_KEY, getPageParameters());
+			page.setMetaData(PAGE_PARAMETERS_META_DATA_KEY, new PageParameters(getPageParameters()));
 			page.setMetaData(ORIGINAL_TRAILING_SLASHES_COUNT_METADATA_KEY, new Integer(
 				originalUrlTrailingSlashesCount));
 			return page;