diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java index c6b81b70f..d6457d547 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java @@ -85,11 +85,35 @@ import java.lang.annotation.Target; * Date property. The minimum the date must be. * * + * minExpression + * no + *   + * OGNL expression used to obtain the minimum the date must be. + * + * * max * no *   * Date property. The maximum date can be. * + * + * maxExpression + * no + *   + * OGNL expression used to obtain the maximum date can be. + * + * + * maxExpression + * no + *   + * OGNL expression used to obtain the maximum date can be. + * + * + * dateFormat + * no + *   + * Format used to parse min/max value. + * * * *

If neither min nor max is set, nothing will be done.

@@ -131,7 +155,7 @@ public @interface DateRangeFieldValidator { String maxExpression() default ""; /** - * Date format used to parse min and mac value + * Date format used to parse min and max value */ String dateFormat() default ""; diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java index 1c8506a8d..5eb304945 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java @@ -86,23 +86,47 @@ import java.lang.annotation.Target; * Double property. The inclusive minimum the number must be. * * + * minInclusiveExpression + * no + *   + * OGNL expression used to obtain the inclusive minimum the number must be. + * + * * maxInclusive * no *   * Double property. The inclusive maximum number can be. * * + * maxInclusiveExpression + * no + *   + * OGNL expression used to obtain the inclusive maximum number can be. + * + * * minExclusive * no *   * Double property. The exclusive minimum the number must be. * * + * minExclusiveExpression + * no + *   + * OGNL expression used to obtain the exclusive minimum the number must be. + * + * * maxExclusive * no *   * Double property. The exclusive maximum number can be. * + * + * maxExclusiveExpression + * no + *   + * OGNL expression used to obtain the exclusive maximum number can be. + * * * *

If neither min nor max is set, nothing will be done.

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java index 7055076e6..cba539eda 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java @@ -83,13 +83,25 @@ import java.lang.annotation.Target; * min * no *   - * Integer property. The minimum the number must be. Can be an expression. Don't use ${min} as this can turn into infinitive loop! + * Integer property. The minimum the number must be. + * + * + * minExpression + * no + *   + * OGNL expression used to obtain the minimum the number must be. * * * max * no *   - * Integer property. The maximum number can be. Can be an expression. Don't use ${max} as this can turn into infinitive loop! + * Integer property. The maximum number can be. Can be an expression.! + * + * + * maxExpression + * no + *   + * OGNL expression used to obtain the maximum number can be. * * * parse diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java index 0c592547d..dfe57ae94 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java @@ -83,13 +83,25 @@ import java.lang.annotation.Target; * min * no *   - * Short property. The minimum the number must be. Can be an expression. Don't use ${min} as this can turn into infinitive loop! + * Short property. The minimum the number must be. + * + * + * minExpression + * no + *   + * OGNL expression used to obtain the minimum the number must be. * * * max * no *   - * Short property. The maximum number can be. Can be an expression. Don't use ${max} as this can turn into infinitive loop! + * Short property. The maximum number can be. + * + * + * maxExpression + * no + *   + * OGNL expression used to obtain the maximum number can be. * * * parse diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java index 78bf204fe..6db61751f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java @@ -92,11 +92,23 @@ import java.lang.annotation.Target; * Integer property. The minimum length the String must be. * * + * minLengthExpression + * no + *   + * OGNL expression used to obtain the minimum length the String must be. + * + * * maxLength * no *   * Integer property. The maximum length the String can be. * + * + * maxLengthExpression + * no + *   + * OGNL expression used to obtain the maximum length the String can be. + * * * *

If neither minLength nor maxLength is set, nothing will be done.