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/04/25 10:18:53 UTC
[1/3] git commit: Reuse the resolved value of peekTag()
Repository: wicket
Updated Branches:
refs/heads/master 1af5d3cd4 -> cd414fa5b
Reuse the resolved value of peekTag()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e2376fe5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e2376fe5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e2376fe5
Branch: refs/heads/master
Commit: e2376fe5e84c7e4d6ed91fe2463b08adc8bb58a3
Parents: 1af5d3c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 11:17:28 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 11:17:28 2014 +0300
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/DequeueContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e2376fe5/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java b/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java
index 837c5f6..1b35152 100644
--- a/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java
@@ -244,7 +244,8 @@ public final class DequeueContext
*/
public boolean isAtOpenOrOpenCloseTag()
{
- return peekTag() != null && (peekTag().isOpen() || peekTag().isOpenClose());
+ ComponentTag tag = peekTag();
+ return tag != null && (tag.isOpen() || tag.isOpenClose());
}
/**
[2/3] git commit: Fix broken and wrong javadoc
Posted by mg...@apache.org.
Fix broken and wrong javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d7110725
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d7110725
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d7110725
Branch: refs/heads/master
Commit: d7110725293e7857b3b0fe06ee636e3f0b72db36
Parents: e2376fe
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 11:17:59 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 11:17:59 2014 +0300
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d7110725/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java b/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java
index 4bad6f7..93fa2fa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IQueueRegion.java
@@ -45,8 +45,7 @@ public interface IQueueRegion
* Starts component dequeueing on this {@link IQueueRegion}. This is the entry point into the
* dequeuing process, it creates the {@link DequeueContext} and delegates the operation to the
* {@link org.apache.wicket.MarkupContainer#dequeue(DequeueContext)} method which performs the
- * actual dequeueing. The context's markup is retrieved using the {@link #getDequeueMarkup()}
- * method which allows subclasses to provide dequeueing-specific markup.
+ * actual dequeueing. The context's markup is retrieved using the {@link MarkupContainer#getAssociatedMarkup()}.
*/
public void dequeue();
}
[3/3] git commit: WICKET-5572 Dequeueing problem when there is
TransparentWebMarkupContainer around
Posted by mg...@apache.org.
WICKET-5572 Dequeueing problem when there is TransparentWebMarkupContainer around <wicket:child/>
Dequeue inside <wicket:child> tags.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cd414fa5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cd414fa5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cd414fa5
Branch: refs/heads/master
Commit: cd414fa5b5c88b39b11938cdbf40571f4a2df153
Parents: d711072
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 11:18:15 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 11:18:15 2014 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 6 +++++-
.../DequeueingTransparentWebMarkupContainerTest.java | 2 --
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd414fa5/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 30293fb..55e3184 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2178,9 +2178,13 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
return DequeueTagAction.SKIP;
}
+ else if (wicketTag.isChildTag())
+ {
+ return DequeueTagAction.DEQUEUE;
+ }
else
{
- return null; // dont know
+ return null; // don't know
}
}
return DequeueTagAction.DEQUEUE;
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd414fa5/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
index 08a2d16..2bdf28c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.queueing.transparentresolvers;
import org.apache.wicket.WicketTestCase;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -25,7 +24,6 @@ import org.junit.Test;
*/
public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
{
- @Ignore
@Test
public void startSubPageWithTWMCinTheParentPage() {
tester.startPage(SubPage.class);