You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2002/04/12 02:01:10 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model StringField.java
jmcnally 02/04/11 17:01:10
Modified: src/services/org/apache/fulcrum/intake/model
StringField.java
Log:
setRequired method needed more logic to handle multivalued fields
Revision Changes Path
1.4 +37 -5 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/StringField.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringField.java 18 Nov 2001 19:18:59 -0000 1.3
+++ StringField.java 12 Apr 2002 00:01:09 -0000 1.4
@@ -61,7 +61,7 @@
* Text field.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: StringField.java,v 1.3 2001/11/18 19:18:59 dlr Exp $
+ * @version $Id: StringField.java,v 1.4 2002/04/12 00:01:09 jmcnally Exp $
*/
public class StringField extends Field
{
@@ -94,10 +94,42 @@
public void setRequired(boolean v, String message)
{
this.required = v;
- if (v && (!set_flag || ((String)getTestValue()).length() == 0) )
+ if (v)
{
- valid_flag = false;
- this.message = message;
- }
+ if (isMultiValued)
+ {
+ String[] ss = (String[])getTestValue();
+ if (ss == null || ss.length == 0)
+ {
+ valid_flag = false;
+ this.message = message;
+ }
+ else if (ss.length == 0)
+ {
+ boolean set = false;
+ for (int i=0; i<ss.length; i++)
+ {
+ if (ss[i] != null && ss[i].length() > 0)
+ {
+ set = true;
+ }
+ }
+ if (!set)
+ {
+ valid_flag = false;
+ this.message = message;
+ }
+ }
+ }
+ else
+ {
+ if (!set_flag || ((String)getTestValue()).length() == 0)
+ {
+ valid_flag = false;
+ this.message = message;
+ }
+ }
+
+ }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>