Non-functional changes: - Java 7 diamonds - Javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/55d55cb3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/55d55cb3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/55d55cb3 Branch: refs/heads/master Commit: 55d55cb3c7aca6e1e536ad8a3fcee9ef486f506b Parents: 414fc13 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 8 20:13:52 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 8 23:16:54 2016 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/Form.java | 1 - .../wicket/markup/html/form/FormComponentPanel.java | 16 +++++----------- .../java/org/apache/wicket/model/ChainingModel.java | 9 --------- .../html/form/FormComponentPanelProcessingTest.java | 6 +++--- 4 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/55d55cb3/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index 1768051..0c15684 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -406,7 +406,6 @@ public class Form<T> extends WebMarkupContainer formComponent.clearInput(); } } - }); } http://git-wip-us.apache.org/repos/asf/wicket/blob/55d55cb3/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java index 7be1858..fb7b961 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java @@ -114,9 +114,10 @@ public abstract class FormComponentPanel<T> extends FormComponent<T> implements private static final long serialVersionUID = 1L; /** - * Construct. + * Constructor. * * @param id + * The component id */ public FormComponentPanel(String id) { @@ -124,37 +125,30 @@ public abstract class FormComponentPanel<T> extends FormComponent<T> implements } /** - * Construct. + * Constructor. * * @param id + * The component id * @param model + * The component model */ public FormComponentPanel(String id, IModel<T> model) { super(id, model); } - /** - * {@inheritDoc} - */ @Override public boolean checkRequired() { return true; } - /** - * {@inheritDoc} - */ @Override protected IMarkupSourcingStrategy newMarkupSourcingStrategy() { return new PanelMarkupSourcingStrategy(false); } - /** - * {@inheritDoc} - */ @Override protected void onComponentTag(final ComponentTag tag) { http://git-wip-us.apache.org/repos/asf/wicket/blob/55d55cb3/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java index b88c15b..fe4cb94 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java @@ -83,9 +83,6 @@ public abstract class ChainingModel<T> implements IChainingModel<T> } } - /** - * @see org.apache.wicket.model.IModel#getObject() - */ @Override @SuppressWarnings("unchecked") public T getObject() @@ -97,9 +94,6 @@ public abstract class ChainingModel<T> implements IChainingModel<T> return (T)target; } - /** - * @see org.apache.wicket.model.IChainingModel#getChainedModel() - */ @Override public IModel<?> getChainedModel() { @@ -110,9 +104,6 @@ public abstract class ChainingModel<T> implements IChainingModel<T> return null; } - /** - * @see org.apache.wicket.model.IChainingModel#setChainedModel(org.apache.wicket.model.IModel) - */ @Override public void setChainedModel(IModel<?> model) { http://git-wip-us.apache.org/repos/asf/wicket/blob/55d55cb3/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java index 75e9826..193d7a8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java @@ -62,7 +62,7 @@ public class FormComponentPanelProcessingTest extends WicketTestCase private TestFormComponentPanel(String id, IModel<Serializable> model) { super(id, model); - add(new TextField<Serializable>("text", new Model<Serializable>()) + add(new TextField<Serializable>("text", new Model<>()) { private static final long serialVersionUID = 1L; @@ -127,9 +127,9 @@ public class FormComponentPanelProcessingTest extends WicketTestCase public TestPage() { - Form<Void> form = new Form<Void>("form"); + Form<Void> form = new Form<>("form"); add(form); - form.add(new TestFormComponentPanel("panel", new Model<Serializable>())); + form.add(new TestFormComponentPanel("panel", new Model<>())); } @Override
