You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/18 13:49:29 UTC
[1/3] git commit: Whitespace police. Non functional changes
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 <mg...@apache.org>
Authored: Tue Feb 18 14:48:25 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
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
[2/3] git commit: Fix
org.apache.wicket.markup.html.tags.InputTagNotClosedTest
Posted by mg...@apache.org.
Fix org.apache.wicket.markup.html.tags.InputTagNotClosedTest
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cba807f1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cba807f1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cba807f1
Branch: refs/heads/sandbox/component-queueing-2
Commit: cba807f17909f0bb2f6d1674827e66ed96c1daae
Parents: c899a81
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 18 14:48:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 18 14:48:49 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cba807f1/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 c5d6add..7c69ae1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2115,7 +2115,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
dequeue.popContainer();
}
- if (tag.isOpen())
+ if (tag.isOpen() && tag.hasNoCloseTag() == false)
{
// pull the close tag off
ComponentTag close = dequeue.popTag();
[3/3] git commit: Add @Override
Posted by mg...@apache.org.
Add @Override
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b54df55b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b54df55b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b54df55b
Branch: refs/heads/sandbox/component-queueing-2
Commit: b54df55b7f3c04dc1b792cdf0cf629ea4f4bf055
Parents: cba807f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 18 14:49:03 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 18 14:49:03 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/markup/html/border/Border.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b54df55b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
index e916d18..fb146a7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
@@ -536,7 +536,8 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
return markup.find(child.getId());
}
-
+
+ @Override
public IMarkupFragment getDequeueMarkup()
{
Border border=findParent(Border.class);