Author: ivaynberg Date: Fri May 27 06:18:29 2011 New Revision: 1128165 URL: http://svn.apache.org/viewvc?rev=1128165&view=rev Log: removing magic from borders, namely border.add(x)==border.getbodycontainer().add(x) Issue: WICKET-3702
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HereIsTheBug.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/HomePage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java (original) +++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java Fri May 27 06:18:29 2011 @@ -108,8 +108,8 @@ import org.apache.wicket.util.lang.Args; * The component "someContainer" in the previous example must be added to the border, and not the * body, which is achieved via {@link #addToBorder(Component...)}. * <p/> - * {@link #add(Component...)} is an alias to {@link #addToBorderBody(Component...)} and will add a - * child component to the border body as shown in the example below. + * {@link #add(Component...)} is an alias to {@link #addToBody(Component...)} and will add a child + * component to the border body as shown in the example below. * * <pre> * <html> @@ -167,7 +167,7 @@ public abstract class Border extends Web { super(id, model); - body = newBorderBodyContainer(id + "_" + BODY); + body = new BorderBodyContainer(id + "_" + BODY); addToBorder(body); } @@ -180,111 +180,40 @@ public abstract class Border extends Web } /** - * Create a new BorderBodyContainer - * - * @param id - * @return A new instance - */ - BorderBodyContainer newBorderBodyContainer(final String id) - { - return new BorderBodyContainer(id); - } - - /** - * This is for all components which have been added to the markup like this: - * - * <pre> - * <span wicket:id="myBorder"> - * <input wicket:id="text1" .. /> - * ... - * </span> - * </pre> - * - * Whereas {@link #addToBorder(Component...)} will add a component associated with the following - * markup: - * - * <pre> - * <wicket:border> - * <form wicket:id="myForm" .. > - * <body/> - * </form> - * </wicket:border> - * </pre> - * + * @see #add(Component...) * @param children * @return this */ - @Override - public MarkupContainer add(final Component... children) - { - return addToBorderBody(children); - } - - /** - * Add a behavior to the border's body. - * - * @see #add(Component...) - */ - @Override - public Component add(final Behavior... behaviors) + public Border addToBorder(final Component... children) { - return addToBorderBody(behaviors); + super.add(children); + return this; } /** - * @see #add(Component...) + * @see #add(Behavior...) * @param children * @return this */ - public MarkupContainer addToBorder(final Component... children) + public Border addToBorder(final Behavior... children) { - return super.add(children); + super.add(children); + return this; } - /** - * @see #add(Component...) - * @param behaviors - * @return this - */ - public Component addToBorder(final Behavior... behaviors) - { - return super.add(behaviors); - } /** * @see #add(Component...) * @param child * @return this */ - public Border addToBorderBody(final Component... child) + public Border addToBody(final Component... child) { getBodyContainer().add(child); return this; } /** - * @see #add(Component...) - * @param behaviors - * @return this - */ - public Component addToBorderBody(final Behavior... behaviors) - { - super.add(behaviors); - return this; - } - - /** - * @see #addToBorderBody(Component...) - * @see #get(String) - * @param path - * @return The component added to the border - */ - public final Component getFromBorderBody(final String path) - { - return getBodyContainer().get(path); - } - - /** * {@inheritDoc} */ public Component resolve(final MarkupContainer container, final MarkupStream markupStream, Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage.java Fri May 27 06:18:29 2011 @@ -42,8 +42,8 @@ public class AjaxLinkWithBorderPage exte final Label label = new Label("ajaxLabel", new PropertyModel<String>(this, "labelText")); label.setOutputMarkupId(true); - border.addToBorderBody(label); - border.addToBorderBody(new AjaxLink<Void>("ajaxLink") + border.addToBody(label); + border.addToBody(new AjaxLink<Void>("ajaxLink") { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2.java Fri May 27 06:18:29 2011 @@ -44,9 +44,9 @@ public class AjaxPage2 extends WebPage ajaxLabel = new Label("ajaxLabel", "AAAAAAA"); ajaxLabel.setOutputMarkupId(true); - myBorder.addToBorderBody(ajaxLabel); + myBorder.addToBody(ajaxLabel); - myBorder.addToBorderBody(new AjaxLink<Void>("ajaxLink") + myBorder.addToBody(new AjaxLink<Void>("ajaxLink") { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_11.java Fri May 27 06:18:29 2011 @@ -39,6 +39,6 @@ public class BoxBorderTestPage_11 extend Border border = new TogglePanel("border", new Model<String>("model")); add(border); - border.addToBorderBody(new Label("label", "my test")); + border.addToBody(new Label("label", "my test")); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java Fri May 27 06:18:29 2011 @@ -39,8 +39,8 @@ public class BoxBorderTestPage_2 extends BoxBorder border = new BoxBorder("box"); add(border); - border.addToBorderBody(new TextField<String>("text")); - border.addToBorderBody(new Image("img", new PackageResourceReference(BoxBorder.class, + border.addToBody(new TextField<String>("text")); + border.addToBody(new Image("img", new PackageResourceReference(BoxBorder.class, "test.png"))); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_8.java Fri May 27 06:18:29 2011 @@ -36,9 +36,9 @@ public class BoxBorderTestPage_8 extends add(border1); Fragment panel1 = new Fragment("panel1", "frag1", border1.getBodyContainer()); - border1.addToBorderBody(panel1); + border1.addToBody(panel1); Fragment panel2 = new Fragment("panel2", "frag2", this); - border1.addToBorderBody(panel2); + border1.addToBody(panel2); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_9.java Fri May 27 06:18:29 2011 @@ -39,6 +39,6 @@ public class BoxBorderTestPage_9 extends Fragment panel1 = new Fragment("fragmentsWillBeRenderedHere", "fragmentSource", myBorder.getBodyContainer()); - myBorder.addToBorderBody(panel1); + myBorder.addToBody(panel1); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage.java Fri May 27 06:18:29 2011 @@ -35,7 +35,7 @@ public class HideableBorderPage extends { border = new HideableBorder("hideable"); add(border); - border.addToBorderBody(new Label("content", "label")); + border.addToBody(new Label("content", "label")); } /** @return hideable border */ Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/CommonModelPage.java Fri May 27 06:18:29 2011 @@ -40,12 +40,12 @@ public class CommonModelPage extends Web add(border); Form<Void> form1 = new Form<Void>("form1"); - border.add(form1); + border.addToBody(form1); form1.add(new TextField<Integer>("quantity1", new PropertyModel<Integer>(this, "quantity1"))); Form<Void> form2 = new Form<Void>("form2"); - border.add(form2); + border.addToBody(form2); form2.add(new TextField<Integer>("quantity2", new PropertyModel<Integer>(this, "quantity2"))); } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java Fri May 27 06:18:29 2011 @@ -78,17 +78,17 @@ public class HomePage extends WebPage MyBorder border = new MyBorder("border"); add(border); - border.addToBorderBody(new TextField<String>("textfield", new PropertyModel<String>(this, + border.addToBody(new TextField<String>("textfield", new PropertyModel<String>(this, "textfield"))); - border.addToBorderBody(new Label("lbltextfield", new PropertyModel<String>(this, + border.addToBody(new Label("lbltextfield", new PropertyModel<String>(this, "textfield"))); - border.addToBorderBody(new MyTextField("datefield", new PropertyModel<String>(this, + border.addToBody(new MyTextField("datefield", new PropertyModel<String>(this, "datefield")).setOutputMarkupId(true)); - border.addToBorderBody(new Label("lbldatefield", new PropertyModel<String>(this, + border.addToBody(new Label("lbldatefield", new PropertyModel<String>(this, "datefield"))); - border.addToBorderBody(new MyDateField("datefield2", new PropertyModel<String>(this, + border.addToBody(new MyDateField("datefield2", new PropertyModel<String>(this, "datefield2")).setOutputMarkupId(true)); - border.addToBorderBody(new Label("lbldatefield2", new PropertyModel<String>(this, + border.addToBody(new Label("lbldatefield2", new PropertyModel<String>(this, "datefield2"))); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java Fri May 27 06:18:29 2011 @@ -36,7 +36,7 @@ public class FeedbackFormPage extends We { final TextField<String> tf = new TextField<String>("input", new Model<String>()); final FormComponentFeedbackBorder feedback = new FormComponentFeedbackBorder("feedback"); - feedback.addToBorderBody(tf); + feedback.addToBody(tf); Form<Void> form = new Form<Void>("form") { Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HereIsTheBug.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HereIsTheBug.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HereIsTheBug.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HereIsTheBug.java Fri May 27 06:18:29 2011 @@ -45,8 +45,8 @@ public class HereIsTheBug extends Panel FormComponentFeedbackBorder border = new FormComponentFeedbackBorder("border"); TextField<String> textField = new TextField<String>("name"); textField.setRequired(true); - border.add(textField); - border.add(new FeedbackPanel("feedback")); + border.addToBody(textField); + border.addToBody(new FeedbackPanel("feedback")); form.add(border); add(form); } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java Fri May 27 06:18:29 2011 @@ -109,14 +109,14 @@ public class HomePage extends WebPage MyBorder border = new MyBorder("border"); add(border); - border.addToBorderBody(new TextField<String>("textfield1", new PropertyModel<String>(this, + border.addToBody(new TextField<String>("textfield1", new PropertyModel<String>(this, "textfield1")).setRequired(true)); - border.addToBorderBody(new Label("lbltextfield1", new PropertyModel<String>(this, + border.addToBody(new Label("lbltextfield1", new PropertyModel<String>(this, "textfield1"))); - border.addToBorderBody(new TextField<String>("textfield2", new PropertyModel<String>(this, + border.addToBody(new TextField<String>("textfield2", new PropertyModel<String>(this, "textfield2"))); - border.addToBorderBody(new Label("lbltextfield2", new PropertyModel<String>(this, + border.addToBody(new Label("lbltextfield2", new PropertyModel<String>(this, "textfield2"))); // -------------------- Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/HomePage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/HomePage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/HomePage.java Fri May 27 06:18:29 2011 @@ -50,7 +50,7 @@ public class HomePage extends BasePage LocalizedFeedbackBorder brdr = new LocalizedFeedbackBorder("fieldborder"); TextField<String> field = new TextField<String>("field", new Model<String>("")); field.info("info on field"); - brdr.add(field.setRequired(true)); + brdr.addToBody(field.setRequired(true)); form.add(brdr); add(form); } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java Fri May 27 06:18:29 2011 @@ -38,7 +38,7 @@ public class EnclosurePage_3 extends Web Border border = new MyBorder("border"); add(border); - border.addToBorderBody(new Link<Void>("newLink") + border.addToBody(new Link<Void>("newLink") { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java Fri May 27 06:18:29 2011 @@ -66,6 +66,6 @@ public class BasePage extends WebPage private void addToBorder(final Component child) { - border.addToBorderBody(child); + border.addToBody(child); } } \ No newline at end of file Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java?rev=1128165&r1=1128164&r2=1128165&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java Fri May 27 06:18:29 2011 @@ -64,7 +64,7 @@ public class HomePage extends WebPage FormComponentFeedbackBorder nameBorder = new FormComponentFeedbackBorder("nameBorder"); add(nameBorder); - nameBorder.addToBorderBody(name); + nameBorder.addToBody(name); } }