dwinterfeldt 02/03/18 22:49:18
Modified: src/validator/org/apache/struts/webapp/validator
ApplicationResources.properties
ApplicationResources_fr.properties TypeForm.java
web/validator type.jsp
web/validator/WEB-INF validation.xml
Log:
Added nested/indexed example to type form.
Revision Changes Path
1.2 +2 -0
jakarta-struts/src/validator/org/apache/struts/webapp/validator/ApplicationResources.properties
Index: ApplicationResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/validator/org/apache/struts/webapp/validator/ApplicationResources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationResources.properties 19 Mar 2002 03:33:58 -0000 1.1
+++ ApplicationResources.properties 19 Mar 2002 06:49:17 -0000 1.2
@@ -66,6 +66,8 @@
typeForm.double.displayname=Double Field
typeForm.date.displayname=Date Field
typeForm.creditCard.displayname=Credit Card
+typeForm.nested=Nested Text
+typeForm.nested.name.displayname=Name
# JavaScript Type Form
jsTypeForm.title=JavaScript Type Form
1.2 +2 -0
jakarta-struts/src/validator/org/apache/struts/webapp/validator/ApplicationResources_fr.properties
Index: ApplicationResources_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/validator/org/apache/struts/webapp/validator/ApplicationResources_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationResources_fr.properties 19 Mar 2002 03:33:58 -0000 1.1
+++ ApplicationResources_fr.properties 19 Mar 2002 06:49:17 -0000 1.2
@@ -69,6 +69,8 @@
typeForm.double.displayname=Champ Double
typeForm.date.displayname=Champ Date
typeForm.creditCard.displayname=Champ Carte de crédit
+typeForm.nested=Emboîté Texte
+typeForm.nested.name.displayname=Nom
# JavaScript Type Form
jsTypeForm.title=Formulaire de type de JavaScript
1.2 +28 -1
jakarta-struts/src/validator/org/apache/struts/webapp/validator/TypeForm.java
Index: TypeForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/validator/org/apache/struts/webapp/validator/TypeForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeForm.java 19 Mar 2002 03:33:58 -0000 1.1
+++ TypeForm.java 19 Mar 2002 06:49:17 -0000 1.2
@@ -56,8 +56,11 @@
package org.apache.struts.webapp.validator;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.util.LabelValueBean;
import org.apache.struts.validator.ValidatorForm;
@@ -77,6 +80,8 @@
private String sDouble = null;
private String sDate = null;
private String sCreditCard = null;
+
+ private List lNames = initNames();
public String getAction() {
return action;
@@ -149,7 +154,15 @@
public void setCreditCard(String sCreditCard) {
this.sCreditCard = sCreditCard;
}
-
+
+ public List getNameList() {
+ return lNames;
+ }
+
+ public void setNameList(List lNames) {
+ this.lNames = lNames;
+ }
+
/**
* Reset all properties to their default values.
*
@@ -166,6 +179,20 @@
sDouble = null;
sDate = null;
sCreditCard = null;
+
+ //lNames = initNames();
}
+ /**
+ * Initialize list.
+ */
+ private List initNames() {
+ List lResults = new ArrayList();
+
+ for (int i = 0; i < 3; i++) {
+ lResults.add(new LabelValueBean(null, null));
+ }
+
+ return lResults;
+ }
}
1.2 +53 -3 jakarta-struts/web/validator/type.jsp
Index: type.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/type.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- type.jsp 19 Mar 2002 03:31:51 -0000 1.1
+++ type.jsp 19 Mar 2002 06:49:17 -0000 1.2
@@ -2,6 +2,7 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts-nested.tld" prefix="nested" %>
<html:html>
<head>
@@ -13,9 +14,30 @@
<logic:messagesPresent>
<bean:message key="errors.header"/>
<ul>
- <html:messages id="error">
- <li><bean:write name="error"/></li>
- </html:messages>
+ <html:messages id="error" property="byte">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="short">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="integer">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="long">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="float">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="double">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="date">
+ <li><bean:write name="error"/></li>
+ </html:messages>
+ <html:messages id="error" property="creditCard">
+ <li><bean:write name="error"/></li>
+ </html:messages>
</ul><hr>
</logic:messagesPresent>
@@ -88,6 +110,34 @@
<html:text property="creditCard" size="16" maxlength="16"/>
</td>
</tr>
+
+ <tr>
+ <th align="left">
+ <bean:message key="typeForm.nested"/>
+ </th>
+ <td align="left">
+
+ </td>
+ </tr>
+ <nested:iterate property="nameList">
+ <tr>
+ <th align="left">
+
+ </th>
+ <td align="left">
+ <nested:messagesPresent property="value">
+ <br>
+ <ul>
+ <nested:messages id="error" property="value">
+ <li><bean:write name="error"/></li>
+ </nested:messages>
+ </ul>
+ </nested:messagesPresent>
+
+ <nested:text property="value" size="15" maxlength="15"/>
+ </td>
+ </tr>
+ </nested:iterate>
<tr>
<td>
<html:submit property="submit">
1.2 +5 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- validation.xml 19 Mar 2002 03:31:51 -0000 1.1
+++ validation.xml 19 Mar 2002 06:49:17 -0000 1.2
@@ -198,6 +198,11 @@
depends="required,creditCard">
<arg0 key="typeForm.creditCard.displayname"/>
</field>
+ <field property="value"
+ indexedListProperty="nameList"
+ depends="required">
+ <arg0 key="typeForm.nested.name.displayname"/>
+ </field>
</form>
<form name="jsTypeForm">
<field property="byte"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
