You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2014/02/21 08:37:54 UTC
[29/31] git commit: Whitespace police. Non functional changes
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/28a16378
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/28a16378
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/28a16378
Branch: refs/heads/master
Commit: 28a1637874300d3d8feefecffdb9e8565e3171e9
Parents: fd7ab84
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 18 14:48:25 2014 +0200
Committer: Igor Vaynberg <ig...@gmail.com>
Committed: Thu Feb 20 23:37:16 2014 -0800
----------------------------------------------------------------------
.../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/28a16378/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