Author: knopp
Date: Sun Nov 22 18:19:24 2009
New Revision: 883115
URL: http://svn.apache.org/viewvc?rev=883115&view=rev
Log:
fixes
Added:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/Label.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/NGApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage1.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/NGApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/NGApplication.java?rev=883115&r1=883114&r2=883115&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/NGApplication.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/NGApplication.java
Sun Nov 22 18:19:24 2009
@@ -19,6 +19,7 @@
{
mount(new MountedMapper("first-test-page", TestPage1.class));
mount(new MountedMapper("third-test-page", TestPage3.class));
+ mount(new MountedMapper("/page4/${color}/display",
TestPage4.class));
// load the interface
RequestListenerInterface i = ILinkListener.INTERFACE;
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=883115&r1=883114&r2=883115&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
Sun Nov 22 18:19:24 2009
@@ -2,6 +2,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.cycle.RequestCycle;
public class TestPage1 extends Page
@@ -96,6 +97,18 @@
};
l5.setLabel("Link 5 - Go to Test Page 3 - Mounted");
add(l5);
+
+ Link l6 = new Link("l6")
+ {
+ public void onLinkClicked()
+ {
+ PageParameters params = new PageParameters();
+ params.setNamedParameter("color", "red");
+
RequestCycle.get().setResponsePage(TestPage4.class, params);
+ };
+ };
+ l6.setLabel("Link 6 - Goto Test Page 4 - stateless, with
mounted parameters");
+ add(l6);
}
private boolean rendered = false;
Added:
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=883115&view=auto
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
(added)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ng/TestPage4.java
Sun Nov 22 18:19:24 2009
@@ -0,0 +1,29 @@
+package org.apache.wicket.examples.ng;
+
+import org.apache.wicket.ng.Page;
+import org.apache.wicket.ng.markup.html.Label;
+import org.apache.wicket.ng.request.component.PageParameters;
+
+public class TestPage4 extends Page
+{
+
+ private static final long serialVersionUID = 1L;
+
+ public TestPage4(PageParameters parameters)
+ {
+ super(parameters);
+
+ add(new Label("label",
parameters.getNamedParameter("color").toString("empty")));
+
+
+ }
+
+ /**
+ * @see org.apache.wicket.ng.Page#isPageStateless()
+ */
+ @Override
+ public boolean isPageStateless()
+ {
+ return true;
+ }
+}
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/Label.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/Label.java?rev=883115&view=auto
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/Label.java
(added)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/Label.java
Sun Nov 22 18:19:24 2009
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.ng.markup.html;
+
+import org.apache.wicket.ng.Component;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+
+public class Label extends Component
+{
+ private final String string;
+
+ public Label(String id, String string)
+ {
+ super(id);
+
+ this.string = string;
+ }
+
+ @Override
+ public void renderComponent()
+ {
+ RequestCycle.get().getResponse().write(string);
+ }
+}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java?rev=883115&r1=883114&r2=883115&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
Sun Nov 22 18:19:24 2009
@@ -392,8 +392,8 @@
*/
public void setResponsePage(RequestablePage page)
{
- scheduleRequestHandlerAfterCurrent(new
RenderPageRequestHandler(new DefaultPageProvider(page),
- RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
+ scheduleRequestHandlerAfterCurrent(new
RenderPageRequestHandler(new DefaultPageProvider(
+ page),
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
/**
@@ -405,7 +405,7 @@
public void setResponsePage(Class<? extends RequestablePage> pageClass,
PageParameters parameters)
{
- PageProvider provider = new DefaultPageProvider(pageClass);
+ PageProvider provider = new DefaultPageProvider(pageClass,
parameters);
scheduleRequestHandlerAfterCurrent(new
RenderPageRequestHandler(provider,
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java?rev=883115&r1=883114&r2=883115&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java
Sun Nov 22 18:19:24 2009
@@ -259,7 +259,8 @@
*/
protected boolean enableRedirectForStatelessPage()
{
- return false;
+ // TODO Make sure this is a sane default value (if not make it
configurable)
+ return true;
}
private static Logger logger =
LoggerFactory.getLogger(WebRenderPageRequestHandlerDelegate.class);
