Author: niallp
Date: Fri Mar 3 08:31:45 2006
New Revision: 382882
URL: http://svn.apache.org/viewcvs?rev=382882&view=rev
Log:
Add email, url and mask validation to the type form
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/MessageResources.properties
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/TypeForm.java
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/validation.xml
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/validator/type.jsp
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/MessageResources.properties
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/MessageResources.properties?rev=382882&r1=382881&r2=382882&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/MessageResources.properties
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/MessageResources.properties
Fri Mar 3 08:31:45 2006
@@ -31,6 +31,7 @@
errors.creditcard={0} is not a valid credit card number.
errors.email={0} is an invalid e-mail address.
+errors.url={0} is an invalid url.
# Index Page
index.title=Struts Validator
@@ -70,6 +71,9 @@
typeForm.float.displayname=Float Field
typeForm.floatRange.displayname=Float Range Field
typeForm.integer.displayname=Integer Field
+typeForm.mask.displayname=Mask Field
+typeForm.email.displayname=Email Field
+typeForm.url.displayname=URL Field
typeForm.long.displayname=Long Field
typeForm.nested.name.displayname=Name
typeForm.nested=Nested Text
@@ -81,6 +85,7 @@
typeForm.short.displayname=Short Field
typeForm.title.create=Type Form
typeForm.title=Type Form
+typeForm.mask.error={0} Must only contain upper case alpahabetic letters (i.e.
A-Z)
# JavaScript Type Form
jsTypeForm.title=JavaScript Type Form
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/TypeForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/TypeForm.java?rev=382882&r1=382881&r2=382882&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/TypeForm.java
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/src/examples/org/apache/struts/webapp/validator/TypeForm.java
Fri Mar 3 08:31:45 2006
@@ -49,6 +49,9 @@
private String sOverallSatisfaction = null;
private String sWouldRecommend = null;
private String[] sUsedLanguages = null;
+ private String mask = null;
+ private String email = null;
+ private String url = null;
private List lNames = initNames();
@@ -146,6 +149,30 @@
public void setCreditCard(String sCreditCard) {
this.sCreditCard = sCreditCard;
+ }
+
+ public String getMask() {
+ return mask;
+ }
+
+ public void setMask(String mask) {
+ this.mask = mask;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
}
public String getSatisfaction() {
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/validation.xml
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/validation.xml?rev=382882&r1=382881&r2=382882&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/validation.xml
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/validation.xml
Fri Mar 3 08:31:45 2006
@@ -187,6 +187,20 @@
<field property="creditCard" depends="required,creditCard">
<arg key="typeForm.creditCard.displayname" />
</field>
+ <field property="email" depends="required,email">
+ <arg key="typeForm.email.displayname" />
+ </field>
+ <field property="url" depends="required,url">
+ <arg key="typeForm.url.displayname" />
+ </field>
+ <field property="mask" depends="required,mask">
+ <arg key="typeForm.mask.displayname" />
+ <msg name="mask" key="typeForm.mask.error" />
+ <var>
+ <var-name>mask</var-name>
+ <var-value>^[A-Z]*$</var-value>
+ </var>
+ </field>
<field property="value" indexedListProperty="nameList"
depends="required">
<arg key="typeForm.nested.name.displayname" />
</field>
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/validator/type.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/web/examples/validator/type.jsp?rev=382882&r1=382881&r2=382882&view=diff
==============================================================================
--- struts/action/branches/STRUTS_1_2_BRANCH/web/examples/validator/type.jsp
(original)
+++ struts/action/branches/STRUTS_1_2_BRANCH/web/examples/validator/type.jsp
Fri Mar 3 08:31:45 2006
@@ -55,6 +55,21 @@
<bean:write name="error" />
</li>
</html:messages>
+ <html:messages id="error" property="mask">
+ <li>
+ <bean:write name="error" />
+ </li>
+ </html:messages>
+ <html:messages id="error" property="email">
+ <li>
+ <bean:write name="error" />
+ </li>
+ </html:messages>
+ <html:messages id="error" property="url">
+ <li>
+ <bean:write name="error" />
+ </li>
+ </html:messages>
</ul>
<hr />
</logic:messagesPresent>
@@ -131,6 +146,30 @@
</th>
<td align="left">
<html:text property="creditCard" size="16" maxlength="16" />(e.g.
4111111111111111, 5500000000000004)</td>
+ </tr>
+ <tr>
+ <th align="left">
+ <bean:message key="typeForm.mask.displayname" />
+ </th>
+ <td align="left">
+ <html:text property="mask" size="15" maxlength="15" />
+ </td>
+ </tr>
+ <tr>
+ <th align="left">
+ <bean:message key="typeForm.email.displayname" />
+ </th>
+ <td align="left">
+ <html:text property="email" size="15"/>
+ </td>
+ </tr>
+ <tr>
+ <th align="left">
+ <bean:message key="typeForm.url.displayname" />
+ </th>
+ <td align="left">
+ <html:text property="url" size="15" />
+ </td>
</tr>
<tr>
<th align="left">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
