rleland 2002/10/11 12:13:42
Modified: web/validator jsType.jsp type.jsp
web/validator/WEB-INF validation.xml
Log:
Add example of using
add intRange & floatRange validation
Revision Changes Path
1.2 +10 -1 jakarta-struts/web/validator/jsType.jsp
Index: jsType.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/jsType.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsType.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ jsType.jsp 11 Oct 2002 19:13:42 -0000 1.2
@@ -66,6 +66,15 @@
<html:text property="float" size="15" maxlength="15"/>
</td>
</tr>
+
+ <tr>
+ <th align="left">
+ <bean:message key="typeForm.floatRange.displayname"/>
+ </th>
+ <td align="left">
+ <html:text property="floatRange" size="15" maxlength="15"/>
+ </td>
+ </tr>
<%--
<tr>
<th align="left">
@@ -104,7 +113,7 @@
<html:cancel onclick="bCancel=true;">
<bean:message key="button.cancel"/>
- </html:cancel>
+ </html:cancel>
</td>
</tr>
</table>
1.3 +12 -1 jakarta-struts/web/validator/type.jsp
Index: type.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/type.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- type.jsp 19 Mar 2002 06:49:17 -0000 1.2
+++ type.jsp 11 Oct 2002 19:13:42 -0000 1.3
@@ -29,6 +29,9 @@
<html:messages id="error" property="float">
<li><bean:write name="error"/></li>
</html:messages>
+ <html:messages id="error" property="floatRange">
+ <li><bean:write name="error"/></li>
+ </html:messages>
<html:messages id="error" property="double">
<li><bean:write name="error"/></li>
</html:messages>
@@ -88,6 +91,14 @@
</tr>
<tr>
<th align="left">
+ <bean:message key="typeForm.floatRange.displayname"/>
+ </th>
+ <td align="left">
+ <html:text property="floatRange" size="15" maxlength="15"/>
+ </td>
+ </tr>
+ <tr>
+ <th align="left">
<bean:message key="typeForm.double.displayname"/>
</th>
<td align="left">
@@ -150,7 +161,7 @@
<html:cancel>
<bean:message key="button.cancel"/>
- </html:cancel>
+ </html:cancel>
</td>
</tr>
</table>
1.3 +82 -54 jakarta-struts/web/validator/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/WEB-INF/validation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validation.xml 19 Mar 2002 06:49:17 -0000 1.2
+++ validation.xml 11 Oct 2002 19:13:42 -0000 1.3
@@ -3,18 +3,18 @@
<constant>
<constant-name>phone</constant-name>
<constant-value>^\(?(\d{3})\)?[-| ]?(\d{3})[-| ]?(\d{4})$</constant-value>
- </constant>
+ </constant>
<constant>
<constant-name>zip</constant-name>
<constant-value>^\d{5}\d*$</constant-value>
- </constant>
+ </constant>
</global>
<formset>
<constant>
<constant-name>zip</constant-name>
<constant-value>^\d{5}(-\d{4})?$</constant-value>
- </constant>
-
+ </constant>
+
<form name="registrationForm">
<field property="firstName"
depends="required,mask,minlength">
@@ -28,7 +28,7 @@
<var-name>minlength</var-name>
<var-value>5</var-value>
</var>
- </field>
+ </field>
<field property="lastName"
depends="required,mask,maxlength">
<msg name="mask" key="registrationForm.lastname.maskmsg"/>
@@ -37,7 +37,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
<var>
<var-name>maxlength</var-name>
<var-value>10</var-value>
@@ -53,7 +53,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.stateProv"
depends="required,mask">
@@ -61,7 +61,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.zipPostal[1]"
depends="required,mask">
@@ -69,7 +69,7 @@
<var>
<var-name>mask</var-name>
<var-value>${zip}</var-value>
- </var>
+ </var>
</field>
<field property="phone"
depends="mask">
@@ -77,7 +77,7 @@
<var>
<var-name>mask</var-name>
<var-value>${phone}</var-value>
- </var>
+ </var>
</field>
<field property="email"
depends="required,email">
@@ -92,7 +92,7 @@
<var>
<var-name>mask</var-name>
<var-value>^\w+$</var-value>
- </var>
+ </var>
</field>
<field property="lastName"
depends="required,mask"
@@ -102,7 +102,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="addr"
depends="required"
@@ -116,7 +116,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.stateProv"
depends="required,mask"
@@ -125,7 +125,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.zipPostal[1]"
depends="required,mask"
@@ -134,7 +134,7 @@
<var>
<var-name>mask</var-name>
<var-value>${zip}</var-value>
- </var>
+ </var>
</field>
<field property="phone"
depends="mask"
@@ -143,7 +143,7 @@
<var>
<var-name>mask</var-name>
<var-value>${phone}</var-value>
- </var>
+ </var>
</field>
<field property="email"
depends="required,email"
@@ -161,18 +161,18 @@
<arg0 key="typeForm.short.displayname"/>
</field>
<field property="integer"
- depends="required,integer,range">
+ depends="required,integer,intRange">
<arg0 key="typeForm.integer.displayname"/>
- <arg1 name="range" key="${var:min}" resource="false"/>
- <arg2 name="range" key="${var:max}" resource="false"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
<var>
<var-name>min</var-name>
<var-value>10</var-value>
- </var>
+ </var>
<var>
<var-name>max</var-name>
<var-value>20</var-value>
- </var>
+ </var>
</field>
<field property="long"
depends="required,long">
@@ -182,6 +182,20 @@
depends="required,float">
<arg0 key="typeForm.float.displayname"/>
</field>
+ <field property="floatRange"
+ depends="required,float,floatRange">
+ <arg0 key="typeForm.floatRange.displayname"/>
+ <arg1 name="floatRange" key="${var:min}" resource="false"/>
+ <arg2 name="floatRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>-2.17</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>3.14</var-value>
+ </var>
+ </field>
<field property="double"
depends="required,double">
<arg0 key="typeForm.double.displayname"/>
@@ -192,7 +206,7 @@
<var>
<var-name>datePatternStrict</var-name>
<var-value>MM/dd/yyyy</var-value>
- </var>
+ </var>
</field>
<field property="creditCard"
depends="required,creditCard">
@@ -202,7 +216,7 @@
indexedListProperty="nameList"
depends="required">
<arg0 key="typeForm.nested.name.displayname"/>
- </field>
+ </field>
</form>
<form name="jsTypeForm">
<field property="byte"
@@ -214,30 +228,44 @@
<arg0 key="typeForm.short.displayname"/>
</field>
<field property="integer"
- depends="required,integer,range">
+ depends="required,integer,intRange">
<arg0 key="typeForm.integer.displayname"/>
- <arg1 name="range" key="${var:min}" resource="false"/>
- <arg2 name="range" key="${var:max}" resource="false"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
<var>
<var-name>min</var-name>
<var-value>10</var-value>
- </var>
+ </var>
<var>
<var-name>max</var-name>
<var-value>20</var-value>
- </var>
+ </var>
</field>
<field property="float"
depends="required,float">
<arg0 key="typeForm.float.displayname"/>
</field>
+ <field property="floatRange"
+ depends="required,float,floatRange">
+ <arg0 key="typeForm.floatRange.displayname"/>
+ <arg1 name="floatRange" key="${var:min}" resource="false"/>
+ <arg2 name="floatRange" key="${var:max}" resource="false"/>
+ <var>
+ <var-name>min</var-name>
+ <var-value>-2.17</var-value>
+ </var>
+ <var>
+ <var-name>max</var-name>
+ <var-value>3.14</var-value>
+ </var>
+ </field>
<field property="date"
depends="required,date">
<arg0 key="typeForm.date.displayname"/>
<var>
<var-name>datePatternStrict</var-name>
<var-value>MM/dd/yyyy</var-value>
- </var>
+ </var>
</field>
<field property="creditCard"
depends="required,creditCard">
@@ -254,7 +282,7 @@
<var>
<var-name>mask</var-name>
<var-value>^\w+$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.stateProv">
<arg0 key="registrationForm.stateprov.displayname"/>
@@ -271,7 +299,7 @@
<var>
<var-name>mask</var-name>
<var-value>^\w+$</var-value>
- </var>
+ </var>
</field>
<field property="lastName"
depends="required,mask"
@@ -281,7 +309,7 @@
<var>
<var-name>mask</var-name>
<var-value>^\w+$</var-value>
- </var>
+ </var>
</field>
<field property="addr"
depends="required"
@@ -295,7 +323,7 @@
<var>
<var-name>mask</var-name>
<var-value>^[a-zA-Z]*$</var-value>
- </var>
+ </var>
</field>
<field property="cityStateZip.stateProv"
page="2">
@@ -308,7 +336,7 @@
<var>
<var-name>mask</var-name>
<var-value>${zip}</var-value>
- </var>
+ </var>
</field>
<field property="phone"
page="2">
@@ -322,18 +350,18 @@
</form>
<form name="typeForm">
<field property="integer"
- depends="required,integer,range">
+ depends="required,integer,intRange">
<arg0 key="typeForm.integer.displayname"/>
- <arg1 name="range" key="${var:min}" resource="false"/>
- <arg2 name="range" key="${var:max}" resource="false"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
<var>
<var-name>min</var-name>
<var-value>50</var-value>
- </var>
+ </var>
<var>
<var-name>max</var-name>
<var-value>60</var-value>
- </var>
+ </var>
</field>
<field property="date"
depends="required,date">
@@ -341,23 +369,23 @@
<var>
<var-name>datePatternStrict</var-name>
<var-value>dd.MM.yyyy</var-value>
- </var>
+ </var>
</field>
</form>
<form name="jsTypeForm">
<field property="integer"
- depends="required,integer,range">
+ depends="required,integer,intRange">
<arg0 key="typeForm.integer.displayname"/>
- <arg1 name="range" key="${var:min}" resource="false"/>
- <arg2 name="range" key="${var:max}" resource="false"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
<var>
<var-name>min</var-name>
<var-value>50</var-value>
- </var>
+ </var>
<var>
<var-name>max</var-name>
<var-value>60</var-value>
- </var>
+ </var>
</field>
<field property="date"
depends="required,date">
@@ -365,25 +393,25 @@
<var>
<var-name>datePatternStrict</var-name>
<var-value>dd.MM.yyyy</var-value>
- </var>
+ </var>
</field>
</form>
- </formset>
+ </formset>
<formset language="fr" country="CA">
<form name="jsTypeForm">
<field property="integer"
- depends="required,integer,range">
+ depends="required,integer,intRange">
<arg0 key="typeForm.integer.displayname"/>
- <arg1 name="range" key="${var:min}" resource="false"/>
- <arg2 name="range" key="${var:max}" resource="false"/>
+ <arg1 name="intRange" key="${var:min}" resource="false"/>
+ <arg2 name="intRange" key="${var:max}" resource="false"/>
<var>
<var-name>min</var-name>
<var-value>100</var-value>
- </var>
+ </var>
<var>
<var-name>max</var-name>
<var-value>200</var-value>
- </var>
+ </var>
</field>
<field property="date"
depends="required,date">
@@ -391,8 +419,8 @@
<var>
<var-name>datePatternStrict</var-name>
<var-value>dd-MM-yyyy</var-value>
- </var>
+ </var>
</field>
</form>
- </formset>
+ </formset>
</form-validation>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
