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/16 06:00:45 UTC
wicket git commit: give created component to all lambdas as first
argument
Repository: wicket
Updated Branches:
refs/heads/master 5d87f5064 -> 8b5ffebe1
give created component to all lambdas as first argument
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8b5ffebe
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8b5ffebe
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8b5ffebe
Branch: refs/heads/master
Commit: 8b5ffebe147c3453252e95b7a9db193933ef2b72
Parents: 5d87f50
Author: Sven Meier <sv...@apache.org>
Authored: Thu Jun 16 07:58:49 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Thu Jun 16 07:58:49 2016 +0200
----------------------------------------------------------------------
.../wicket/ajax/markup/html/AjaxLink.java | 5 +++--
.../ajax/markup/html/form/AjaxButton.java | 16 +++++++-------
.../ajax/markup/html/form/AjaxCheckBox.java | 5 +++--
.../ajax/markup/html/form/AjaxSubmitLink.java | 15 +++++++------
.../java/org/apache/wicket/lambda/Lambdas.java | 22 ++++++++++----------
.../apache/wicket/markup/html/link/Link.java | 4 ++--
.../wicket/examples/authorization/Index.java | 3 ++-
7 files changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
index ce5f681..1647cff 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
@@ -20,6 +20,7 @@ import org.apache.wicket.IGenericComponent;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.lambda.WicketBiConsumer;
import org.apache.wicket.lambda.WicketConsumer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -144,7 +145,7 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe
* the {@link WicketConsumer} which accepts the {@link AjaxRequestTarget}
* @return the {@link AjaxLink}
*/
- public static <T> AjaxLink<T> onClick(String id, WicketConsumer<AjaxRequestTarget> onClick)
+ public static <T> AjaxLink<T> onClick(String id, WicketBiConsumer<AjaxLink<T>, AjaxRequestTarget> onClick)
{
Args.notNull(onClick, "onClick");
@@ -155,7 +156,7 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe
@Override
public void onClick(AjaxRequestTarget target)
{
- onClick.accept(target);
+ onClick.accept(this, target);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/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 b054762..4cb63d1 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
@@ -236,7 +236,7 @@ public abstract class AjaxButton extends Button
* {@link Form}
* @return the {@link AjaxButton}
*/
- public static AjaxButton onSubmit(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+ public static AjaxButton onSubmit(String id, WicketBiConsumer<AjaxButton, AjaxRequestTarget> onSubmit)
{
Args.notNull(onSubmit, "onSubmit");
@@ -247,7 +247,7 @@ public abstract class AjaxButton extends Button
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- onSubmit.accept(target, form);
+ onSubmit.accept(this, target);
}
};
}
@@ -259,15 +259,15 @@ 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}
* @param onError
* 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<AjaxRequestTarget, Form<?>> onSubmit,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+ WicketBiConsumer<AjaxButton, AjaxRequestTarget> onSubmit,
+ WicketBiConsumer<AjaxButton, AjaxRequestTarget> onError)
{
Args.notNull(onSubmit, "onSubmit");
Args.notNull(onError, "onError");
@@ -279,13 +279,13 @@ public abstract class AjaxButton extends Button
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- onSubmit.accept(target, form);
+ onSubmit.accept(this, target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form)
{
- onError.accept(target, form);
+ onError.accept(this, target);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
index 917cd7a..657f166 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
@@ -19,6 +19,7 @@ package org.apache.wicket.ajax.markup.html.form;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.lambda.WicketBiConsumer;
import org.apache.wicket.lambda.WicketConsumer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.model.IModel;
@@ -101,7 +102,7 @@ public abstract class AjaxCheckBox extends CheckBox
* the {@link WicketConsumer} which accepts the {@link AjaxRequestTarget}
* @return the {@link AjaxCheckBox}
*/
- public static AjaxCheckBox onUpdate(String id, WicketConsumer<AjaxRequestTarget> onUpdate)
+ public static AjaxCheckBox onUpdate(String id, WicketBiConsumer<AjaxCheckBox, AjaxRequestTarget> onUpdate)
{
Args.notNull(onUpdate, "onUpdate");
@@ -112,7 +113,7 @@ public abstract class AjaxCheckBox extends CheckBox
@Override
public void onUpdate(AjaxRequestTarget target)
{
- onUpdate.accept(target);
+ onUpdate.accept(this, target);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/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 a806755..d2e3f89 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
@@ -229,11 +229,10 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
* @param id
* the id of ajax submit link
* @param onSubmit
- * the {@link WicketBiConsumer} which accepts the {@link AjaxRequestTarget} and the
- * {@link Form}
+ * the {@link WicketBiConsumer} which accepts the {@link AjaxSubmitLink\ and the {@link AjaxRequestTarget}
* @return the {@link AjaxSubmitLink}
*/
- public static AjaxSubmitLink onSubmit(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+ public static AjaxSubmitLink onSubmit(String id, WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onSubmit)
{
Args.notNull(onSubmit, "onSubmit");
@@ -244,7 +243,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- onSubmit.accept(target, form);
+ onSubmit.accept(this, target);
}
};
}
@@ -263,8 +262,8 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
* @return the {@link AjaxSubmitLink}
*/
public static AjaxSubmitLink onSubmit(String id,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+ WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onSubmit,
+ WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onError)
{
Args.notNull(onSubmit, "onSubmit");
Args.notNull(onError, "onError");
@@ -276,13 +275,13 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- onSubmit.accept(target, form);
+ onSubmit.accept(this, target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form)
{
- onError.accept(target, form);
+ onError.accept(this, target);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java b/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
index bc46f5e..268f5d0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
@@ -319,7 +319,7 @@ public class Lambdas
*
* @see AjaxLink#onClick(String, WicketConsumer)
*/
- public static <T> AjaxLink<T> ajaxLink(String id, WicketConsumer<AjaxRequestTarget> onClick)
+ public static <T> AjaxLink<T> ajaxLink(String id, WicketBiConsumer<AjaxLink<T>, AjaxRequestTarget> onClick)
{
return AjaxLink.onClick(id, onClick);
}
@@ -337,7 +337,7 @@ public class Lambdas
* @see AjaxButton#onSubmit(String, WicketBiConsumer)
*/
public static AjaxButton ajaxButton(String id,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+ WicketBiConsumer<AjaxButton, AjaxRequestTarget> onSubmit)
{
return AjaxButton.onSubmit(id, onSubmit);
}
@@ -349,17 +349,17 @@ public class Lambdas
* the id of the ajax button
* @param onSubmit
* the {@link WicketBiConsumer} which accepts the {@link AjaxRequestTarget} and the
- * {@link Form}
+ * {@link AjaxButton}
* @param onError
* the {@link WicketBiConsumer} which accepts the {@link AjaxRequestTarget} and the
- * {@link Form}
+ * {@link AjaxButton}
* @return the {@link AjaxButton}
*
* @see AjaxButton#onSubmit(String, WicketBiConsumer, WicketBiConsumer)
*/
public static AjaxButton ajaxButton(String id,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+ WicketBiConsumer<AjaxButton, AjaxRequestTarget> onSubmit,
+ WicketBiConsumer<AjaxButton, AjaxRequestTarget> onError)
{
return AjaxButton.onSubmit(id, onSubmit, onError);
}
@@ -375,7 +375,7 @@ public class Lambdas
*
* @see AjaxCheckBox#onUpdate(String, WicketConsumer)
*/
- public static AjaxCheckBox ajaxCheckBox(String id, WicketConsumer<AjaxRequestTarget> onUpdate)
+ public static AjaxCheckBox ajaxCheckBox(String id, WicketBiConsumer<AjaxCheckBox, AjaxRequestTarget> onUpdate)
{
return AjaxCheckBox.onUpdate(id, onUpdate);
}
@@ -393,7 +393,7 @@ public class Lambdas
* @see AjaxSubmitLink#onSubmit(String, WicketBiConsumer)
*/
public static AjaxSubmitLink ajaxSubmitLink(String id,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+ WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onSubmit)
{
return AjaxSubmitLink.onSubmit(id, onSubmit);
}
@@ -414,8 +414,8 @@ public class Lambdas
* @see AjaxSubmitLink#onSubmit(String, WicketBiConsumer, WicketBiConsumer)
*/
public static AjaxSubmitLink ajaxSubmitLink(String id,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
- WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+ WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onSubmit,
+ WicketBiConsumer<AjaxSubmitLink, AjaxRequestTarget> onError)
{
return AjaxSubmitLink.onSubmit(id, onSubmit, onError);
}
@@ -431,7 +431,7 @@ public class Lambdas
*
* @see Link#onClick(String, WicketConsumer)
*/
- public static <T> Link<T> link(String id, WicketConsumer<Void> onClick)
+ public static <T> Link<T> link(String id, WicketConsumer<Link<T>> onClick)
{
return Link.onClick(id, onClick);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index aa09060..abfcb54 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -428,7 +428,7 @@ public abstract class Link<T> extends AbstractLink implements IRequestListener,
* the {@link WicketConsumer} which accepts the {@link Void}
* @return the {@link Link}
*/
- public static <T> Link<T> onClick(String id, WicketConsumer<Void> onClick)
+ public static <T> Link<T> onClick(String id, WicketConsumer<Link<T>> onClick)
{
Args.notNull(onClick, "onClick");
@@ -439,7 +439,7 @@ public abstract class Link<T> extends AbstractLink implements IRequestListener,
@Override
public void onClick()
{
- onClick.accept(null);
+ onClick.accept(this);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ffebe/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
index 31e45bf..6cd6084 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
@@ -77,7 +77,8 @@ public class Index extends BasePage
// pages that are protected using annotations
add(new BookmarkablePageLink<Void>("adminAnnotBookmarkableLink",
AdminAnnotationsBookmarkablePage.class));
- add(Link.onClick("adminAnnotInternalLink", (ignoreme) -> setResponsePage(new AdminAnnotationsInternalPage("bar"))));
+ add(Link.onClick("adminAnnotInternalLink", link -> setResponsePage(new AdminAnnotationsInternalPage("bar"))));
+
add(new BookmarkablePageLink<>("panelsAnnotPageLink", AnnotationsPanelsPage.class));
}
}