You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/03 07:02:57 UTC
svn commit: r992206 - in /wicket/trunk:
wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/
wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
wicket-examples/src/main/java/org/apache/wicket/examples/compref/
wicket-exam...
Author: ivaynberg
Date: Fri Sep 3 05:02:56 2010
New Revision: 992206
URL: http://svn.apache.org/viewvc?rev=992206&view=rev
Log:
optimized pageparameters api
Issue: WICKET-3029
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java Fri Sep 3 05:02:56 2010
@@ -64,7 +64,7 @@ public class InspectorDebugPanel extends
@Override
protected PageParameters getLinkPageParameters() {
PageParameters params = new PageParameters();
- params.addNamedParameter("pageId", getPage().getId());
+ params.add("pageId", getPage().getId());
return params;
}
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java Fri Sep 3 05:02:56 2010
@@ -45,7 +45,7 @@ public final class InspectorBug extends
{
super(id);
PageParameters parameters = new PageParameters();
- parameters.addNamedParameter("pageId", page.getId());
+ parameters.add("pageId", page.getId());
Link<?> link = new BookmarkablePageLink<Void>("link", InspectorPage.class, parameters);
link.add(new NonCachingImage("bug"));
add(link);
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java Fri Sep 3 05:02:56 2010
@@ -52,7 +52,7 @@ public final class InspectorPage extends
IManageablePage page = null;
try
{
- final int pageId = parameters.getNamedParameter("pageId").toInt();
+ final int pageId = parameters.get("pageId").toInt();
page = Session.get().getPageManager().getPage(pageId);
}
catch (StringValueConversionException e)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java Fri Sep 3 05:02:56 2010
@@ -62,13 +62,13 @@ public class BookmarkablePage extends We
// you ever trust
// any API enough to just not check it at all?
if (pageParameters == null ||
- pageParameters.getNamedParameter("message").toOptionalString() == null)
+ pageParameters.get("message").toOptionalString() == null)
{
message = "This is the default message";
}
else
{
- message = pageParameters.getNamedParameter("message").toOptionalString();
+ message = pageParameters.get("message").toOptionalString();
}
// Add a label to display the message
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java Fri Sep 3 05:02:56 2010
@@ -47,7 +47,7 @@ public class BookmarkablePageLinkPage ex
// Note that any arguments are passed as request parameters, and should
// thus be strings
PageParameters parameters = new PageParameters();
- parameters.setNamedParameter("message",
+ parameters.set("message",
"This message was passed as a page parameter argument");
add(new BookmarkablePageLink<Void>("pageLinkWithArgs", BookmarkablePage.class, parameters));
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java Fri Sep 3 05:02:56 2010
@@ -95,10 +95,10 @@ public class Guess extends HangmanPage
};
PageParameters parameters = new PageParameters();
- parameters.setNamedParameter(Letter.PARAMETER_LETTER, letter.asString());
+ parameters.set(Letter.PARAMETER_LETTER, letter.asString());
if (letter.isGuessed())
{
- parameters.setNamedParameter(Letter.PARAMETER_GUESSED, true);
+ parameters.set(Letter.PARAMETER_GUESSED, true);
}
link.add(new Image("image", Letter.LETTER_RESOURCE_REFERENCE, parameters));
listItem.add(link);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java Fri Sep 3 05:02:56 2010
@@ -37,7 +37,7 @@ public class Home extends HangmanPage
public Home(final PageParameters parameters)
{
getSession().bind();
- final String word = parameters.getNamedParameter("word").toOptionalString();
+ final String word = parameters.get("word").toOptionalString();
if (word == null)
{
getGame().newGame(5, new WordGenerator());
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java Fri Sep 3 05:02:56 2010
@@ -102,10 +102,10 @@ public class Letter implements IClustera
{
// request parameter for the resource
boolean guessed = attributes.getParameters()
- .getNamedParameter(PARAMETER_GUESSED)
+ .get(PARAMETER_GUESSED)
.toBoolean(false);
String letter = attributes.getParameters()
- .getNamedParameter(PARAMETER_LETTER)
+ .get(PARAMETER_LETTER)
.toString();
// delegate to another resource
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Fri Sep 3 05:02:56 2010
@@ -43,7 +43,7 @@ public final class BookDetails extends A
*/
public BookDetails(final PageParameters parameters) throws StringValueConversionException
{
- this(Book.get(parameters.getNamedParameter("id").toLong()));
+ this(Book.get(parameters.get("id").toLong()));
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java Fri Sep 3 05:02:56 2010
@@ -35,7 +35,7 @@ public class Page3 extends WicketExample
*/
public Page3(PageParameters parameters)
{
- add(new Label("bookmarkparameter", parameters.getNamedParameter("bookmarkparameter")
+ add(new Label("bookmarkparameter", parameters.get("bookmarkparameter")
.toOptionalString()));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java Fri Sep 3 05:02:56 2010
@@ -40,8 +40,8 @@ public class Page2 extends WicketExample
*/
public Page2(PageParameters parameters)
{
- String p1 = parameters.getNamedParameter("param1").toString("CANNOT RESOLVE FROM URL");
- String p2 = parameters.getNamedParameter("param2").toString("CANNOT RESOLVE FROM URL");
+ String p1 = parameters.get("param1").toString("CANNOT RESOLVE FROM URL");
+ String p2 = parameters.get("param2").toString("CANNOT RESOLVE FROM URL");
add(new Label("p1", p1));
add(new Label("p2", p2));
@@ -49,8 +49,8 @@ public class Page2 extends WicketExample
String newP2 = String.valueOf(random.nextInt());
PageParameters params = new PageParameters();
- params.setNamedParameter("param1", newP1 + " " + newP2);
- params.setNamedParameter("param2", newP2 + " " + newP1);
+ params.set("param1", newP1 + " " + newP2);
+ params.set("param2", newP2 + " " + newP1);
BookmarkablePageLink link = new BookmarkablePageLink("refreshLink", getClass(), params);
add(link);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java Fri Sep 3 05:02:56 2010
@@ -43,14 +43,14 @@ public class Page5 extends WicketExample
public Page5(PageParameters parameters)
{
String p1 = "CANNOT RESOLVE FROM URL";
- if (parameters.getNamedParameterKeys().contains("param1"))
+ if (parameters.getNamedKeys().contains("param1"))
{
- p1 = join(parameters.getNamedParameters("param1"));
+ p1 = join(parameters.getValues("param1"));
}
String p2 = "CANNOT RESOLVE FROM URL";
- if (parameters.getNamedParameterKeys().contains("param2"))
+ if (parameters.getNamedKeys().contains("param2"))
{
- p2 = join(parameters.getNamedParameters("param2"));
+ p2 = join(parameters.getValues("param2"));
}
add(new Label("p1", p1));
@@ -60,8 +60,8 @@ public class Page5 extends WicketExample
String newP2 = String.valueOf(random.nextInt());
PageParameters params = new PageParameters();
- params.setNamedParameter("param1", newP1);
- params.setNamedParameter("param2", newP2);
+ params.set("param1", newP1);
+ params.set("param2", newP2);
BookmarkablePageLink link = new BookmarkablePageLink("refreshLink", Page5.class, params);
add(link);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Fri Sep 3 05:02:56 2010
@@ -577,9 +577,9 @@ public class SourcesPage extends WebPage
public static PageParameters generatePageParameters(Class<? extends Page> clazz, String fileName)
{
PageParameters p = new PageParameters();
- p.setNamedParameter(PAGE_CLASS, clazz.getName());
+ p.set(PAGE_CLASS, clazz.getName());
if (fileName != null)
- p.setNamedParameter(SOURCE, fileName);
+ p.set(SOURCE, fileName);
return p;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java Fri Sep 3 05:02:56 2010
@@ -46,7 +46,7 @@ public class StatelessPage3 extends WebP
super.onBeforeRender();
// get the value from page parameters
- number = getPage().getPageParameters().getNamedParameter(PARAMETER_NAME).toInt(10);
+ number = getPage().getPageParameters().get(PARAMETER_NAME).toInt(10);
}
/**
@@ -73,7 +73,7 @@ public class StatelessPage3 extends WebP
info("Submitted text: " + field.getDefaultModelObject());
// store the value in page parameters
- getPage().getPageParameters().setNamedParameter(PARAMETER_NAME, number);
+ getPage().getPageParameters().set(PARAMETER_NAME, number);
// force redirect, otherwise the listener interface URL would be kept
getRequestCycle().setResponsePage(getPage());
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.java Fri Sep 3 05:02:56 2010
@@ -35,7 +35,7 @@ public class HelloWorld extends WicketEx
*/
public HelloWorld(PageParameters params)
{
- add(new Label("message", "Message is: '" + params.getNamedParameter("message").toString() +
+ add(new Label("message", "Message is: '" + params.get("message").toString() +
"'"));
}
}
\ 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=992206&r1=992205&r2=992206&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 Fri Sep 3 05:02:56 2010
@@ -147,14 +147,14 @@ public class PageParameters implements S
final String key = pair.substring(0, pos).trim();
final String value = pair.substring(pos + 1).trim();
- addNamedParameter(key, value);
+ add(key, value);
}
else
{
final String key = pair.trim();
final String value = null;
- addNamedParameter(key, value);
+ add(key, value);
}
}
}
@@ -163,7 +163,7 @@ public class PageParameters implements S
/**
* @return count of indexed parameters
*/
- public int getIndexedParamsCount()
+ public int getIndexedCount()
{
return indexedParameters != null ? indexedParameters.size() : 0;
}
@@ -173,8 +173,9 @@ public class PageParameters implements S
*
* @param index
* @param object
+ * @return this
*/
- public void setIndexedParameter(int index, Object object)
+ public PageParameters set(int index, Object object)
{
if (indexedParameters == null)
{
@@ -187,13 +188,14 @@ public class PageParameters implements S
}
indexedParameters.set(index, object != null ? object.toString() : null);
+ return this;
}
/**
* @param index
* @return indexed parameter on given index
*/
- public StringValue getIndexedParameter(int index)
+ public StringValue get(int index)
{
if (indexedParameters != null)
{
@@ -209,8 +211,9 @@ public class PageParameters implements S
* Removes indexed parameter on given index
*
* @param index
+ * @return this
*/
- public void removeIndexedParameter(int index)
+ public PageParameters remove(int index)
{
if (indexedParameters != null)
{
@@ -219,6 +222,7 @@ public class PageParameters implements S
indexedParameters.remove(index);
}
}
+ return this;
}
/**
@@ -226,7 +230,7 @@ public class PageParameters implements S
*
* @return named parameter names
*/
- public Set<String> getNamedParameterKeys()
+ public Set<String> getNamedKeys()
{
if (namedParameters == null || namedParameters.isEmpty())
{
@@ -246,7 +250,7 @@ public class PageParameters implements S
* @param name
* @return parameter value
*/
- public StringValue getNamedParameter(final String name)
+ public StringValue get(final String name)
{
Args.notNull(name, "name");
@@ -269,7 +273,7 @@ public class PageParameters implements S
* @param name
* @return list of parameter values
*/
- public List<StringValue> getNamedParameters(final String name)
+ public List<StringValue> getValues(final String name)
{
Args.notNull(name, "name");
@@ -292,18 +296,17 @@ public class PageParameters implements S
}
/**
- * Represents a named parameter entry. There can be multiple {@link NamedParameterPair}s in
+ * Represents a named parameter entry. There can be multiple {@link NamedPair}s in
* {@link PageParameters} that have same key.
*
* @author Matej Knopp
*/
- // TODO rename to NamedParameter
- public static class NamedParameterPair
+ public static class NamedPair
{
private final String key;
private final String value;
- private NamedParameterPair(String key, String value)
+ private NamedPair(String key, String value)
{
this.key = key;
this.value = value;
@@ -329,14 +332,14 @@ public class PageParameters implements S
/**
* @return All named parameters in exact order.
*/
- public List<NamedParameterPair> getNamedParameters()
+ public List<NamedPair> getAllNamed()
{
- List<NamedParameterPair> res = new ArrayList<NamedParameterPair>();
+ List<NamedPair> res = new ArrayList<NamedPair>();
if (namedParameters != null)
{
for (Entry e : namedParameters)
{
- res.add(new NamedParameterPair(e.key, e.value));
+ res.add(new NamedPair(e.key, e.value));
}
}
return Collections.unmodifiableList(res);
@@ -346,8 +349,9 @@ public class PageParameters implements S
* Removes named parameter with given name.
*
* @param name
+ * @return this
*/
- public void removeNamedParameter(final String name)
+ public PageParameters remove(final String name)
{
Args.notNull(name, "name");
@@ -362,6 +366,7 @@ public class PageParameters implements S
}
}
}
+ return this;
}
/**
@@ -369,10 +374,12 @@ public class PageParameters implements S
*
* @param name
* @param value
+ * @return this
*/
- public void addNamedParameter(final String name, final Object value)
+ public PageParameters add(final String name, final Object value)
{
- addNamedParameter(name, value, -1);
+ add(name, value, -1);
+ return this;
}
/**
@@ -382,8 +389,9 @@ public class PageParameters implements S
* @param name
* @param value
* @param index
+ * @return this
*/
- public void addNamedParameter(final String name, final Object value, final int index)
+ public PageParameters add(final String name, final Object value, final int index)
{
Args.notNull(name, "name");
Args.notNull(value, "value");
@@ -404,6 +412,7 @@ public class PageParameters implements S
{
namedParameters.add(index, entry);
}
+ return this;
}
/**
@@ -413,15 +422,17 @@ public class PageParameters implements S
* @param name
* @param value
* @param index
+ * @return this
*/
- public void setNamedParameter(String name, Object value, int index)
+ public PageParameters set(String name, Object value, int index)
{
- removeNamedParameter(name);
+ remove(name);
if (value != null)
{
- addNamedParameter(name, value);
+ add(name, value);
}
+ return this;
}
/**
@@ -429,40 +440,50 @@ public class PageParameters implements S
*
* @param name
* @param value
+ * @return this
*/
- public void setNamedParameter(String name, Object value)
+ public PageParameters set(String name, Object value)
{
- setNamedParameter(name, value, -1);
+ set(name, value, -1);
+ return this;
}
/**
* Removes all indexed parameters.
+ *
+ * @return this
*/
- public void clearIndexedParameters()
+ public PageParameters clearIndexed()
{
indexedParameters = null;
+ return this;
}
/**
* Removes all named parameters.
+ *
+ * @return this
*/
- public void clearNamedParameters()
+ public PageParameters clearaNamed()
{
namedParameters = null;
+ return this;
}
/**
* Copy the paga parameters
*
* @param other
+ * @return this
*/
- public void assign(PageParameters other)
+ public PageParameters overwriteWith(PageParameters other)
{
if (this != other)
{
indexedParameters = other.indexedParameters;
namedParameters = other.namedParameters;
}
+ return this;
}
/**
@@ -497,11 +518,11 @@ public class PageParameters implements S
return false;
}
- for (String key : getNamedParameterKeys())
+ for (String key : getNamedKeys())
{
- List<StringValue> values1 = getNamedParameters(key);
+ List<StringValue> values1 = getValues(key);
Set<String> v1 = new TreeSet<String>();
- List<StringValue> values2 = rhs.getNamedParameters(key);
+ List<StringValue> values2 = rhs.getValues(key);
Set<String> v2 = new TreeSet<String>();
for (StringValue sv : values1)
{
@@ -534,11 +555,11 @@ public class PageParameters implements S
{
return true;
}
- if (p1 == null && p2.getIndexedParamsCount() == 0 && p2.getNamedParameterKeys().isEmpty())
+ if (p1 == null && p2.getIndexedCount() == 0 && p2.getNamedKeys().isEmpty())
{
return true;
}
- if (p2 == null && p1.getIndexedParamsCount() == 0 && p1.getNamedParameterKeys().isEmpty())
+ if (p2 == null && p1.getIndexedCount() == 0 && p1.getNamedKeys().isEmpty())
{
return true;
}
@@ -550,6 +571,6 @@ public class PageParameters implements S
*/
public boolean isEmpty()
{
- return getIndexedParamsCount() == 0 && getNamedParameterKeys().isEmpty();
+ return getIndexedCount() == 0 && getNamedKeys().isEmpty();
}
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java Fri Sep 3 05:02:56 2010
@@ -44,13 +44,13 @@ public class PageParametersEncoder imple
int i = 0;
for (String s : request.getUrl().getSegments())
{
- parameters.setIndexedParameter(i, s);
+ parameters.set(i, s);
++i;
}
for (QueryParameter p : request.getUrl().getQueryParameters())
{
- parameters.addNamedParameter(p.getName(), p.getValue());
+ parameters.add(p.getName(), p.getValue());
}
return parameters.isEmpty() ? null : parameters;
@@ -63,12 +63,12 @@ public class PageParametersEncoder imple
{
Url url = new Url();
- for (int i = 0; i < pageParameters.getIndexedParamsCount(); ++i)
+ for (int i = 0; i < pageParameters.getIndexedCount(); ++i)
{
- url.getSegments().add(pageParameters.getIndexedParameter(i).toString());
+ url.getSegments().add(pageParameters.get(i).toString());
}
- for (PageParameters.NamedParameterPair pair : pageParameters.getNamedParameters())
+ for (PageParameters.NamedPair pair : pageParameters.getAllNamed())
{
QueryParameter param = new QueryParameter(pair.getKey(), pair.getValue());
url.getQueryParameters().add(param);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Fri Sep 3 05:02:56 2010
@@ -820,10 +820,10 @@ public class Form<T> extends WebMarkupCo
{
public void component(final FormComponent<?> formComponent, final IVisit<Void> visit)
{
- parameters.removeNamedParameter(formComponent.getInputName());
+ parameters.remove(formComponent.getInputName());
}
});
- parameters.removeNamedParameter(getHiddenFieldId());
+ parameters.remove(getHiddenFieldId());
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Fri Sep 3 05:02:56 2010
@@ -144,7 +144,7 @@ public class BookmarkablePageLink<T> ext
{
parameters = new PageParameters();
}
- parameters.setNamedParameter(key, value);
+ parameters.set(key, value);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Fri Sep 3 05:02:56 2010
@@ -72,7 +72,7 @@ public class BrowserInfoPage extends Web
*/
public BrowserInfoPage(PageParameters parameters)
{
- String to = parameters.getNamedParameter("cto").toString();
+ String to = parameters.get("cto").toString();
if (to == null)
{
throw new IllegalArgumentException("parameter cto must be provided!");
@@ -133,7 +133,7 @@ public class BrowserInfoPage extends Web
{
WebComponent meta = new WebComponent("meta");
PageParameters parameters = new PageParameters();
- parameters.setNamedParameter("cto", continueTo);
+ parameters.set("cto", continueTo);
CharSequence url = urlFor(new BookmarkablePageRequestHandler(new PageProvider(
BrowserInfoPage.class, parameters)));
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java Fri Sep 3 05:02:56 2010
@@ -53,12 +53,12 @@ public final class RequestUtils
if (bits.length == 2)
{
- params.addNamedParameter(UrlDecoder.QUERY_INSTANCE.decode(bits[0], getCurrentCharset()),
+ params.add(UrlDecoder.QUERY_INSTANCE.decode(bits[0], getCurrentCharset()),
UrlDecoder.QUERY_INSTANCE.decode(bits[1], getCurrentCharset()));
}
else
{
- params.addNamedParameter(UrlDecoder.QUERY_INSTANCE.decode(bits[0], getCurrentCharset()), "");
+ params.add(UrlDecoder.QUERY_INSTANCE.decode(bits[0], getCurrentCharset()), "");
}
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java Fri Sep 3 05:02:56 2010
@@ -249,7 +249,7 @@ public class PageProvider implements IPa
}
else if (page != null && pageParameters != null)
{
- page.getPageParameters().assign(pageParameters);
+ page.getPageParameters().overwriteWith(pageParameters);
}
}
if (page == null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java Fri Sep 3 05:02:56 2010
@@ -234,7 +234,7 @@ class BasicResourceReferenceMapper exten
{
parameters = new PageParameters(parameters);
// need to remove indexed parameters otherwise the URL won't be able to decode
- parameters.clearIndexedParameters();
+ parameters.clearIndexed();
url = encodePageParameters(url, parameters, pageParametersEncoder);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java Fri Sep 3 05:02:56 2010
@@ -130,7 +130,7 @@ public class MountedMapper extends Abstr
{
pageParameters = new PageParameters();
}
- pageParameters.addNamedParameter(placeholder, url.getSegments().get(i));
+ pageParameters.add(placeholder, url.getSegments().get(i));
}
}
@@ -167,8 +167,8 @@ public class MountedMapper extends Abstr
String placeholder = getPlaceholder(mountSegments[i]);
if (placeholder != null)
{
- url.getSegments().set(i, copy.getNamedParameter(placeholder).toString(""));
- copy.removeNamedParameter(placeholder);
+ url.getSegments().set(i, copy.get(placeholder).toString(""));
+ copy.remove(placeholder);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Fri Sep 3 05:02:56 2010
@@ -180,7 +180,7 @@ public final class DefaultPageFactory im
// we force the parameters
if (pageParameters != null && page.getPageParameters() != pageParameters)
{
- page.getPageParameters().assign(pageParameters);
+ page.getPageParameters().overwriteWith(pageParameters);
}
page.setWasCreatedBookmarkable(true);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java Fri Sep 3 05:02:56 2010
@@ -40,7 +40,7 @@ public class EnclosurePage_4 extends Web
final Label bar = new Label("bar", "bazqux");
// that one doesn't matter
- boolean visible = param.getNamedParameter("visible").toBoolean();
+ boolean visible = param.get("visible").toBoolean();
bar.setVisible(visible);
foo.add(bar);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java Fri Sep 3 05:02:56 2010
@@ -39,7 +39,7 @@ public class EnclosurePage_5 extends Enc
final Label bar = new Label("bar", "bazqux");
// that one doesn't matter
- boolean visible = param.getNamedParameter("visible").toBoolean();
+ boolean visible = param.get("visible").toBoolean();
bar.setVisible(visible);
foo.add(bar);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Fri Sep 3 05:02:56 2010
@@ -72,7 +72,7 @@ public class BookmarkablePageLinkTest ex
return;
PageParameters pp = new PageParameters();
- pp.setNamedParameter("test", "test");
+ pp.set("test", "test");
tester.startPage(BookmarkableThrowsInterceptPage.class, pp);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Fri Sep 3 05:02:56 2010
@@ -38,7 +38,7 @@ public class AbortExceptionPage extends
public AbortExceptionPage(PageParameters parameters)
{
- final boolean triggerError = parameters.getNamedParameter("trigger").toBoolean();
+ final boolean triggerError = parameters.get("trigger").toBoolean();
if (!triggerError)
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java Fri Sep 3 05:02:56 2010
@@ -39,7 +39,7 @@ public class A extends WebPage
{
((WicketApplication)WebApplication.get()).intercept();
- file = parameters.getNamedParameter("file").toString();
+ file = parameters.get("file").toString();
add(new Label("file", file));
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Fri Sep 3 05:02:56 2010
@@ -58,8 +58,8 @@ public class BasicResourceReferenceMappe
assertTrue(handler instanceof ResourceReferenceRequestHandler);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -75,8 +75,8 @@ public class BasicResourceReferenceMappe
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -92,9 +92,9 @@ public class BasicResourceReferenceMappe
assertEquals(null, h.getLocale());
assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -110,9 +110,9 @@ public class BasicResourceReferenceMappe
assertEquals(null, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -128,8 +128,8 @@ public class BasicResourceReferenceMappe
assertEquals(new Locale("en", "en"), h.getLocale());
assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -145,8 +145,8 @@ public class BasicResourceReferenceMappe
assertEquals(new Locale("en", "en"), h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -172,8 +172,8 @@ public class BasicResourceReferenceMappe
assertEquals(new Locale("en", "en"), h.getLocale());
assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -189,8 +189,8 @@ public class BasicResourceReferenceMappe
assertEquals(null, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -206,9 +206,9 @@ public class BasicResourceReferenceMappe
assertEquals(null, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
@@ -225,8 +225,8 @@ public class BasicResourceReferenceMappe
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
/**
@@ -252,9 +252,9 @@ public class BasicResourceReferenceMappe
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -271,9 +271,9 @@ public class BasicResourceReferenceMappe
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals(null, h.getStyle());
assertEquals("variation", h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -290,9 +290,9 @@ public class BasicResourceReferenceMappe
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
assertEquals("variation", h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ assertEquals(0, h.getPageParameters().getIndexedCount());
+ assertEquals("v1", h.getPageParameters().get("p1").toString());
+ assertEquals("v2", h.getPageParameters().get("p2").toString());
}
/**
@@ -312,9 +312,9 @@ public class BasicResourceReferenceMappe
public void testEncode2()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
+ parameters.set(0, "X");
+ parameters.add("p1", "v1");
+ parameters.add("p2", "v2");
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
parameters);
@@ -339,9 +339,9 @@ public class BasicResourceReferenceMappe
public void testEncode4()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
+ parameters.set(0, "X");
+ parameters.add("p1", "v1");
+ parameters.add("p2", "v2");
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
parameters);
@@ -367,9 +367,9 @@ public class BasicResourceReferenceMappe
public void testEncode6()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
+ parameters.set(0, "X");
+ parameters.add("p1", "v1");
+ parameters.add("p2", "v2");
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
parameters);
@@ -395,9 +395,9 @@ public class BasicResourceReferenceMappe
public void testEncode8()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
+ parameters.set(0, "X");
+ parameters.add("p1", "v1");
+ parameters.add("p2", "v2");
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
parameters);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java Fri Sep 3 05:02:56 2010
@@ -67,8 +67,8 @@ public class BookmarkableMapperTest exte
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
- assertEquals(0, page.getPageParameters().getIndexedParamsCount());
- assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
+ assertEquals(0, page.getPageParameters().getIndexedCount());
+ assertTrue(page.getPageParameters().getNamedKeys().isEmpty());
}
/**
@@ -84,12 +84,12 @@ public class BookmarkableMapperTest exte
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
PageParameters p = page.getPageParameters();
- assertEquals(1, p.getIndexedParamsCount());
- assertEquals("indexed1", p.getIndexedParameter(0).toString());
+ assertEquals(1, p.getIndexedCount());
+ assertEquals("indexed1", p.get(0).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -118,13 +118,13 @@ public class BookmarkableMapperTest exte
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -166,13 +166,13 @@ public class BookmarkableMapperTest exte
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -270,10 +270,10 @@ public class BookmarkableMapperTest exte
public void testEncode2()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
@@ -287,10 +287,10 @@ public class BookmarkableMapperTest exte
public void testEncode3()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
@@ -306,10 +306,10 @@ public class BookmarkableMapperTest exte
public void testEncode4()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(true);
IPageProvider provider = new PageProvider(page);
@@ -325,10 +325,10 @@ public class BookmarkableMapperTest exte
public void testEncode5()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(false);
@@ -348,10 +348,10 @@ public class BookmarkableMapperTest exte
public void testEncode6()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
@@ -375,10 +375,10 @@ public class BookmarkableMapperTest exte
public void testEncode7()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java Fri Sep 3 05:02:56 2010
@@ -79,8 +79,8 @@ public class MountedMapperTest extends A
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(0, page.getPageParameters().getIndexedParamsCount());
- assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
+ assertEquals(0, page.getPageParameters().getIndexedCount());
+ assertTrue(page.getPageParameters().getNamedKeys().isEmpty());
}
/**
@@ -95,12 +95,12 @@ public class MountedMapperTest extends A
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
- assertEquals(1, p.getIndexedParamsCount());
- assertEquals("indexed1", p.getIndexedParameter(0).toString());
+ assertEquals(1, p.getIndexedCount());
+ assertEquals("indexed1", p.get(0).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -129,13 +129,13 @@ public class MountedMapperTest extends A
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -176,13 +176,13 @@ public class MountedMapperTest extends A
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -285,10 +285,10 @@ public class MountedMapperTest extends A
public void testEncode2()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
@@ -302,10 +302,10 @@ public class MountedMapperTest extends A
public void testEncode3()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
@@ -321,10 +321,10 @@ public class MountedMapperTest extends A
public void testEncode4()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(true);
IPageProvider provider = new PageProvider(page);
@@ -340,10 +340,10 @@ public class MountedMapperTest extends A
public void testEncode5()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(false);
@@ -364,10 +364,10 @@ public class MountedMapperTest extends A
public void testEncode6()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setRenderCount(4);
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
@@ -391,10 +391,10 @@ public class MountedMapperTest extends A
public void testEncode7()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setRenderCount(5);
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
@@ -477,10 +477,10 @@ public class MountedMapperTest extends A
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(0, page.getPageParameters().getIndexedParamsCount());
- assertTrue(page.getPageParameters().getNamedParameterKeys().size() == 2);
- assertEquals("p1", page.getPageParameters().getNamedParameter("param1").toString());
- assertEquals("p2", page.getPageParameters().getNamedParameter("param2").toString());
+ assertEquals(0, page.getPageParameters().getIndexedCount());
+ assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
+ assertEquals("p1", page.getPageParameters().get("param1").toString());
+ assertEquals("p2", page.getPageParameters().get("param2").toString());
}
/**
@@ -495,14 +495,14 @@ public class MountedMapperTest extends A
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
- assertEquals(1, p.getIndexedParamsCount());
- assertEquals("indexed1", p.getIndexedParameter(0).toString());
+ assertEquals(1, p.getIndexedCount());
+ assertEquals("indexed1", p.get(0).toString());
- assertEquals(4, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
- assertEquals("p1", page.getPageParameters().getNamedParameter("param1").toString());
- assertEquals("p2", page.getPageParameters().getNamedParameter("param2").toString());
+ assertEquals(4, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
+ assertEquals("p1", page.getPageParameters().get("param1").toString());
+ assertEquals("p2", page.getPageParameters().get("param2").toString());
}
/**
@@ -511,12 +511,12 @@ public class MountedMapperTest extends A
public void testPlaceholderEncode2()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
- parameters.setNamedParameter("param1", "p1");
- parameters.setNamedParameter("param2", "p2");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
+ parameters.set("param1", "p1");
+ parameters.set("param2", "p2");
PageProvider provider = new PageProvider(MockPage.class, parameters);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java Fri Sep 3 05:02:56 2010
@@ -71,8 +71,8 @@ public class PackageMapperTest extends A
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
- assertEquals(0, page.getPageParameters().getIndexedParamsCount());
- assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
+ assertEquals(0, page.getPageParameters().getIndexedCount());
+ assertTrue(page.getPageParameters().getNamedKeys().isEmpty());
}
/**
@@ -88,12 +88,12 @@ public class PackageMapperTest extends A
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
PageParameters p = page.getPageParameters();
- assertEquals(1, p.getIndexedParamsCount());
- assertEquals("indexed1", p.getIndexedParameter(0).toString());
+ assertEquals(1, p.getIndexedCount());
+ assertEquals("indexed1", p.get(0).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -122,13 +122,13 @@ public class PackageMapperTest extends A
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -170,13 +170,13 @@ public class PackageMapperTest extends A
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
-
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
+ assertEquals(2, p.getIndexedCount());
+ assertEquals("i1", p.get(0).toString());
+ assertEquals("i2", p.get(1).toString());
+
+ assertEquals(2, p.getNamedKeys().size());
+ assertEquals("b", p.get("a").toString());
+ assertEquals("c", p.get("b").toString());
}
/**
@@ -273,10 +273,10 @@ public class PackageMapperTest extends A
public void testEncode2()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
@@ -290,10 +290,10 @@ public class PackageMapperTest extends A
public void testEncode3()
{
PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ parameters.set(0, "i1");
+ parameters.set(1, "i2");
+ parameters.set("a", "b");
+ parameters.set("b", "c");
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
@@ -309,10 +309,10 @@ public class PackageMapperTest extends A
public void testEncode4()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(true);
IPageProvider provider = new PageProvider(page);
@@ -328,10 +328,10 @@ public class PackageMapperTest extends A
public void testEncode5()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
page.setCreatedBookmarkable(false);
@@ -351,10 +351,10 @@ public class PackageMapperTest extends A
public void testEncode6()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
@@ -378,10 +378,10 @@ public class PackageMapperTest extends A
public void testEncode7()
{
MockPage page = new MockPage(15);
- page.getPageParameters().setIndexedParameter(0, "i1");
- page.getPageParameters().setIndexedParameter(1, "i2");
- page.getPageParameters().setNamedParameter("a", "b");
- page.getPageParameters().setNamedParameter("b", "c");
+ page.getPageParameters().set(0, "i1");
+ page.getPageParameters().set(1, "i2");
+ page.getPageParameters().set("a", "b");
+ page.getPageParameters().set("b", "c");
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java Fri Sep 3 05:02:56 2010
@@ -23,8 +23,8 @@ import org.apache.wicket.markup.MarkupPa
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.request.resource.ResourceReferenceRegistry;
import org.apache.wicket.request.resource.ResourceReference.Key;
+import org.apache.wicket.request.resource.ResourceReferenceRegistry;
/**
* Simple {@link EncoderContext} implementation for testing purposes
@@ -135,7 +135,7 @@ public class TestMapperContext implement
page.setCreatedBookmarkable(true);
if (pageParameters != null)
{
- page.getPageParameters().assign(pageParameters);
+ page.getPageParameters().overwriteWith(pageParameters);
}
return page;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Fri Sep 3 05:02:56 2010
@@ -43,8 +43,8 @@ public class StatelessComponentPageWithP
@Override
public void onClick()
{
- if (getPageParameters().getNamedParameterKeys().size() == 2 ||
- getPageParameters().getIndexedParamsCount() == 2)
+ if (getPageParameters().getNamedKeys().size() == 2 ||
+ getPageParameters().getIndexedCount() == 2)
{
throw new WicketRuntimeException("wanted exception");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Fri Sep 3 05:02:56 2010
@@ -75,8 +75,8 @@ public class StatelessComponentTest exte
public void testStatelessComponentPageWithParams() throws Exception
{
PageParameters params = new PageParameters();
- params.setNamedParameter("testParam1", "testValue1");
- params.setNamedParameter("testParam2", "testValue2");
+ params.set("testParam1", "testValue1");
+ params.set("testParam2", "testValue2");
executeTest(StatelessComponentPageWithParams.class, params,
"StatelessComponentPageWithParams_result.html");
@@ -102,8 +102,8 @@ public class StatelessComponentTest exte
public void testStatelessComponentPageWithParamsWithMount() throws Exception
{
PageParameters params = new PageParameters();
- params.setNamedParameter("testParam1", "testValue1");
- params.setNamedParameter("testParam2", "testValue2");
+ params.set("testParam1", "testValue1");
+ params.set("testParam2", "testValue2");
tester.getApplication().mountBookmarkablePage("/stateless",
StatelessComponentPageWithParams.class);
// test is always the home page. it doesn't work then
@@ -129,8 +129,8 @@ public class StatelessComponentTest exte
public void testStatelessComponentPageWithParamsWithIndexMount() throws Exception
{
PageParameters params = new PageParameters();
- params.setIndexedParameter(0, "testValue1");
- params.setIndexedParameter(1, "testValue2");
+ params.set(0, "testValue1");
+ params.set(1, "testValue2");
tester.getApplication().mountBookmarkablePage("/stateless",
StatelessComponentPageWithParams.class);
// test is always the home page. it doesn't work then
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java Fri Sep 3 05:02:56 2010
@@ -104,7 +104,7 @@ public class MockFormFileUploadPage exte
form.setMaxSize(Bytes.kilobytes(100));
form.add(new TextField<String>("text"));
fileUploadField = new FileUploadField("file", new Model<FileUpload>());
- StringValue requiredParam = param.getNamedParameter("required");
+ StringValue requiredParam = param.get("required");
boolean required = requiredParam.toBoolean();
fileUploadField.setRequired(required);
form.add(fileUploadField);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=992206&r1=992205&r2=992206&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Fri Sep 3 05:02:56 2010
@@ -39,7 +39,7 @@ public class MockPageParameterPage exten
{
add(new BookmarkablePageLink("link", MockPageParameterPage.class,
new PageParameters("id=1")));
- add(new Label("label", pageParameters.getNamedParameter("id").toString()));
+ add(new Label("label", pageParameters.get("id").toString()));
}
/**