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 2014/04/25 10:18:55 UTC
[3/3] git commit: WICKET-5572 Dequeueing problem when there is
TransparentWebMarkupContainer around
WICKET-5572 Dequeueing problem when there is TransparentWebMarkupContainer around <wicket:child/>
Dequeue inside <wicket:child> tags.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cd414fa5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cd414fa5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cd414fa5
Branch: refs/heads/master
Commit: cd414fa5b5c88b39b11938cdbf40571f4a2df153
Parents: d711072
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 11:18:15 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 11:18:15 2014 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 6 +++++-
.../DequeueingTransparentWebMarkupContainerTest.java | 2 --
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd414fa5/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 30293fb..55e3184 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2178,9 +2178,13 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
return DequeueTagAction.SKIP;
}
+ else if (wicketTag.isChildTag())
+ {
+ return DequeueTagAction.DEQUEUE;
+ }
else
{
- return null; // dont know
+ return null; // don't know
}
}
return DequeueTagAction.DEQUEUE;
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd414fa5/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
index 08a2d16..2bdf28c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.queueing.transparentresolvers;
import org.apache.wicket.WicketTestCase;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -25,7 +24,6 @@ import org.junit.Test;
*/
public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
{
- @Ignore
@Test
public void startSubPageWithTWMCinTheParentPage() {
tester.startPage(SubPage.class);