You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/06/18 20:26:07 UTC
[1/2] wicket git commit: lambda factory method for Button
Repository: wicket
Updated Branches:
refs/heads/master 0cc277d70 -> ffd10a117
lambda factory method for Button
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffd10a11
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffd10a11
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffd10a11
Branch: refs/heads/master
Commit: ffd10a117c667b50b710c1ca7d2dee07aaea059c
Parents: bd52671
Author: Sven Meier <sv...@apache.org>
Authored: Sat Jun 18 22:00:50 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sat Jun 18 22:24:32 2016 +0200
----------------------------------------------------------------------
.../ajax/markup/html/form/AjaxButton.java | 2 +-
.../apache/wicket/markup/html/form/Button.java | 64 ++++++++++++++++++++
2 files changed, 65 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ffd10a11/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
index 3588880..37f9b91 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
@@ -233,7 +233,7 @@ public abstract class AjaxButton extends Button
* the id of the ajax button
* @param onSubmit
* the {@link WicketBiConsumer} which accepts the {@link AjaxRequestTarget} and the
- * {@link Form}
+ * {@link AjaxButton}
* @return the {@link AjaxButton}
*/
public static AjaxButton onSubmit(String id, WicketBiConsumer<AjaxButton, AjaxRequestTarget> onSubmit)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ffd10a11/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
index 3815600..cbd5675 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
@@ -16,8 +16,11 @@
*/
package org.apache.wicket.markup.html.form;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.lambda.WicketConsumer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Args;
/**
* A form button.
@@ -234,4 +237,65 @@ public class Button extends FormComponent<String> implements IFormSubmittingComp
public void onAfterSubmit()
{
}
+
+ /**
+ * Creates a {@link Button} based on lambda expressions
+ *
+ * @param id
+ * the id of the button
+ * @param onSubmit
+ * the {@link WicketConsumer} which accepts the {@link Button}
+ * @return the {@link Button}
+ */
+ public static Button onSubmit(String id, WicketConsumer<Button> onSubmit)
+ {
+ Args.notNull(onSubmit, "onSubmit");
+
+ return new Button(id)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onSubmit()
+ {
+ onSubmit.accept(this);
+ }
+ };
+ }
+
+ /**
+ * Creates a {@link Button} based on lambda expressions
+ *
+ * @param id
+ * the id of the button
+ * @param onSubmit
+ * the {@link WicketConsumer} which accepts the {@link Button}
+ * @param onError
+ * the {@link WicketConsumer} which accepts the {@link Button}
+ * @return the {@link AjaxButton}
+ */
+ public static Button onSubmit(String id,
+ WicketConsumer<Button> onSubmit,
+ WicketConsumer<Button> onError)
+ {
+ Args.notNull(onSubmit, "onSubmit");
+ Args.notNull(onError, "onError");
+
+ return new Button(id)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onSubmit()
+ {
+ onSubmit.accept(this);
+ }
+
+ @Override
+ public void onError()
+ {
+ onError.accept(this);
+ }
+ };
+ }
}
[2/2] wicket git commit: WICKET-6184 remove form argument from ajax
hooks
Posted by sv...@apache.org.
WICKET-6184 remove form argument from ajax hooks
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bd526717
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bd526717
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bd526717
Branch: refs/heads/master
Commit: bd526717d566e542982689ae3fbfba6584072c24
Parents: 0cc277d
Author: Sven Meier <sv...@apache.org>
Authored: Sat Jun 18 10:14:51 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sat Jun 18 22:24:32 2016 +0200
----------------------------------------------------------------------
.../ajax/markup/html/form/AjaxButton.java | 18 +++++++++---------
.../markup/html/form/AjaxFallbackButton.java | 20 ++++++++++----------
.../ajax/markup/html/form/AjaxSubmitLink.java | 18 +++++++++---------
.../java/org/apache/wicket/ajax/HomePage.java | 4 ++--
.../ajax/form/AjaxFormSubmitTestPage.java | 4 ++--
.../wicket/ajax/markup/html/form/HomePage.java | 4 ++--
.../html/form/FormWithMultipleButtonsTest.java | 4 ++--
.../markup/html/form/MultiPartFormPage.java | 4 ++--
.../markup/html/form/NestedFormsPage.java | 4 ++--
.../markup/html/form/border/MyBorder.java | 4 ++--
.../AddressFormPanel.java | 2 +-
.../OnFormValidateModelObjectsPage.java | 3 +--
.../markup/html/form/panelBorder/MyBorder.java | 4 ++--
.../markup/html/form/validation/HomePage.java | 8 ++++----
.../markup/html/form/validation/MyBorder.java | 4 ++--
.../ExpirationRecoveryPage.java | 3 +--
.../util/tester/FormTesterSubmitLinkTest.java | 4 ++--
.../wicket/util/tester/MockFormSubmitsPage.java | 12 ++++++------
.../MockPageAjaxSubmitLinkSubmitsWholeForm.java | 8 ++++----
.../tester/MockPageWithFormAndCheckGroup.java | 4 ++--
.../wicket/util/tester/WicketTesterTest.java | 4 ++--
.../tester/apps_5/AjaxSubmitLinkClickTest.java | 10 ++++------
.../wicket/util/tester/apps_6/LinkPage.java | 4 ++--
.../wicket/util/tester/apps_7/HomePage.java | 4 ++--
.../devutils/inspector/EnhancedPageView.java | 2 +-
.../examples/ajax/builtin/ChoicePage.java | 3 +--
.../examples/ajax/builtin/FileUploadPage.java | 4 ++--
.../wicket/examples/ajax/builtin/TodoList.java | 8 ++++----
.../wicket/examples/asemail/MailTemplate.java | 12 ++++++------
.../wicket/examples/atmosphere/HomePage.java | 4 ++--
.../events/DecoupledAjaxUpdatePage.java | 4 ++--
.../org/apache/wicket/atmosphere/HomePage.java | 4 ++--
.../ajax/markup/html/IndicatingAjaxButton.java | 6 +++---
33 files changed, 100 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
index 4cb63d1..3588880 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
@@ -111,19 +111,19 @@ public abstract class AjaxButton extends Button
@Override
protected void onSubmit(AjaxRequestTarget target)
{
- AjaxButton.this.onSubmit(target, AjaxButton.this.getForm());
+ AjaxButton.this.onSubmit(target);
}
@Override
protected void onAfterSubmit(AjaxRequestTarget target)
{
- AjaxButton.this.onAfterSubmit(target, AjaxButton.this.getForm());
+ AjaxButton.this.onAfterSubmit(target);
}
@Override
protected void onError(AjaxRequestTarget target)
{
- AjaxButton.this.onError(target, AjaxButton.this.getForm());
+ AjaxButton.this.onError(target);
}
@Override
@@ -202,7 +202,7 @@ public abstract class AjaxButton extends Button
* @param target
* @param form
*/
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
}
@@ -212,7 +212,7 @@ public abstract class AjaxButton extends Button
* @param target
* @param form
*/
- protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAfterSubmit(AjaxRequestTarget target)
{
}
@@ -222,7 +222,7 @@ public abstract class AjaxButton extends Button
* @param target
* @param form
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
@@ -245,7 +245,7 @@ public abstract class AjaxButton extends Button
private static final long serialVersionUID = 1L;
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@@ -277,13 +277,13 @@ public abstract class AjaxButton extends Button
private static final long serialVersionUID = 1L;
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
onError.accept(this, target);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index 9f25d9b..cbe6d0c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -69,23 +69,23 @@ public abstract class AjaxFallbackButton extends Button
add(new AjaxFormSubmitBehavior(form, "click")
{
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onSubmit(AjaxRequestTarget target)
{
- AjaxFallbackButton.this.onSubmit(Optional.ofNullable(target), AjaxFallbackButton.this.getForm());
+ AjaxFallbackButton.this.onSubmit(Optional.ofNullable(target));
}
@Override
protected void onAfterSubmit(AjaxRequestTarget target)
{
- AjaxFallbackButton.this.onAfterSubmit(target, AjaxFallbackButton.this.getForm());
+ AjaxFallbackButton.this.onAfterSubmit(target);
}
@Override
protected void onError(AjaxRequestTarget target)
{
- AjaxFallbackButton.this.onError(target, AjaxFallbackButton.this.getForm());
+ AjaxFallbackButton.this.onError(target);
}
@Override
@@ -119,7 +119,7 @@ public abstract class AjaxFallbackButton extends Button
* @param target
* @param form
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
@@ -128,7 +128,7 @@ public abstract class AjaxFallbackButton extends Button
{
if (getRequestCycle().find(AjaxRequestTarget.class) == null)
{
- onError(null, getForm());
+ onError(null);
}
}
@@ -140,7 +140,7 @@ public abstract class AjaxFallbackButton extends Button
{
if (getRequestCycle().find(AjaxRequestTarget.class) == null)
{
- onSubmit(Optional.empty(), getForm());
+ onSubmit(Optional.empty());
}
}
@@ -152,7 +152,7 @@ public abstract class AjaxFallbackButton extends Button
{
if (getRequestCycle().find(AjaxRequestTarget.class) == null)
{
- onAfterSubmit(null, getForm());
+ onAfterSubmit(null);
}
}
@@ -175,7 +175,7 @@ public abstract class AjaxFallbackButton extends Button
* ajax target if this linked was invoked using ajax, null otherwise
* @param form
*/
- protected void onSubmit(final Optional<AjaxRequestTarget> target, final Form<?> form)
+ protected void onSubmit(final Optional<AjaxRequestTarget> target)
{
}
@@ -188,7 +188,7 @@ public abstract class AjaxFallbackButton extends Button
* ajax target if this linked was invoked using ajax, null otherwise
* @param form
*/
- protected void onAfterSubmit(final AjaxRequestTarget target, final Form<?> form)
+ protected void onAfterSubmit(final AjaxRequestTarget target)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
index d2e3f89..94de064 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
@@ -84,7 +84,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
@Override
protected void onError(AjaxRequestTarget target)
{
- AjaxSubmitLink.this.onError(target, getForm());
+ AjaxSubmitLink.this.onError(target);
}
@Override
@@ -109,13 +109,13 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
@Override
protected void onSubmit(AjaxRequestTarget target)
{
- AjaxSubmitLink.this.onSubmit(target, getForm());
+ AjaxSubmitLink.this.onSubmit(target);
}
@Override
protected void onAfterSubmit(AjaxRequestTarget target)
{
- AjaxSubmitLink.this.onAfterSubmit(target, getForm());
+ AjaxSubmitLink.this.onAfterSubmit(target);
}
};
}
@@ -128,7 +128,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
*
* @param form the {@link Form}
*/
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
}
@@ -140,7 +140,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
*
* @param form the {@link Form}
*/
- protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAfterSubmit(AjaxRequestTarget target)
{
}
@@ -201,7 +201,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
* @param target
* @param form
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
@@ -241,7 +241,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
private static final long serialVersionUID = 1L;
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@@ -273,13 +273,13 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
private static final long serialVersionUID = 1L;
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
onError.accept(this, target);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
index ecff530..d8ed36b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
@@ -98,7 +98,7 @@ public class HomePage extends WebPage
form.add(new AjaxFallbackButton("addButton", form)
{
@Override
- protected void onSubmit(Optional<AjaxRequestTarget> targetOptional, Form<?> form)
+ protected void onSubmit(Optional<AjaxRequestTarget> targetOptional)
{
rows++;
listView.removeAll();
@@ -106,7 +106,7 @@ public class HomePage extends WebPage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
}.setDefaultFormProcessing(false));
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
index b372395..b90ba7c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
@@ -78,13 +78,13 @@ public class AjaxFormSubmitTestPage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(Optional<AjaxRequestTarget> target, Form<?> form)
+ protected void onSubmit(Optional<AjaxRequestTarget> target)
{
formSubmitted = formSubmitted | BUTTON;
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
index f39ec9f..5acfc55 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
@@ -74,12 +74,12 @@ class TestForm extends Form<Void>
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
}).setDefaultFormProcessing(false));
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
index 081efe2..448d1ff 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
@@ -120,13 +120,13 @@ public class FormWithMultipleButtonsTest extends WicketTestCase
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(Optional<AjaxRequestTarget> target, Form<?> form)
+ protected void onSubmit(Optional<AjaxRequestTarget> target)
{
submitSequence.add(this);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
index c8c1c74..e354ff9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
@@ -63,7 +63,7 @@ public class MultiPartFormPage extends WebPage
button1 = new AjaxFallbackButton("button1", null)
{
@Override
- protected void onSubmit(Optional<AjaxRequestTarget> target, Form<?> form)
+ protected void onSubmit(Optional<AjaxRequestTarget> target)
{
target.ifPresent(t -> t.add(this));
}
@@ -73,7 +73,7 @@ public class MultiPartFormPage extends WebPage
button2 = new AjaxFallbackButton("button2", null)
{
@Override
- protected void onSubmit(Optional<AjaxRequestTarget> target, Form<?> form)
+ protected void onSubmit(Optional<AjaxRequestTarget> target)
{
target.ifPresent(t -> t.add(this));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
index a20aa30..494894f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
@@ -99,13 +99,13 @@ public class NestedFormsPage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
target.add(feedback);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
target.add(feedback);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
index 1f18909..2cc30cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
@@ -47,13 +47,13 @@ public class MyBorder extends Border
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
target.add(form);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/AddressFormPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/AddressFormPanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/AddressFormPanel.java
index 68b2761..4a24103 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/AddressFormPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/AddressFormPanel.java
@@ -58,7 +58,7 @@ public class AddressFormPanel extends GenericPanel<AddressFormPanel.ChildModel>
add(new AjaxSubmitLink("childSubmitButton", form)
{
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
getPanelInstance().getModelObject().submittedCalled(target);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
index eda0d82..bc94321 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
@@ -85,9 +85,8 @@ public class OnFormValidateModelObjectsPage extends WebPage
parentForm.add(new AjaxSubmitLink("parentSubmitBtn", parentForm)
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- super.onSubmit(target, form);
target.add(getThePage().get("validations"));
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/MyBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/MyBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/MyBorder.java
index 560b3f9..d9f211a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/MyBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/MyBorder.java
@@ -48,13 +48,13 @@ public class MyBorder extends BorderPanel
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
target.add(form);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
index 0742bd6..1128395 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
@@ -88,7 +88,7 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
info("onSubmit");
hitOnSubmit = true;
@@ -96,7 +96,7 @@ public class HomePage extends WebPage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
error("onError");
hitOnError = true;
@@ -127,14 +127,14 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
formSubmitted = formSubmitted | AJAX;
target.add(form);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
index c99c5ab..845f370 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
@@ -53,7 +53,7 @@ public class MyBorder extends Border
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
info("onSubmit");
hitOnSubmit = true;
@@ -61,7 +61,7 @@ public class MyBorder extends Border
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
error("onError");
hitOnError = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/ExpirationRecoveryPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/ExpirationRecoveryPage.java b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/ExpirationRecoveryPage.java
index 889a69e..6e883a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/ExpirationRecoveryPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/ExpirationRecoveryPage.java
@@ -75,9 +75,8 @@ public class ExpirationRecoveryPage extends WebPage
return new AjaxSubmitLink(id)
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- super.onSubmit(target, form);
ajaxSubmitLinkSubmitted.set(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
index c633437..82fa25b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
@@ -97,13 +97,13 @@ public class FormTesterSubmitLinkTest extends WicketTestCase
form.add(new AjaxSubmitLink("submit")
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
submitted = true;
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
index a4dc56b..6117c15 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
@@ -51,9 +51,9 @@ public class MockFormSubmitsPage extends WebPage
form.add(new AjaxButton("ajaxButton")
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- MockFormSubmitsPage.this.onAjaxButtonSubmit(target, form);
+ MockFormSubmitsPage.this.onAjaxButtonSubmit(target);
}
});
@@ -62,18 +62,18 @@ public class MockFormSubmitsPage extends WebPage
form.add(new AjaxSubmitLink("ajaxlink")
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- MockFormSubmitsPage.this.onAjaxSubmitLinkSubmit(target, form);
+ MockFormSubmitsPage.this.onAjaxSubmitLinkSubmit(target);
}
});
}
- protected void onAjaxSubmitLinkSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAjaxSubmitLinkSubmit(AjaxRequestTarget target)
{
}
- protected void onAjaxButtonSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAjaxButtonSubmit(AjaxRequestTarget target)
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
index dad73b2..86b487a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
@@ -68,14 +68,14 @@ public class MockPageAjaxSubmitLinkSubmitsWholeForm extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
text = "Hello " + name;
target.add(label);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
throw new RuntimeException("Unexpected error occurred.");
}
@@ -87,14 +87,14 @@ public class MockPageAjaxSubmitLinkSubmitsWholeForm extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
text = "Goodbye " + name;
target.add(label);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
throw new RuntimeException("Unexpected error occurred.");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
index c042d3a..156bb7b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
@@ -62,13 +62,13 @@ public class MockPageWithFormAndCheckGroup extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
target.add(this);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index 95c050a..ee32429 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -1201,13 +1201,13 @@ public class WicketTesterTest extends WicketTestCase
MockFormSubmitsPage page = new MockFormSubmitsPage()
{
@Override
- protected void onAjaxSubmitLinkSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAjaxSubmitLinkSubmit(AjaxRequestTarget target)
{
ajaxSubmitLinkSubmitted.set(true);
}
@Override
- protected void onAjaxButtonSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAjaxButtonSubmit(AjaxRequestTarget target)
{
ajaxButtonSubmitted.set(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
index b5c2bcd..6c1bec8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
@@ -58,14 +58,13 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- assertNotNull(form);
linkClicked = true;
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
@@ -104,14 +103,13 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
- assertNotNull(form);
linkClicked = true;
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
index 6106327..bc9d6de 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
@@ -118,13 +118,13 @@ public class LinkPage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form)
+ protected void onSubmit(final AjaxRequestTarget target)
{
getRequestCycle().setResponsePage(new ResultPage("A form label"));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
index a521370..0a6f6fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
@@ -58,13 +58,13 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
index 49fd4c1..501347b 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
@@ -294,7 +294,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
private static final long serialVersionUID = 1L;
@Override
- protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAfterSubmit(AjaxRequestTarget target)
{
if (target != null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
index 5bc98b6..e4aed65 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
@@ -101,9 +101,8 @@ public class ChoicePage extends BasePage
form.add(new AjaxButton("go")
{
@Override
- protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onAfterSubmit(AjaxRequestTarget target)
{
- super.onAfterSubmit(target, form);
info("You have selected: " + makes.getModelObject() + " " + models.getModelObject());
target.add(feedback);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
index 453124c..e2eda2e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
@@ -94,7 +94,7 @@ public class FileUploadPage extends BasePage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
info("This request was processed using AJAX");
@@ -103,7 +103,7 @@ public class FileUploadPage extends BasePage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
// update feedback to display errors
target.add(feedback);
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
index 5a512b1..d04c5e8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
@@ -253,7 +253,7 @@ public class TodoList extends BasePage
add(new AjaxButton("add", this)
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
// retrieve the todo item
TodoItem item = (TodoItem)getParent().getDefaultModelObject();
@@ -263,7 +263,7 @@ public class TodoList extends BasePage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
@@ -271,13 +271,13 @@ public class TodoList extends BasePage
add(new AjaxButton("cancel", this)
{
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onCancelTodo(target);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
index 70e2214..b39cb27 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
@@ -83,7 +83,7 @@ public class MailTemplate extends WicketExamplePage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
PageParameters parameters = new PageParameters();
parameters.set("name", name);
@@ -95,7 +95,7 @@ public class MailTemplate extends WicketExamplePage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
target.add(feedback);
}
@@ -106,7 +106,7 @@ public class MailTemplate extends WicketExamplePage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
CharSequence panelHtml = ComponentRenderer.renderComponent(new MailTemplatePanel("someId",
new PropertyModel<>(MailTemplate.this, "name")));
@@ -116,7 +116,7 @@ public class MailTemplate extends WicketExamplePage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
target.add(feedback);
}
@@ -127,7 +127,7 @@ public class MailTemplate extends WicketExamplePage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
Map<String, Object> variables = new HashMap<>();
variables.put("name", name);
@@ -145,7 +145,7 @@ public class MailTemplate extends WicketExamplePage
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
target.add(feedback);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
index 7377c48..01593da 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
@@ -56,14 +56,14 @@ public class HomePage extends WicketExamplePage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
EventBus.get().post(
new ChatMessage(receiver.getModelObject(), input.getModelObject()));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
index 5e2e4b5..fe9a965 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
@@ -60,13 +60,13 @@ public class DecoupledAjaxUpdatePage extends BasePage
{
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
send(getPage(), Broadcast.BREADTH, new CounterUpdate(target));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java
index 34063c7..f2e4e6c 100644
--- a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java
+++ b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java
@@ -53,14 +53,14 @@ public class HomePage extends WebPage
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+ protected void onSubmit(AjaxRequestTarget target)
{
EventBus.get().post(
new ChatMessage(receiver.getModelObject(), input.getModelObject()));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526717/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
index 35825f8..9f18c8b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
@@ -103,7 +103,7 @@ public abstract class IndicatingAjaxButton extends AjaxButton implements IAjaxIn
return new IndicatingAjaxButton(id)
{
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@@ -120,13 +120,13 @@ public abstract class IndicatingAjaxButton extends AjaxButton implements IAjaxIn
return new IndicatingAjaxButton(id)
{
@Override
- public void onSubmit(AjaxRequestTarget target, Form<?> form)
+ public void onSubmit(AjaxRequestTarget target)
{
onSubmit.accept(this, target);
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form)
+ protected void onError(AjaxRequestTarget target)
{
onError.accept(this, target);
}