Author: jdonnerstag
Date: Sat Jan 17 13:35:27 2009
New Revision: 735338
URL: http://svn.apache.org/viewvc?rev=735338&view=rev
Log:
changed IndexSharedResourceCodingStrategy.encode to use LinkedHashMap to avoid
difference between Java 5 and 6. Tests should now pass irrespective of the jdk
version
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.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=735338&r1=735337&r2=735338&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 Sat
Jan 17 13:35:27 2009
@@ -18,7 +18,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.util.string.IStringIterator;
@@ -37,12 +36,9 @@
*
* @author Jonathan Locke
*/
-...@suppresswarnings("unused")
public final class PageParameters extends ValueMap
{
- /**
- * Null value for page parameters
- */
+ /** Null value for page parameters */
public static final PageParameters NULL = new PageParameters();
private static final long serialVersionUID = 1L;
@@ -139,20 +135,22 @@
}
}
+ /**
+ * @see org.apache.wicket.util.value.ValueMap#put(java.lang.String,
java.lang.Object)
+ */
@Override
public Object put(String key, Object value)
{
- return super.put(key, value);
-/*
- * BRING BACK IN 1.4
- *
- * if (!(key instanceof String)) { throw new IllegalArgumentException(
"PageParameter keys must be
- * of type String, but you supplied a " + key.getClass().getName()); } if
(value instanceof String
- * || value instanceof String[]) { return super.put(key, value); } else {
throw new
- * IllegalArgumentException("You tried to add an object of type " +
value.getClass().getName() + "
- * to your PageParameters for key " + key + ", but you are only allowed to use
String or
- * String[]."); }
- */
+ if ((value == null) || (value instanceof String) || (value
instanceof String[]))
+ {
+ return super.put(key, value);
+ }
+ else
+ {
+ throw new IllegalArgumentException("You tried to add an
object of type " +
+ value.getClass().getName() + "to your
PageParameters for key " + key +
+ ", but you are only allowed to use String or
String[].");
+ }
}
/**
@@ -178,7 +176,7 @@
public Map<String, String[]> toRequestParameters()
{
Map<String, String[]> params = new HashMap<String,
String[]>(size());
- for (Entry<String, Object> entry : entrySet())
+ for (Map.Entry<String, Object> entry : entrySet())
{
if (entry.getValue() == null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java?rev=735338&r1=735337&r2=735338&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
Sat Jan 17 13:35:27 2009
@@ -95,7 +95,6 @@
*/
public RequestParameters()
{
-
}
/**
@@ -318,10 +317,9 @@
*/
public void setPath(String pathInfo)
{
- this.path = pathInfo;
+ path = pathInfo;
}
-
/**
* Sets any resource key.
*
@@ -451,5 +449,4 @@
{
this.queryString = queryString;
}
-
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java?rev=735338&r1=735337&r2=735338&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java
Sat Jan 17 13:35:27 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.target.coding;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.StringTokenizer;
@@ -130,7 +130,7 @@
if (params != null)
{
- params = new HashMap<String, Object>(params);
+ params = new LinkedHashMap<String, Object>(params);
int index = 0;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java?rev=735338&r1=735337&r2=735338&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java
Sat Jan 17 13:35:27 2009
@@ -96,7 +96,7 @@
params.put("test", new String[] { "testval1", "testval2" });
params.add("foo", "fooval");
final String url = cycle.urlFor(new
ResourceReference(RESOURCE_NAME), params).toString();
-
assertEquals("test/param0/param1?foo=fooval&test=testval1&test=testval2", url);
+
assertEquals("test/param0/param1?test=testval1&test=testval2&foo=fooval", url);
tester.getServletRequest().setURL(URL_PREFIX + url);
tester.processRequestCycle(cycle);
assertEquals(4, resource.params.size());
