You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2016/07/27 13:54:18 UTC
wicket git commit: WICKET-6217 Enclosure broken within Border/Panel
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 39685d81e -> 615eff88f
WICKET-6217 Enclosure broken within Border/Panel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/615eff88
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/615eff88
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/615eff88
Branch: refs/heads/wicket-7.x
Commit: 615eff88fd48df2ff2493be18d796dac9e0219b6
Parents: 39685d8
Author: Andrea Del Bene <ad...@apache.org>
Authored: Wed Jul 27 15:50:16 2016 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Wed Jul 27 15:50:16 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/615eff88/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 791ae73..4355936 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2146,17 +2146,16 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
ChildToDequeueType childType = ChildToDequeueType.fromChild(child);
- if (childType == ChildToDequeueType.QUEUE_REGION ||
- childType == ChildToDequeueType.BORDER)
+ if (childType == ChildToDequeueType.QUEUE_REGION)
{
((IQueueRegion)child).dequeue();
}
- if (childType == ChildToDequeueType.MARKUP_CONTAINER ||
- childType == ChildToDequeueType.BORDER)
+ if (childType == ChildToDequeueType.MARKUP_CONTAINER)
{
// propagate dequeuing to containers
- MarkupContainer childContainer = (MarkupContainer)child;
+ MarkupContainer childContainer = childType == ChildToDequeueType.BORDER ?
+ ((Border)child).getBodyContainer() : (MarkupContainer)child;
dequeue.pushContainer(childContainer);
childContainer.dequeue(dequeue);