You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/12/05 08:45:40 UTC
wicket git commit: WICKET-6293 Behavior#onTag() should pass the
Component as well
Repository: wicket
Updated Branches:
refs/heads/master 81684f93d -> 673fd05dd
WICKET-6293 Behavior#onTag() should pass the Component as well
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/673fd05d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/673fd05d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/673fd05d
Branch: refs/heads/master
Commit: 673fd05dda93549756f0b86e780ec8be217b2de0
Parents: 81684f9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Dec 5 09:43:19 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Dec 5 09:43:19 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/behavior/Behavior.java | 6 +++---
.../src/main/java/org/apache/wicket/lambda/Lambdas.java | 5 +++--
.../src/test/java/org/apache/wicket/lambda/LambdasTest.java | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/673fd05d/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
index 3f95bb9..af36981 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.IComponentAwareHeaderContributor;
import org.apache.wicket.markup.parser.XmlTag.TagType;
import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
-import org.danekja.java.util.function.serializable.SerializableConsumer;
+import org.danekja.java.util.function.serializable.SerializableBiConsumer;
import org.danekja.java.util.function.serializable.SerializableFunction;
/**
@@ -277,7 +277,7 @@ public abstract class Behavior
* the {@code SerializableConsumer} that accepts the {@link ComponentTag}
* @return The created behavior
*/
- public static Behavior onTag(SerializableConsumer<ComponentTag> onTagConsumer)
+ public static Behavior onTag(SerializableBiConsumer<Component, ComponentTag> onTagConsumer)
{
Args.notNull(onTagConsumer, "onTagConsumer");
@@ -286,7 +286,7 @@ public abstract class Behavior
@Override
public void onComponentTag(Component component, ComponentTag tag)
{
- onTagConsumer.accept(tag);
+ onTagConsumer.accept(component, tag);
}
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/673fd05d/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 70a06f8..ac56282 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.lambda;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -285,9 +286,9 @@ public class Lambdas
* the {@code SerializableConsumer} that accepts the {@link ComponentTag}
* @return The created behavior
*
- * @see Behavior#onTag(SerializableConsumer)
+ * @see Behavior#onTag(SerializableBiConsumer)
*/
- public static Behavior onTag(SerializableConsumer<ComponentTag> onTagConsumer)
+ public static Behavior onTag(SerializableBiConsumer<Component, ComponentTag> onTagConsumer)
{
return Behavior.onTag(onTagConsumer);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/673fd05d/wicket-core/src/test/java/org/apache/wicket/lambda/LambdasTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/lambda/LambdasTest.java b/wicket-core/src/test/java/org/apache/wicket/lambda/LambdasTest.java
index c751438..594ced2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/lambda/LambdasTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/lambda/LambdasTest.java
@@ -40,7 +40,7 @@ public class LambdasTest extends WicketTestCase
page.add(component);
String value = "value";
String key = "key";
- component.add(onTag(tag -> tag.put(key, value)));
+ component.add(onTag((c, tag) -> tag.put(key, value)));
component.add(onAttribute("class", oldValue -> "zzz"));
tester.startPage(page);