WICKET-3335 Add support for queueing Border component
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/156dea5b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/156dea5b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/156dea5b Branch: refs/heads/master Commit: 156dea5b3479805eec964b905847ce8e177cd560 Parents: ec84bb5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 14 14:38:04 2014 +0200 Committer: Igor Vaynberg <[email protected]> Committed: Thu Feb 20 23:37:14 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/wicket/MarkupContainer.java | 18 +++++++++++++++--- .../wicket/queueing/ComponentQueueingTest.java | 1 - 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/156dea5b/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 b34a6fc..4344cbf 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -2129,7 +2129,19 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp if (tag instanceof WicketTag) { ComponentTag openTag = tag.getOpenTag() == null ? tag : tag.getOpenTag(); - if (openTag.getAutoComponentFactory() == null) + if (((WicketTag) tag).isBorderTag()) + { + if (tag.isOpen()) + { + tags.push(tag); + } + else if (tag.isClose()) + { + tags.pop(); + } + continue; + } + else if (openTag.getAutoComponentFactory() == null) { // wicket tags that do not produce auto components can be ignored continue; @@ -2185,8 +2197,8 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp if (child != null) { MarkupContainer parentContainer = containers.peek(); -// boolean isInBorder = isInBorder(tags, parentContainer); - if (parentContainer instanceof Border) //(isInBorder) + boolean isInBorder = isInBorder(tags, parentContainer); + if (isInBorder) { ((Border) parentContainer).addToBorder(child); } http://git-wip-us.apache.org/repos/asf/wicket/blob/156dea5b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java index c96ea7b..728f210 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java @@ -547,7 +547,6 @@ public class ComponentQueueingTest extends WicketTestCase assertEquals("<div id=\"wicket__InlineEnclosure_01\" style=\"display:none\"></div>", tester.getLastResponseAsString()); } - @Ignore @Test public void dequeueWithBorder1() {
