You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2016/07/27 09:24:35 UTC
wicket git commit: WICKET-6216 Problem with queued components and
border
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 2f7a4e80b -> 39685d81e
WICKET-6216 Problem with queued components and border
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/39685d81
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/39685d81
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/39685d81
Branch: refs/heads/wicket-7.x
Commit: 39685d81e97ede8f65ce27730d84dfec356d5764
Parents: 2f7a4e8
Author: Andrea Del Bene <ad...@apache.org>
Authored: Wed Jul 27 11:23:22 2016 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Wed Jul 27 11:23:22 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/border/Border.java | 7 +++++++
.../wicket/queueing/ComponentQueueingTest.java | 15 +++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/39685d81/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 3104b23..ceef551 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
@@ -328,6 +328,13 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
return this;
}
+ @Override
+ public Border queue(Component... components)
+ {
+ getBodyContainer().queue(components);
+ return this;
+ }
+
/**
* Queues children components to the Border itself
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/39685d81/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index b43e177..68dd6a0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -648,7 +648,22 @@ public class ComponentQueueingTest extends WicketTestCase
assertThat(p, hasPath(new Path(a, border, r, s, border.getBodyContainer(), b)));
}
+
+ @Test
+ public void queueBorderBody() throws Exception
+ {
+
+ TestBorder border = new TestBorder("border");
+ border.setBorderMarkup("<wicket:border><wicket:body/></wicket:border>");
+ TestPage p = new TestPage();
+ p.setPageMarkup("<div wicket:id=\"border\"><span wicket:id=\"label\"></span></div>");
+
+ p.add(border);
+ border.queue(new Label("label", "test"));
+
+ tester.startPage(p);
+ }
@Test
public void border_nested()