You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/01/10 19:18:39 UTC
svn commit: r1431540 -
/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
Author: lukaszlenart
Date: Thu Jan 10 18:18:39 2013
New Revision: 1431540
URL: http://svn.apache.org/viewvc?rev=1431540&view=rev
Log:
Adds missing documentation section
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java?rev=1431540&r1=1431539&r2=1431540&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java (original)
+++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java Thu Jan 10 18:18:39 2013
@@ -3,24 +3,32 @@ package com.opensymphony.xwork2.validato
import com.opensymphony.xwork2.validator.ValidationException;
/**
- * <code>ConditionalVisitorFieldValidator</code>
+ * <!-- START SNIPPET: javadoc -->
+ * The ConditionalVisitorFieldValidator will forward validation to the VisitorFieldValidator
+ * only if the expression will evaluate to true.
+ * <!-- END SNIPPET: javadoc -->
*
+ * <!-- START SNIPPET: parameters -->
+ * <ul>
+ * <li>expression - an OGNL expression which should evaluate to true to pass validation to the VisitorFieldValidator</li>
+ * </ul>
+ * <!-- END SNIPPET: parameters -->
*
+ * <pre>
+ * <!-- START SNIPPET: example -->
* <field name="colleaguePosition">
- * <field-validator type="fieldexpression" short-circuit="true">
- * reason == 'colleague' and colleaguePositionID == '_CHOOSE_'
- * <message>You must choose a position where you worked with this person,
- * or choose "Other..."</message>
- * </field-validator>
- * <field-validator type="conditionalvisitor">
- * reason == 'colleague' and colleaguePositionID == 'OTHER'
- * <message/>
- * </field-validator>
+ * <field-validator type="conditionalvisitor">
+ * <param name="expression">reason == 'colleague' and colleaguePositionID == 'OTHER'</param>
+ * <message>You must select reason Colleague and position Other</message>
+ * </field-validator>
* </field>
+ * <!-- END SNIPPET: example -->
+ * </pre>
*
* @author Matt Raible
*/
public class ConditionalVisitorFieldValidator extends VisitorFieldValidator {
+
private String expression;
public void setExpression(String expression) {
@@ -58,11 +66,9 @@ public class ConditionalVisitorFieldVali
try {
obj = getFieldValue(expression, object);
- }
- catch (ValidationException e) {
+ } catch (ValidationException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
// let this pass, but it will be logged right below
}
@@ -74,4 +80,5 @@ public class ConditionalVisitorFieldVali
return answer;
}
+
}
\ No newline at end of file