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/05/07 09:40:27 UTC
[1/2] git commit: Minor improvements - call a getter just once,
code formatting
Repository: wicket
Updated Branches:
refs/heads/master 1fb665336 -> cdb130418
Minor improvements - call a getter just once, code formatting
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f854896f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f854896f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f854896f
Branch: refs/heads/master
Commit: f854896f6a8230eb8181976b15fe09e87ac30a71
Parents: 1fb6653
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 7 10:36:33 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 7 10:36:33 2014 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f854896f/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 55e3184..b9dbfba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1532,9 +1532,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
for (ComponentTag tag = context.takeTag(); tag != null; tag = context.takeTag())
{
- if (tag.getAutoComponentFactory() != null)
+ ComponentTag.IAutoComponentFactory autoComponentFactory = tag.getAutoComponentFactory();
+ if (autoComponentFactory != null)
{
- queue(tag.getAutoComponentFactory().newComponent(tag));
+ queue(autoComponentFactory.newComponent(tag));
}
}
}
@@ -2169,8 +2170,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
return DequeueTagAction.DEQUEUE;
}
- else
- if (wicketTag.getAutoComponentFactory() != null)
+ else if (wicketTag.getAutoComponentFactory() != null)
{
return DequeueTagAction.DEQUEUE;
}
[2/2] git commit: WICKET-5579 wicket:enclosure on wicket:extend -
Detach called on component with id '0' while it had a non-empty queue
Posted by mg...@apache.org.
WICKET-5579 wicket:enclosure on wicket:extend - Detach called on component with id '0' while it had a non-empty queue
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cdb13041
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cdb13041
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cdb13041
Branch: refs/heads/master
Commit: cdb1304189ca452eff0dc0bdc971994a55a03c72
Parents: f854896
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 7 10:37:38 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 7 10:37:38 2014 +0300
----------------------------------------------------------------------
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/cdb13041/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 b9dbfba..c63be00 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2180,7 +2180,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
}
else if (wicketTag.isChildTag())
{
- return DequeueTagAction.DEQUEUE;
+ return DequeueTagAction.SKIP;
}
else
{