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 2013/05/27 19:57:30 UTC
git commit: WICKET-5182 Incorrect signature of types which extend
Comparable
Updated Branches:
refs/heads/master 9e6efa619 -> 69042ca51
WICKET-5182 Incorrect signature of types which extend Comparable
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/69042ca5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/69042ca5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/69042ca5
Branch: refs/heads/master
Commit: 69042ca514124d60440980cf96d2d93fc6259be5
Parents: 9e6efa6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 27 20:56:22 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 27 20:56:22 2013 +0300
----------------------------------------------------------------------
.../validator/AbstractRangeValidator.java | 2 +-
.../validation/validator/RangeValidator.java | 2 +-
.../validation/validator/StringValidator.java | 4 ++--
.../java/org/apache/wicket/util/lang/Args.java | 2 +-
.../java/org/apache/wicket/util/lang/Checks.java | 6 ++----
5 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/69042ca5/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractRangeValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractRangeValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractRangeValidator.java
index 73b0819..c954368 100644
--- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractRangeValidator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractRangeValidator.java
@@ -58,7 +58,7 @@ import org.apache.wicket.validation.ValidationError;
*
* @author igor
*/
-public abstract class AbstractRangeValidator<R extends Comparable<R> & Serializable, V extends Serializable>
+public abstract class AbstractRangeValidator<R extends Comparable<? super R> & Serializable, V extends Serializable>
extends Behavior implements IValidator<V>
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/69042ca5/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
index 5ef9547..3f8d594 100644
--- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
@@ -54,7 +54,7 @@ import org.apache.wicket.validation.ValidationError;
*
* @author igor
*/
-public class RangeValidator<Z extends Comparable<Z> & Serializable> extends
+public class RangeValidator<Z extends Comparable<? super Z> & Serializable> extends
AbstractRangeValidator<Z, Z>
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/69042ca5/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
index 273b112..5f7dd6d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
@@ -52,7 +52,7 @@ import org.apache.wicket.validation.ValidationError;
* {@code FormComponent.labelModel} or resource key {@code <form-id>.<form-component-id>}</li>
* <li>{@code input}: the input value</li>
* <li>{@code length}: the length of the entered</li>
- * <li>{@code minimum}: the minimum alloed length</li>
+ * <li>{@code minimum}: the minimum allowed length</li>
* <li>{@code maximum}: the maximum allowed length</li>
* </ul>
* </p>
@@ -67,7 +67,7 @@ public class StringValidator extends AbstractRangeValidator<Integer, String>
* Constructor that sets the minimum and maximum length values.
*
* @param minimum
- * the minimum lenghh
+ * the minimum length
* @param maximum
* the maximum length
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/69042ca5/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
index f64900d..5f8ee7d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
@@ -110,7 +110,7 @@ public class Args
* @param name
* @throws IllegalArgumentException
*/
- public static <T extends Comparable<T>> T withinRange(final T min, final T max,
+ public static <T extends Comparable<? super T>> T withinRange(final T min, final T max,
final T value, final String name)
{
notNull(min, name);
http://git-wip-us.apache.org/repos/asf/wicket/blob/69042ca5/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
index 9591640..6dd414d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
@@ -45,7 +45,6 @@ public class Checks
* @param argument
* @param message
* @param params
- * @param name
* @throws IllegalStateException
*/
public static void notEmpty(final String argument, final String message, final Object... params)
@@ -64,10 +63,9 @@ public class Checks
* @param max
* @param value
* @param message
- * @param name
* @throws IllegalStateException
*/
- public static <T extends Comparable<T>> void withinRange(final T min, final T max,
+ public static <T extends Comparable<? super T>> void withinRange(final T min, final T max,
final T value, final String message)
{
notNull(min, message);
@@ -113,7 +111,7 @@ public class Checks
* @param name
* @throws IllegalStateException
*/
- public static <T extends Comparable<T>> void withinRangeShort(final T min, final T max,
+ public static <T extends Comparable<? super T>> void withinRangeShort(final T min, final T max,
final T value, final String name)
{
withinRange(min, max, value,