Author: mgrigorov
Date: Thu Nov 17 16:04:49 2011
New Revision: 1203231
URL: http://svn.apache.org/viewvc?rev=1203231&view=rev
Log:
WICKET-4076 INamedParameters.getAllNamed() returns a list of NamedPairs defined
as inner class of PageParameters
Modified:
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/INamedParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/INamedParameters.java?rev=1203231&r1=1203230&r2=1203231&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
Thu Nov 17 16:04:49 2011
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.request.IRequestMapper;
-import org.apache.wicket.request.mapper.parameter.PageParameters.NamedPair;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.StringValue;
/**
@@ -30,6 +30,47 @@ import org.apache.wicket.util.string.Str
*/
public interface INamedParameters
{
+ /**
+ * Represents a named parameter entry. There can be multiple {@link
NamedPair}s in
+ * {@link PageParameters} that have same key.
+ *
+ * @author Matej Knopp
+ */
+ public static class NamedPair
+ {
+ private final String key;
+ private final String value;
+
+ /**
+ * Constructor
+ *
+ * @param key
+ * @param value
+ */
+ public NamedPair(final String key, final String value)
+ {
+ Args.notEmpty(key, "key");
+ this.key = key;
+ this.value = value;
+ }
+
+ /**
+ * @return key
+ */
+ public String getKey()
+ {
+ return key;
+ }
+
+ /**
+ * @return value
+ */
+ public String getValue()
+ {
+ return value;
+ }
+ }
+
/**
* Return set of all named parameter names.
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=1203231&r1=1203230&r2=1203231&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
Thu Nov 17 16:04:49 2011
@@ -319,47 +319,6 @@ public class PageParameters implements I
}
/**
- * Represents a named parameter entry. There can be multiple {@link
NamedPair}s in
- * {@link PageParameters} that have same key.
- *
- * @author Matej Knopp
- */
- public static class NamedPair
- {
- private final String key;
- private final String value;
-
- /**
- * Constructor
- *
- * @param key
- * @param value
- */
- public NamedPair(final String key, final String value)
- {
- Args.notEmpty(key, "key");
- this.key = key;
- this.value = value;
- }
-
- /**
- * @return key
- */
- public String getKey()
- {
- return key;
- }
-
- /**
- * @return value
- */
- public String getValue()
- {
- return value;
- }
- }
-
- /**
* @see
org.apache.wicket.request.mapper.parameter.INamedParameters#getAllNamed()
*/
public List<NamedPair> getAllNamed()