From ec4d64a30856f73ff4bf4f90335257d0d374724a Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 3 Jan 2013 16:20:11 +0000 Subject: [PATCH] Adds missing parse param in example git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1428445 13f79535-47bb-0310-9956-ffa450edef68 --- .../validator/validators/EmailValidator.java | 1 + .../StringLengthFieldValidator.java | 59 ++++++++++--------- .../validator/validators/URLValidator.java | 27 ++++----- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java index d8604f650..86984e5be 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java @@ -60,6 +60,7 @@ package com.opensymphony.xwork2.validator.validators; * <!-- Field Validator Syntax with expressions --> * <field name="myEmail"> * <field-validator type="email"> + * <param name="parse">true</param>* * <param name="expression">${emailPattern}</param> <!-- will be evaluated as: String getEmailPattern() --> * <param name="caseSensitive">${emailCaseSensitive}</param> <!-- will be evaluated as: boolean getEmailCaseSensitive() --> * <param name="trim">${trimEmail}</param> <!-- will be evaluated as: boolean getTrimEmail() --> diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java index b632508aa..fb22b945f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java @@ -43,36 +43,37 @@ import com.opensymphony.xwork2.validator.ValidationException; * * 
  * 
- *      <validators>
- *           <!-- Plain Validator Syntax -->
- *           <validator type="stringlength">
- *                <param name="fieldName">myPurchaseCode</param>
- *                <param name="minLength">10</param>
- *                <param name="maxLength">10</param>
- *                <param name="trim">true</param>
- *                <message>Your purchase code needs to be 10 characters long</message>		
- *            </validator>
- * 
- *            <!-- Field Validator Syntax -->
- *            <field name="myPurchaseCode">
- *                <field-validator type="stringlength">
- *                     <param name="minLength">10</param>
- *                     <param name="maxLength">10</param>
- *                     <param name="trim">true</param>
- *                     <message>Your purchase code needs to be 10 characters long</message>
- *                </field-validator>
- *            </field>
+ * <validators>
+ *     <!-- Plain Validator Syntax -->
+ *     <validator type="stringlength">
+ *         <param name="fieldName">myPurchaseCode</param>
+ *         <param name="minLength">10</param>
+ *         <param name="maxLength">10</param>
+ *         <param name="trim">true</param>
+ *         <message>Your purchase code needs to be 10 characters long</message>
+ *     </validator>
  *
- *            <!-- Field Validator Syntax with expression -->
- *            <field name="myPurchaseCode">
- *                <field-validator type="stringlength">
- *                     <param name="minLength">${minLengthValue}</param> <!-- will be evaluated as: Integer getMinLengthValue() -->
- *                     <param name="maxLength">${maxLengthValue}</param> <!-- will be evaluated as: Integer getMaxLengthValue() -->
- *                     <param name="trim">${trimValue}</param> <!-- will be evaluated as: boolean getTrimValue() -->
- *                     <message>Your purchase code needs to be 10 characters long</message>
- *                </field-validator>
- *            </field>
- *      </validators>
+ *     <!-- Field Validator Syntax -->
+ *     <field name="myPurchaseCode">
+ *         <field-validator type="stringlength">
+ *              <param name="minLength">10</param>
+ *              <param name="maxLength">10</param>
+ *              <param name="trim">true</param>
+ *              <message>Your purchase code needs to be 10 characters long</message>
+ *         </field-validator>
+ *     </field>
+ *
+ *     <!-- Field Validator Syntax with expression -->
+ *     <field name="myPurchaseCode">
+ *         <field-validator type="stringlength">
+ *              <param name="parse">true</param>
+ *              <param name="minLength">${minLengthValue}</param> <!-- will be evaluated as: Integer getMinLengthValue() -->
+ *              <param name="maxLength">${maxLengthValue}</param> <!-- will be evaluated as: Integer getMaxLengthValue() -->
+ *              <param name="trim">${trimValue}</param> <!-- will be evaluated as: boolean getTrimValue() -->
+ *              <message>Your purchase code needs to be 10 characters long</message>
+ *         </field-validator>
+ *     </field>
+ * </validators>
  * 
  *
* diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java index fe679995d..b4a128795 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java @@ -18,7 +18,6 @@ package com.opensymphony.xwork2.validator.validators; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.util.URLUtil; - /** * * @@ -40,20 +39,20 @@ import com.opensymphony.xwork2.util.URLUtil; * * 
  * 
- * 
- *     <validators>
- *          <!-- Plain Validator Syntax -->
- *          <validator type="url">
- *              <param name="fieldName">myHomePage</param>
+ * <validators>
+ *      <!-- Plain Validator Syntax -->
+ *      <validator type="url">
+ *          <param name="fieldName">myHomePage</param>
+ *          <message>Invalid homepage url</message>
+ *      </validator>
+ *
+ *      <!-- Field Validator Syntax -->
+ *      <field name="myHomepage">
+ *          <field-validator type="url">
  *              <message>Invalid homepage url</message>
- *          </validator>
- *          
- *          <!-- Field Validator Syntax -->
- *          <field name="myHomepage">
- *              <message>Invalid homepage url</message>
- *          </field>
- *     </validators>
- *     
+ *          </field-validator>
+ *      </field>
+ * </validators>
  * 
  *
*