Author: jdonnerstag
Date: Sun Apr 12 20:51:27 2009
New Revision: 764325
URL: http://svn.apache.org/viewvc?rev=764325&view=rev
Log:
fixed WICKET-2036 Map getParameterMap() returns Map (no generics). Should be
Map<String,?>
Issue: WICKET-2036
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
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=764325&r1=764324&r2=764325&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
Sun Apr 12 20:51:27 2009
@@ -16,9 +16,7 @@
*/
package org.apache.wicket.request;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.wicket.IClusterable;
import org.apache.wicket.RequestListenerInterface;
@@ -76,7 +74,7 @@
private String bookmarkablePageClass;
/** free-to-use map of non-reserved parameters. */
- private Map parameters;
+ private Map<String, ?> parameters;
/** any resource key. */
private String resourceKey;
@@ -170,7 +168,7 @@
*
* @return free-to-use map of non-reserved parameters
*/
- public Map getParameters()
+ public Map<String, ?> getParameters()
{
return parameters;
}
@@ -304,7 +302,7 @@
* @param parameters
* free-to-use map of non-reserved parameters
*/
- public void setParameters(Map parameters)
+ public void setParameters(Map<String, ?> parameters)
{
this.parameters = parameters;
}
@@ -387,9 +385,15 @@
if (getParameters() != null)
{
b.append(" parameters={");
- for (Iterator i =
getParameters().entrySet().iterator(); i.hasNext();)
+ boolean first = true;
+ for (Map.Entry<String, ?> entry :
getParameters().entrySet())
{
- Entry entry = (Entry)i.next();
+ if (first == false)
+ {
+ b.append(",");
+ }
+ first = false;
+
Object value = entry.getValue();
b.append(entry.getKey()).append("=");
if (value != null && value instanceof Object[])
@@ -417,10 +421,6 @@
{
b.append(value);
}
- if (i.hasNext())
- {
- b.append(",");
- }
}
b.append("}");
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java?rev=764325&r1=764324&r2=764325&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
Sun Apr 12 20:51:27 2009
@@ -83,7 +83,7 @@
* @param parameters
* Map object to be encoded
*/
- protected void appendParameters(AppendingStringBuffer url, Map<?, ?>
parameters)
+ protected void appendParameters(AppendingStringBuffer url, Map<String,
?> parameters)
{
if (parameters != null && parameters.size() > 0)
{
@@ -132,7 +132,7 @@
* query string parameters
* @return Parameters created from the url fragment and query string
*/
- protected ValueMap decodeParameters(String urlFragment, Map<String,
Object> urlParameters)
+ protected ValueMap decodeParameters(String urlFragment, Map<String, ?>
urlParameters)
{
// Hack off any leading slash
if (urlFragment.startsWith("/"))
@@ -227,6 +227,9 @@
}
/**
+ * @param value
+ * @return decoded value
+ *
* @deprecated Use urlEncodePathComponent or urlEncodeQueryComponent
instead
*/
@Deprecated
@@ -236,6 +239,9 @@
}
/**
+ * @param string
+ * @return encoded value
+ *
* @deprecated Use urlEncodePathComponent or urlEncodeQueryComponent
instead
*/
@Deprecated
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java?rev=764325&r1=764324&r2=764325&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
Sun Apr 12 20:51:27 2009
@@ -55,8 +55,8 @@
* @param pageMapName
* the page map name if any
*/
- public <C extends Page> BookmarkablePageRequestTargetUrlCodingStrategy(
- final String mountPath, final Class<C> bookmarkablePageClass,
String pageMapName)
+ public <C extends Page>
BookmarkablePageRequestTargetUrlCodingStrategy(final String mountPath,
+ final Class<C> bookmarkablePageClass, final String pageMapName)
{
super(mountPath);
@@ -65,8 +65,7 @@
throw new IllegalArgumentException("Argument
bookmarkablePageClass must be not null");
}
- bookmarkablePageClassRef = new WeakReference<Class<? extends
Page>>(
- bookmarkablePageClass);
+ bookmarkablePageClassRef = new WeakReference<Class<? extends
Page>>(bookmarkablePageClass);
this.pageMapName = pageMapName;
}
@@ -77,6 +76,7 @@
{
final String parametersFragment =
requestParameters.getPath().substring(
getMountPath().length());
+
final PageParameters parameters = new
PageParameters(decodeParameters(parametersFragment,
requestParameters.getParameters()));
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=764325&r1=764324&r2=764325&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
Sun Apr 12 20:51:27 2009
@@ -125,8 +125,7 @@
final RequestParameters requestParameters =
target.getRequestParameters();
- @SuppressWarnings("unchecked")
- Map<String, Object> params = requestParameters.getParameters();
+ Map<String, ?> params = requestParameters.getParameters();
if (params != null)
{
@@ -167,7 +166,7 @@
boolean first = true;
// go through remaining parameters
- for (Map.Entry<String, Object> arg :
params.entrySet())
+ for (Map.Entry<String, ?> arg :
params.entrySet())
{
final String key =
urlEncodeQueryComponent(arg.getKey());
final Object obj = arg.getValue();
@@ -245,7 +244,7 @@
* java.util.Map)
*/
@Override
- protected ValueMap decodeParameters(String path, Map<String, Object>
queryParameters)
+ protected ValueMap decodeParameters(String path, Map<String, ?>
queryParameters)
{
final ValueMap parameters = new ValueMap(queryParameters);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java?rev=764325&r1=764324&r2=764325&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
Sun Apr 12 20:51:27 2009
@@ -17,10 +17,10 @@
package org.apache.wicket.request.target.coding;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import org.apache.wicket.Page;
import org.apache.wicket.PageMap;
import org.apache.wicket.PageParameters;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -51,6 +51,7 @@
/**
* Construct.
*
+ * @param <C>
* @param mountPath
* mount path
* @param bookmarkablePageClass
@@ -60,8 +61,8 @@
* @param parameterNames
* the parameter names (not null)
*/
- public MixedParamUrlCodingStrategy(String mountPath, Class
bookmarkablePageClass,
- String pageMapName, String[] parameterNames)
+ public <C extends Page> MixedParamUrlCodingStrategy(String mountPath,
+ Class<C> bookmarkablePageClass, String pageMapName, String[]
parameterNames)
{
super(mountPath, bookmarkablePageClass, pageMapName);
this.parameterNames = parameterNames;
@@ -70,6 +71,7 @@
/**
* Construct.
*
+ * @param <C>
* @param mountPath
* mount path (not empty)
* @param bookmarkablePageClass
@@ -77,23 +79,27 @@
* @param parameterNames
* the parameter names (not null)
*/
- public MixedParamUrlCodingStrategy(String mountPath, Class
bookmarkablePageClass,
- String[] parameterNames)
+ public <C extends Page> MixedParamUrlCodingStrategy(String mountPath,
+ Class<C> bookmarkablePageClass, String[] parameterNames)
{
super(mountPath, bookmarkablePageClass, PageMap.DEFAULT_NAME);
this.parameterNames = parameterNames;
}
- /** {...@inheritdoc} */
+ /**
+ * @see
org.apache.wicket.request.target.coding.AbstractRequestTargetUrlCodingStrategy#appendParameters(org.apache.wicket.util.string.AppendingStringBuffer,
+ * java.util.Map)
+ */
@Override
- protected void appendParameters(AppendingStringBuffer url, Map
parameters)
+ protected void appendParameters(AppendingStringBuffer url, Map<String,
?> parameters)
{
if (!url.endsWith("/"))
{
url.append("/");
}
- Set parameterNamesToAdd = new HashSet(parameters.keySet());
+ Set<String> parameterNamesToAdd = new
HashSet<String>(parameters.keySet());
+
// Find index of last specified parameter
boolean foundParameter = false;
int lastSpecifiedParameter = parameterNames.length;
@@ -125,11 +131,9 @@
if (!parameterNamesToAdd.isEmpty())
{
boolean first = true;
- final Iterator iterator =
parameterNamesToAdd.iterator();
- while (iterator.hasNext())
+ for (String parameterName : parameterNamesToAdd)
{
url.append(first ? '?' : '&');
- String parameterName = (String)iterator.next();
final Object param =
parameters.get(parameterName);
String value = param instanceof String[] ?
((String[])param)[0] : (String)param;
url.append(urlEncodeQueryComponent(parameterName)).append("=").append(
@@ -139,9 +143,12 @@
}
}
- /** {...@inheritdoc} */
+ /**
+ * @see
org.apache.wicket.request.target.coding.AbstractRequestTargetUrlCodingStrategy#decodeParameters(java.lang.String,
+ * java.util.Map)
+ */
@Override
- protected ValueMap decodeParameters(String urlFragment, Map
urlParameters)
+ protected ValueMap decodeParameters(String urlFragment, Map<String, ?>
urlParameters)
{
PageParameters params = new PageParameters();
// Add all url parameters
