You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/07/13 16:58:37 UTC
svn commit: r1146085 - in
/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter:
IIndexedParameters.java INamedParameters.java PageParameters.java
Author: mgrigorov
Date: Wed Jul 13 14:58:36 2011
New Revision: 1146085
URL: http://svn.apache.org/viewvc?rev=1146085&view=rev
Log:
WICKET-3896 INamedParameters and IIndexedParameters should not know about their implementations
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IIndexedParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IIndexedParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IIndexedParameters.java?rev=1146085&r1=1146084&r2=1146085&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IIndexedParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/IIndexedParameters.java Wed Jul 13 14:58:36 2011
@@ -34,7 +34,7 @@ public interface IIndexedParameters
* @param object
* @return this
*/
- PageParameters set(final int index, final Object object);
+ IIndexedParameters set(final int index, final Object object);
/**
* @param index
@@ -48,13 +48,13 @@ public interface IIndexedParameters
* @param index
* @return this
*/
- PageParameters remove(final int index);
+ IIndexedParameters remove(final int index);
/**
* Removes all indexed parameters.
*
* @return this
*/
- PageParameters clearIndexed();
+ IIndexedParameters clearIndexed();
}
\ No newline at end of file
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java?rev=1146085&r1=1146084&r2=1146085&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java Wed Jul 13 14:58:36 2011
@@ -65,7 +65,7 @@ public interface INamedParameters
* @param name
* @return this
*/
- PageParameters remove(final String name);
+ INamedParameters remove(final String name);
/**
* Adds value to named parameter with given name.
@@ -74,7 +74,7 @@ public interface INamedParameters
* @param value
* @return this
*/
- PageParameters add(final String name, final Object value);
+ INamedParameters add(final String name, final Object value);
/**
* Adds named parameter to a specified position. The {@link IRequestMapper}s may or may not take
@@ -85,7 +85,7 @@ public interface INamedParameters
* @param index
* @return this
*/
- PageParameters add(final String name, final Object value, final int index);
+ INamedParameters add(final String name, final Object value, final int index);
/**
* Sets the named parameter on specified position. The {@link IRequestMapper}s may or may not
@@ -96,7 +96,7 @@ public interface INamedParameters
* @param index
* @return this
*/
- PageParameters set(final String name, final Object value, final int index);
+ INamedParameters set(final String name, final Object value, final int index);
/**
* Sets the value for named parameter with given name.
@@ -105,13 +105,13 @@ public interface INamedParameters
* @param value
* @return this
*/
- PageParameters set(final String name, final Object value);
+ INamedParameters set(final String name, final Object value);
/**
* Removes all named parameters.
*
* @return this
*/
- PageParameters clearNamed();
+ INamedParameters clearNamed();
}
\ No newline at end of file
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java?rev=1146085&r1=1146084&r2=1146085&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java Wed Jul 13 14:58:36 2011
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.request.mapper.parameter;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -25,6 +24,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.wicket.IClusterable;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
@@ -48,9 +48,9 @@ import org.apache.wicket.util.value.Valu
*
* @author Matej Knopp
*/
-public class PageParameters implements Serializable, IIndexedParameters, INamedParameters
+public class PageParameters implements IClusterable, IIndexedParameters, INamedParameters
{
- private static class Entry implements Serializable
+ private static class Entry implements IClusterable
{
private static final long serialVersionUID = 1L;