Author: ivaynberg
Date: Thu Dec 3 07:42:25 2009
New Revision: 886692
URL: http://svn.apache.org/viewvc?rev=886692&view=rev
Log:
wip: wiket-ng merge
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java?rev=886692&r1=886691&r2=886692&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java
Thu Dec 3 07:42:25 2009
@@ -18,7 +18,7 @@
import org.apache.wicket.ng.Page;
import org.apache.wicket.ng.markup.html.link.Link;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.cycle.RequestCycle;
public class TestPage1 extends Page
@@ -34,10 +34,10 @@
public void onLinkClicked()
{
System.out.println("link 1 clicked");
- getPageParameters().setNamedParameter("p1",
"v1");
- getPageParameters().setIndexedParameter(0,
"indexed1");
- getPageParameters().setIndexedParameter(1,
"indexed2");
- getPageParameters().setIndexedParameter(2,
"indexed3");
+ getPageParametersNg().setNamedParameter("p1",
"v1");
+ getPageParametersNg().setIndexedParameter(0,
"indexed1");
+ getPageParametersNg().setIndexedParameter(1,
"indexed2");
+ getPageParametersNg().setIndexedParameter(2,
"indexed3");
// necessary on stateless page
if (getPage().isPageStateless())
@@ -55,8 +55,8 @@
public void onLinkClicked()
{
System.out.println("link 2 clicked");
- getPageParameters().removeNamedParameter("p1");
- getPageParameters().clearIndexedParameters();
+
getPageParametersNg().removeNamedParameter("p1");
+ getPageParametersNg().clearIndexedParameters();
if (getPage().isPageStateless())
// necessary on stateless page
@@ -105,9 +105,9 @@
{
System.out.println("link 5 clicked");
TestPage3 page = new TestPage3(TestPage1.this);
- page.getPageParameters().setIndexedParameter(0,
"i1");
- page.getPageParameters().setIndexedParameter(1,
"i2");
- page.getPageParameters().setIndexedParameter(2,
"i3");
+
page.getPageParametersNg().setIndexedParameter(0, "i1");
+
page.getPageParametersNg().setIndexedParameter(1, "i2");
+
page.getPageParametersNg().setIndexedParameter(2, "i3");
RequestCycle.get().setResponsePage(page);
}
};
@@ -118,7 +118,7 @@
{
public void onLinkClicked()
{
- PageParameters params = new PageParameters();
+ PageParametersNg params = new
PageParametersNg();
params.setNamedParameter("color", "red");
RequestCycle.get().setResponsePage(TestPage4.class, params);
};
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java?rev=886692&r1=886691&r2=886692&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
Thu Dec 3 07:42:25 2009
@@ -18,13 +18,13 @@
import org.apache.wicket.ng.Page;
import org.apache.wicket.ng.markup.html.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.request.component.PageParametersNg;
public class TestPage4 extends Page
{
private static final long serialVersionUID = 1L;
- public TestPage4(PageParameters parameters)
+ public TestPage4(PageParametersNg parameters)
{
super(parameters);
