henning 2003/06/19 08:23:13
Modified: src/java/org/apache/turbine/services/intake/validator
BooleanValidator.java
Log:
Some init cleanups, modified to work with the new validator class hierarchy.
Patch donated by Colin Chalmers <[EMAIL PROTECTED]>
Revision Changes Path
1.6 +21 -33
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
Index: BooleanValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BooleanValidator.java 9 Mar 2003 03:06:28 -0000 1.5
+++ BooleanValidator.java 19 Jun 2003 15:23:13 -0000 1.6
@@ -55,9 +55,7 @@
*/
import java.text.ParseException;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Vector;
/**
* Validator for boolean field types.<br><br>
@@ -84,38 +82,31 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Colin Chalmers</a>
* @version $Id$
*/
public class BooleanValidator
extends DefaultValidator
{
/** String values which would evaluate to Boolean.TRUE */
- private static Vector trueValues;
+ private static String[] trueValues = {"TRUE","T","YES","Y","1"};
/** String values which would evaluate to Boolean.FALSE */
- private static Vector falseValues;
-
- static
- {
- trueValues = new Vector();
- trueValues.add("TRUE");
- trueValues.add("T");
- trueValues.add("YES");
- trueValues.add("Y");
- trueValues.add("1");
-
- falseValues = new Vector();
- falseValues.add("FALSE");
- falseValues.add("F");
- falseValues.add("NO");
- falseValues.add("N");
- falseValues.add("0");
- }
+ private static String[] falseValues = {"FALSE","F","NO","N","0"};
+ /**
+ * Default Constructor
+ */
public BooleanValidator()
{
}
+ /**
+ * Constructor to use when initialising Object
+ *
+ * @param paramMap
+ * @throws InvalidMaskException
+ */
public BooleanValidator(Map paramMap)
throws InvalidMaskException
{
@@ -130,9 +121,11 @@
* @exception ValidationException containing an error message if the
* testValue did not pass the validation tests.
*/
- protected void doAssertValidity(String testValue)
+ public void assertValidity(String testValue)
throws ValidationException
{
+ super.assertValidity(testValue);
+
try
{
parse(testValue);
@@ -153,21 +146,18 @@
throws ParseException
{
Boolean result = null;
- for (Iterator iter = trueValues.iterator(); iter.hasNext() && result ==
null;)
+ for (int cnt = 0; cnt < trueValues.length; cnt++)
{
- String trueValue = (String) iter.next();
- if (trueValue.equalsIgnoreCase(stringValue))
+ if (stringValue.equalsIgnoreCase(trueValues[cnt]))
{
result = Boolean.TRUE;
+ break;
}
- }
- for (Iterator iter = falseValues.iterator(); iter.hasNext() && result ==
null;)
- {
- String falseValue = (String) iter.next();
- if (falseValue.equalsIgnoreCase(stringValue))
+ if (stringValue.equalsIgnoreCase(falseValues[cnt]))
{
result = Boolean.FALSE;
+ break;
}
}
@@ -176,8 +166,6 @@
throw new ParseException(stringValue +
" could not be converted to a Boolean", 0);
}
-
return result;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
