Repository: wicket Updated Branches: refs/heads/master 8489bcbeb -> fee33c62c
WICKET-5722 Queueing in merged markup with transparent resolver in the base class Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fee33c62 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fee33c62 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fee33c62 Branch: refs/heads/master Commit: fee33c62cbbd2a69e59a75eb3c8550f34b67450d Parents: 8489bcb Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Wed Oct 8 13:47:54 2014 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed Oct 8 13:47:54 2014 +0300 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java | 2 +- .../src/main/java/org/apache/wicket/markup/MergedMarkup.java | 1 + .../apache/wicket/queueing/transparentresolvers/BasePage.java | 3 +-- .../DequeueingTransparentWebMarkupContainerTest.java | 4 +++- .../org/apache/wicket/queueing/transparentresolvers/SubPage.html | 1 + .../org/apache/wicket/queueing/transparentresolvers/SubPage.java | 3 +++ 6 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/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 029fcfb..b607b4e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -2179,7 +2179,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp } else if (wicketTag.isChildTag()) { - return DequeueTagAction.SKIP; + return DequeueTagAction.IGNORE; } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java index edfe938..363ea10 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java @@ -318,6 +318,7 @@ public class MergedMarkup extends Markup WicketTag childCloseTag = (WicketTag)childTag.mutable(); childCloseTag.getXmlTag().setType(TagType.CLOSE); childCloseTag.setMarkupClass(markupClass); + childCloseTag.setOpenTag(childTag); addMarkupElement(childCloseTag); } http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java index 7ec2612..cae1951 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java @@ -26,6 +26,5 @@ public class BasePage extends WebPage { super(parameters); add(new HtmlTag("html")); - - } + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/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 2bdf28c..4320aa0 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 @@ -20,7 +20,9 @@ import org.apache.wicket.WicketTestCase; import org.junit.Test; /** - * Test case for https://issues.apache.org/jira/browse/WICKET-5572 + * Test case for: + * - https://issues.apache.org/jira/browse/WICKET-5572 + * - https://issues.apache.org/jira/browse/WICKET-5722 */ public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase { http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.html b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.html index aadbf2e..c12f3b4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.html +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.html @@ -7,6 +7,7 @@ <body> <wicket:extend> Sub page + <span wicket:id="version">1.5-SNAPSHOT</span> </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/fee33c62/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.java index 6a45a03..6580fb5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/SubPage.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.queueing.transparentresolvers; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.request.mapper.parameter.PageParameters; /** @@ -26,5 +27,7 @@ public class SubPage extends BasePage public SubPage(PageParameters parameters) { super(parameters); + + queue(new Label("version", getApplication().getFrameworkSettings().getVersion())); } }
