improved WICKET-5988 relaying on component resolvers
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f14e03f8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f14e03f8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f14e03f8 Branch: refs/heads/lambdas Commit: f14e03f84454101fe6569bd1a1979b5835835246 Parents: e9c458b Author: Andrea Del Bene <[email protected]> Authored: Mon Oct 26 13:00:53 2015 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Mon Oct 26 15:44:35 2015 +0100 ---------------------------------------------------------------------- .../wicket/markup/html/border/Border.java | 26 +++++++++----------- .../form/feedback/FeedbackFormPage_result2.html | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f14e03f8/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 766d296..36adbe1 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 @@ -166,7 +166,6 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes super(id, model); body = new BorderBodyContainer(id + "_" + BODY); - addToBorder(body); } /** @@ -205,7 +204,17 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes @Override public Border add(final Component... children) { - getBodyContainer().add(children); + for (Component component : children) + { + if (component.equals(body)) + { + addToBorder(component); + } + else + { + getBodyContainer().add(component); + } + } return this; } @@ -631,17 +640,4 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes return borderMarkup != null ? borderMarkup : markup; } - @Override - protected void onBeforeRender() - { - super.onBeforeRender(); - /** - * https://issues.apache.org/jira/browse/WICKET-5981 - * dequeue border to adjust children hierarchy. - */ - if (!hasBeenRendered()) - { - dequeue(); - } - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/f14e03f8/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html index da7d6b2..ced751f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="feedback"><wicket:border> <wicket:body> <input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">
