Repository: wicket Updated Branches: refs/heads/sandbox/component-queueing-2 b3c946af7 -> b54df55b7
Whitespace police. Non functional changes Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c899a815 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c899a815 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c899a815 Branch: refs/heads/sandbox/component-queueing-2 Commit: c899a81572631ef9d6567ddd50660c8109197dcd Parents: b3c946a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Feb 18 14:48:25 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Feb 18 14:48:25 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/MarkupContainer.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c899a815/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 3fe7c98..c5d6add 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -2079,12 +2079,9 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp { while (dequeue.isAtOpenOrOpenCloseTag()) { - ComponentTag tag = dequeue.popTag(); - - // see if child is already added to parent - + // see if child is already added to parent Component child = get(tag.getId()); // TODO queueing add this into findInQueue and // rename it to dequeue @@ -2094,7 +2091,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp // dequeue child = dequeue.findComponentToDequeue(tag); - + if (child != null) { addDequeuedComponent(child, tag); @@ -2104,11 +2101,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp } } } - + if (child == null || tag.isOpenClose() || !(child instanceof MarkupContainer)) { // could not dequeue, or does not contain children - dequeue.skipToCloseTag(); } else
