You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/12/20 11:10:31 UTC
[1/5] git commit: WICKET-5426 reset stateless flag on render,
since stateful components might be added *and* removed
Updated Branches:
refs/heads/663-id-to-choice-lookup dfd30907f -> 463e6039a
WICKET-5426 reset stateless flag on render, since stateful components
might be added *and* removed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fb45a781
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fb45a781
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fb45a781
Branch: refs/heads/663-id-to-choice-lookup
Commit: fb45a781c24f17d7a44658061c4f17e95c4cd1ef
Parents: 6953025
Author: svenmeier <sv...@meiers.net>
Authored: Thu Dec 19 15:11:13 2013 +0100
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Dec 19 15:11:13 2013 +0100
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Page.java | 9 ++++-----
...WicketTesterLazyIsPageStatelessRedirectToBufferTest.java | 2 --
...WicketTesterLazyIsPageStatelessRedirectToRenderTest.java | 2 --
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 2be236d..1a3e9aa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -801,11 +801,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
// Make sure it is really empty
renderedComponents = null;
- // if the page is stateless, reset the flag so that it is tested again
- if (Boolean.TRUE.equals(stateless))
- {
- stateless = null;
- }
+ // rendering might remove or add stateful components, so clear flag to force reevaluation
+ stateless = null;
super.onBeforeRender();
@@ -1020,6 +1017,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
{
++renderCount;
render();
+
+ // stateless = null;
}
finally
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
index f46b7f1..03d3f33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
@@ -19,12 +19,10 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.RequestCycleSettings;
-import org.junit.Ignore;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
*/
-@Ignore
public class WicketTesterLazyIsPageStatelessRedirectToBufferTest extends WicketTesterLazyIsPageStatelessBase
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
index 90d367f..0f228e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
@@ -19,12 +19,10 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.RequestCycleSettings;
-import org.junit.Ignore;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
*/
-@Ignore
public class WicketTesterLazyIsPageStatelessRedirectToRenderTest extends WicketTesterLazyIsPageStatelessBase
{
@Override
[2/5] git commit: WICKET-5424 make sure no page instance is created
in redirect
Posted by mg...@apache.org.
WICKET-5424 make sure no page instance is created in redirect
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cfce6a36
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cfce6a36
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cfce6a36
Branch: refs/heads/663-id-to-choice-lookup
Commit: cfce6a365a5cce4ac77986c9eabb627c970caa1f
Parents: fb45a78
Author: svenmeier <sv...@meiers.net>
Authored: Thu Dec 19 15:15:54 2013 +0100
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Dec 19 15:15:54 2013 +0100
----------------------------------------------------------------------
.../wicket/request/handler/render/WebPageRendererTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cfce6a36/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
index 1ca274c..502de36 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
@@ -26,6 +26,8 @@ import static org.mockito.Mockito.when;
import java.util.concurrent.atomic.AtomicBoolean;
+import junit.framework.AssertionFailedError;
+
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
@@ -362,6 +364,9 @@ public class WebPageRendererTest
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.redirectToRender = true;
+ when(provider.getPageInstance()).thenThrow(
+ new AssertionFailedError("no page instance should be created"));
+
when(urlRenderer.getBaseUrl()).thenReturn(Url.parse("a"));
when(requestCycle.mapUrlFor(eq(handler))).thenReturn(Url.parse("b"));
[5/5] git commit: WICKET-663 enhance ichoicerenderer with id->choice
object lookup
Posted by mg...@apache.org.
WICKET-663 enhance ichoicerenderer with id->choice object lookup
Improve the javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/463e6039
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/463e6039
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/463e6039
Branch: refs/heads/663-id-to-choice-lookup
Commit: 463e6039a360f7e1088ba4f64cef9aab04f84766
Parents: 950671f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Dec 20 12:09:58 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Dec 20 12:09:58 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/html/form/AbstractChoice.java | 3 +++
.../java/org/apache/wicket/markup/html/form/IChoiceRenderer.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/463e6039/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
index 7246e07..8716eb5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
@@ -210,6 +210,9 @@ public abstract class AbstractChoice<T, E> extends FormComponent<T>
return choices;
}
+ /**
+ * @return The model with the choices for this component
+ */
public IModel<? extends List<? extends E>> getChoicesModel()
{
return this.choices;
http://git-wip-us.apache.org/repos/asf/wicket/blob/463e6039/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
index 1969982..ad3f97b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
@@ -60,6 +60,9 @@ public interface IChoiceRenderer<T> extends IClusterable
/**
* This method is called to get an object back from its id representation.
*
+ * The {@code id} may be used to find/load the object in a more efficient way
+ * than loading all {@code choices} and find the one with the same id in the list
+ *
* @param id
* The id representation of the object
* @param choices
[3/5] git commit: WICKET-5402 NullPointerException when logging out
with wicket-atmosphere
Posted by mg...@apache.org.
WICKET-5402 NullPointerException when logging out with wicket-atmosphere
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3c873c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3c873c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3c873c7
Branch: refs/heads/663-id-to-choice-lookup
Commit: f3c873c7bc8af199a428c59c072902b29aad8b4b
Parents: cfce6a3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Dec 19 16:36:55 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Dec 19 16:38:31 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/atmosphere/PageKey.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3c873c7/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
index 4cedbc9..61586a9 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
@@ -63,7 +63,8 @@ public class PageKey
*/
public boolean isForSession(String sessionId)
{
- return getSessionId().equals(sessionId);
+ String sid = getSessionId();
+ return sid != null && sid.equals(sessionId);
}
@Override
[4/5] git commit: Merge branch 'master' into 663-id-to-choice-lookup
Posted by mg...@apache.org.
Merge branch 'master' into 663-id-to-choice-lookup
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/950671f2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/950671f2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/950671f2
Branch: refs/heads/663-id-to-choice-lookup
Commit: 950671f2d214697801a10ba59e313f3380a711f3
Parents: dfd3090 f3c873c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Dec 20 12:03:52 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Dec 20 12:03:52 2013 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Page.java | 9 ++++-----
.../wicket/request/handler/render/WebPageRendererTest.java | 5 +++++
...WicketTesterLazyIsPageStatelessRedirectToBufferTest.java | 2 --
...WicketTesterLazyIsPageStatelessRedirectToRenderTest.java | 2 --
.../src/main/java/org/apache/wicket/atmosphere/PageKey.java | 3 ++-
5 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------