Author: jcompagner
Date: Wed May 7 02:09:48 2008
New Revision: 654048
URL: http://svn.apache.org/viewvc?rev=654048&view=rev
Log:
WICKET-1521
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java?rev=654048&r1=654047&r2=654048&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
Wed May 7 02:09:48 2008
@@ -79,7 +79,7 @@
* the parameter names (not null)
*/
public MixedParamUrlCodingStrategy(String mountPath, Class
bookmarkablePageClass,
- String pageMapName, String[] parameterNames)
+ String pageMapName, String[] parameterNames)
{
super(mountPath, bookmarkablePageClass, pageMapName);
this.parameterNames = parameterNames;
@@ -96,7 +96,7 @@
* the parameter names (not null)
*/
public MixedParamUrlCodingStrategy(String mountPath, Class
bookmarkablePageClass,
- String[] parameterNames)
+ String[] parameterNames)
{
super(mountPath, bookmarkablePageClass, PageMap.DEFAULT_NAME);
this.parameterNames = parameterNames;
@@ -124,7 +124,8 @@
for (int i = 0; i <= lastSpecifiedParameter; i++)
{
String parameterName = parameterNames[i];
- String value =
(String)parameters.get(parameterName);
+ final Object param =
parameters.get(parameterName);
+ String value = param instanceof String[] ?
((String[])param)[0] : (String)param;
if (value == null)
{
value = "";
@@ -150,7 +151,8 @@
{
url.append(first ? '?' : '&');
String parameterName = (String)iterator.next();
- String value =
(String)parameters.get(parameterName);
+ final Object param =
parameters.get(parameterName);
+ String value = param instanceof String[] ?
((String[])param)[0] : (String)param;
url.append(urlEncode(parameterName)).append("=").append(urlEncode(value));
first = false;
}
@@ -175,7 +177,7 @@
if (pathParts.length > parameterNames.length)
{
throw new IllegalArgumentException(
- "Too many path parts, please
provide sufficient number of path parameter names");
+ "Too many path parts, please provide
sufficient number of path parameter names");
}
for (int i = 0; i < pathParts.length; i++)
