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

[almaw]

Author: almaw
Date: Sun May 13 10:04:05 2007
New Revision: 537613

URL: http://svn.apache.org/viewvc?view=rev&rev=537613
Log:
Page params for WICKET-400.

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

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?view=diff&rev=537613&r1=537612&r2=537613
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
 Sun May 13 10:04:05 2007
@@ -52,7 +52,8 @@
        private int depthRelativeToWicketHandler = -1;
        private String relativePathPrefixToWicketHandler;
        private String relativePathPrefixToContextRoot;
-
+       private Map parameterMap;
+       
        /**
         * Protected constructor.
         * 
@@ -106,8 +107,14 @@
         */
        public Map getParameterMap()
        {
+               // Lazy-init parameter map. Only make one copy. It's more 
efficient, and
+               // we can add stuff to it (which the BookmarkablePage stuff 
does).
+               if (parameterMap == null)
+               {
+                       parameterMap = new 
HashMap(httpServletRequest.getParameterMap());
+               }
                // return a mutable copy
-               return new HashMap(httpServletRequest.getParameterMap());
+               return parameterMap;
        }
 
        /**

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=537613&r1=537612&r2=537613
==============================================================================
--- 
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
 Sun May 13 10:04:05 2007
@@ -255,6 +255,8 @@
                }
                else
                {
+                       // Add bookmarkable params in for WICKET-400.
+                       
requestCycle.getRequest().getParameterMap().putAll(pageParameters);
                        return pageFactory.newPage(pageClass, pageParameters);
                }
        }