svn commit: r662286 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: PageParameters.java request/target/component/BookmarkablePageRequestTarget.java

[ivaynberg]

Author: ivaynberg
Date: Sun Jun  1 13:51:48 2008
New Revision: 662286

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

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java?rev=662286&r1=662285&r2=662286&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java 
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java Sun 
Jun  1 13:51:48 2008
@@ -63,7 +63,7 @@
         *            The map to copy
         * @see ValueMap#ValueMap(java.util.Map)
         */
-       public PageParameters(final Map parameterMap)
+       public PageParameters(final Map<String, Object> parameterMap)
        {
                super(parameterMap);
 

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?rev=662286&r1=662285&r2=662286&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
 Sun Jun  1 13:51:48 2008
@@ -18,7 +18,6 @@
 
 import java.lang.ref.WeakReference;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.apache.wicket.IPageFactory;
 import org.apache.wicket.Page;
@@ -90,7 +89,7 @@
         */
        public <C extends Page<?>> BookmarkablePageRequestTarget(String 
pageMapName, Class<C> pageClass)
        {
-               this(null, pageClass, null);
+               this(pageMapName, pageClass, null);
        }
 
        /**
@@ -286,24 +285,7 @@
                {
                        // Add bookmarkable params in for WICKET-400.
                        final Map<String, String[]> requestMap = 
requestCycle.getRequest().getParameterMap();
-                       for (Entry<String, Object> entry : 
pageParameters.entrySet())
-                       {
-                               final Object value = entry.getValue();
-                               if (value.getClass().isArray())
-                               {
-                                       final Object[] objects = 
(Object[])value;
-                                       final String[] strings = new 
String[objects.length];
-                                       for (int i = 0; i < objects.length; i++)
-                                       {
-                                               strings[i] = 
objects[i].toString();
-                                       }
-                                       requestMap.put(entry.getKey(), strings);
-                               }
-                               else
-                               {
-                                       requestMap.put(entry.getKey(), new 
String[] { value.toString() });
-                               }
-                       }
+                       requestMap.putAll(pageParameters.toRequestParameters());
                        return pageFactory.newPage(pageClass, pageParameters);
                }
        }