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 2017/05/24 19:21:30 UTC
[2/2] wicket git commit: Rename the method types 'T' to 'R' so that
they are not confused with the class type 'T'
Rename the method types 'T' to 'R' so that they are not confused with the class type 'T'
Some new setting in Intellij IDEA started rendering those as errors. Javac has no problem with the duplicated names
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/05545b42
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05545b42
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05545b42
Branch: refs/heads/master
Commit: 05545b42f4f1e6feede423447479c925bff9146e
Parents: 276c16b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 24 21:11:11 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 24 21:16:50 2017 +0200
----------------------------------------------------------------------
.../org/apache/wicket/model/LambdaModel.java | 38 ++++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/05545b42/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java b/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
index b71b1cf..d464b81 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
@@ -63,10 +63,10 @@ public abstract class LambdaModel<T> implements IModel<T>
* used to get value
* @return model
*
- * @param <T>
+ * @param <R>
* model object type
*/
- public static <T> IModel<T> of(SerializableSupplier<T> getter)
+ public static <R> IModel<R> of(SerializableSupplier<R> getter)
{
return getter::get;
}
@@ -86,28 +86,28 @@ public abstract class LambdaModel<T> implements IModel<T>
* used to set value
* @return model
*
- * @param <T>
+ * @param <R>
* model object type
*/
- public static <T> IModel<T> of(SerializableSupplier<T> getter, SerializableConsumer<T> setter)
+ public static <R> IModel<R> of(SerializableSupplier<R> getter, SerializableConsumer<R> setter)
{
Args.notNull(getter, "getter");
Args.notNull(setter, "setter");
- return new LambdaModel<T>()
+ return new LambdaModel<R>()
{
private static final long serialVersionUID = 1L;
@Override
- public T getObject()
+ public R getObject()
{
return getter.get();
}
@Override
- public void setObject(T t)
+ public void setObject(R r)
{
- setter.accept(t);
+ setter.accept(r);
}
};
}
@@ -130,22 +130,22 @@ public abstract class LambdaModel<T> implements IModel<T>
* used to get a value
* @param <X>
* target model object type
- * @param <T>
+ * @param <R>
* model object type
*
* @return model
*/
- public static <X, T> IModel<T> of(IModel<X> target, SerializableFunction<X, T> getter)
+ public static <X, R> IModel<R> of(IModel<X> target, SerializableFunction<X, R> getter)
{
Args.notNull(target, "target");
Args.notNull(getter, "getter");
- return new LambdaModel<T>()
+ return new LambdaModel<R>()
{
private static final long serialVersionUID = 1L;
@Override
- public T getObject()
+ public R getObject()
{
X x = target.getObject();
if (x == null)
@@ -183,24 +183,24 @@ public abstract class LambdaModel<T> implements IModel<T>
*
* @param <X>
* target model object type
- * @param <T>
+ * @param <R>
* model object type
*
* @return model
*/
- public static <X, T> IModel<T> of(IModel<X> target, SerializableFunction<X, T> getter,
- SerializableBiConsumer<X, T> setter)
+ public static <X, R> IModel<R> of(IModel<X> target, SerializableFunction<X, R> getter,
+ SerializableBiConsumer<X, R> setter)
{
Args.notNull(target, "target");
Args.notNull(getter, "getter");
Args.notNull(setter, "setter");
- return new LambdaModel<T>()
+ return new LambdaModel<R>()
{
private static final long serialVersionUID = 1L;
@Override
- public T getObject()
+ public R getObject()
{
X x = target.getObject();
if (x == null)
@@ -211,12 +211,12 @@ public abstract class LambdaModel<T> implements IModel<T>
}
@Override
- public void setObject(T t)
+ public void setObject(R r)
{
X x = target.getObject();
if (x != null)
{
- setter.accept(x, t);
+ setter.accept(x, r);
}
}