Author: lukaszlenart
Date: Wed Jun 12 19:57:40 2013
New Revision: 1492402
URL: http://svn.apache.org/r1492402
Log:
WW-4097 Updates JavaDoc to match current implementations
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java?rev=1492402&r1=1492401&r2=1492402&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
Wed Jun 12 19:57:40 2013
@@ -85,11 +85,35 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'> Date property. The minimum the date must be.
</td>
* </tr>
* <tr>
+ * <td class='confluenceTd'>minExpression</td>
+ * <td class='confluenceTd'>no</td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the minimum the
date must be.</td>
+ * </tr>
+ * <tr>
* <td class='confluenceTd'> max </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
* <td class='confluenceTd'> Date property. The maximum date can be. </td>
* </tr>
+ * <tr>
+ * <td class='confluenceTd'>maxExpression</td>
+ * <td class='confluenceTd'>no</td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the maximum date
can be.</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'>maxExpression</td>
+ * <td class='confluenceTd'>no</td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the maximum date
can be.</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'>dateFormat</td>
+ * <td class='confluenceTd'>no</td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>Format used to parse min/max value.</td>
+ * </tr>
* </table>
*
* <p>If neither <em>min</em> nor <em>max</em> is set, nothing will be
done.</p>
@@ -131,7 +155,7 @@ public @interface DateRangeFieldValidato
String maxExpression() default "";
/**
- * Date format used to parse min and mac value
+ * Date format used to parse min and max value
*/
String dateFormat() default "";
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java?rev=1492402&r1=1492401&r2=1492402&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
Wed Jun 12 19:57:40 2013
@@ -86,23 +86,47 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'> Double property. The inclusive minimum the
number must be. </td>
* </tr>
* <tr>
+ * <td class='confluenceTd'>minInclusiveExpression</td>
+ * <td class='confluenceTd'>no</td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the inclusive
minimum the number must be. </td>
+ * </tr>
+ * <tr>
* <td class='confluenceTd'> maxInclusive </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
* <td class='confluenceTd'> Double property. The inclusive maximum number
can be. </td>
* </tr>
* <tr>
+ * <td class='confluenceTd'> maxInclusiveExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the inclusive
maximum number can be. </td>
+ * </tr>
+ * <tr>
* <td class='confluenceTd'> minExclusive </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
* <td class='confluenceTd'> Double property. The exclusive minimum the
number must be. </td>
* </tr>
* <tr>
+ * <td class='confluenceTd'> minExclusiveExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the exclusive
minimum the number must be. </td>
+ * </tr>
+ * <tr>
* <td class='confluenceTd'> maxExclusive </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
* <td class='confluenceTd'> Double property. The exclusive maximum number
can be. </td>
* </tr>
+ * <tr>
+ * <td class='confluenceTd'> maxExclusiveExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the exclusive
maximum number can be. </td>
+ * </tr>
* </table>
*
* <p>If neither <em>min</em> nor <em>max</em> is set, nothing will be
done.</p>
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java?rev=1492402&r1=1492401&r2=1492402&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
Wed Jun 12 19:57:40 2013
@@ -83,13 +83,25 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'> min </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
- * <td class='confluenceTd'> Integer property. The minimum the number must be.
Can be an expression. Don't use ${min} as this can turn into infinitive
loop!</td>
+ * <td class='confluenceTd'> Integer property. The minimum the number must
be.</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'> minExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the minimum the
number must be.</td>
* </tr>
* <tr>
* <td class='confluenceTd'> max </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
- * <td class='confluenceTd'> Integer property. The maximum number can be. Can
be an expression. Don't use ${max} as this can turn into infinitive loop!</td>
+ * <td class='confluenceTd'> Integer property. The maximum number can be. Can
be an expression.!</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'> maxExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the maximum number
can be.</td>
* </tr>
* <tr>
* <td class='confluenceTd'>parse</td>
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java?rev=1492402&r1=1492401&r2=1492402&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
Wed Jun 12 19:57:40 2013
@@ -83,13 +83,25 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'> min </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
- * <td class='confluenceTd'> Short property. The minimum the number must be.
Can be an expression. Don't use ${min} as this can turn into infinitive
loop!</td>
+ * <td class='confluenceTd'> Short property. The minimum the number must
be.</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'> minExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the minimum the
number must be.</td>
* </tr>
* <tr>
* <td class='confluenceTd'> max </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
- * <td class='confluenceTd'> Short property. The maximum number can be. Can be
an expression. Don't use ${max} as this can turn into infinitive loop!</td>
+ * <td class='confluenceTd'> Short property. The maximum number can be.</td>
+ * </tr>
+ * <tr>
+ * <td class='confluenceTd'> maxExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the maximum number
can be.</td>
* </tr>
* <tr>
* <td class='confluenceTd'>parse</td>
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java?rev=1492402&r1=1492401&r2=1492402&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
Wed Jun 12 19:57:40 2013
@@ -92,11 +92,23 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'> Integer property. The minimum length the String
must be. </td>
* </tr>
* <tr>
+ * <td class='confluenceTd'> minLengthExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the minimum length
the String must be. </td>
+ * </tr>
+ * <tr>
* <td class='confluenceTd'> maxLength </td>
* <td class='confluenceTd'> no </td>
* <td class='confluenceTd'> </td>
* <td class='confluenceTd'> Integer property. The maximum length the String
can be. </td>
* </tr>
+ * <tr>
+ * <td class='confluenceTd'> maxLengthExpression </td>
+ * <td class='confluenceTd'> no </td>
+ * <td class='confluenceTd'> </td>
+ * <td class='confluenceTd'>OGNL expression used to obtain the maximum length
the String can be. </td>
+ * </tr>
* </table>
*
* <p>If neither <em>minLength</em> nor <em>maxLength</em> is set, nothing
will be done.</p>
