jmcnally 01/06/21 18:51:31
Modified: src/java/org/apache/turbine/services/intake/model Field.java
Log:
mostly just removed a lot of commented out code.
but a bugfix as well: the object the field wraps was not being nulled out
when the group was returned to the pool.
Revision Changes Path
1.17 +4 -95
jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Field.java 2001/06/18 23:35:45 1.16
+++ Field.java 2001/06/22 01:51:31 1.17
@@ -75,7 +75,7 @@
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: Field.java,v 1.16 2001/06/18 23:35:45 jmcnally Exp $
+ * @version $Id: Field.java,v 1.17 2001/06/22 01:51:31 jmcnally Exp $
*/
public abstract class Field
{
@@ -96,20 +96,7 @@
protected boolean alwaysRequired;
protected Object onError;
- /* to be removed
- protected final RE regexp;
- protected final String regexpMessage;
- protected final int minLength;
- protected final String minLengthMessage;
- protected final int maxLength;
- protected final String maxLengthMessage;
- protected final boolean maxLengthForce;
- protected final String[] requires;
- protected final String[] requiresMessage;
- */
-
-
-
+ // these are reset when the Field is returned to the pool
protected boolean set_flag;
protected boolean valid_flag;
protected boolean required;
@@ -119,7 +106,6 @@
private Object validValue;
private Object testValue;
- private String propertyName;
private Object[] valArray; // for reflection
/** The object containing the request data */
@@ -153,7 +139,7 @@
}
if ( className != null )
- {
+ {
validator = (Validator)Class.forName(className).newInstance();
// this should always be true for now
// (until bean property initialization is implemented)
@@ -185,67 +171,6 @@
ifRequiredMessage = field.getIfRequiredMessage();
valArray = new Object[1];
-
- /* to be removed
- int requires_index = 0;
- for (int i=0; i<field.getRules().size(); i++)
- {
- Rule rule = (Rule)field.getRules().get(i);
- if ( rule.getRequiresProp()!=null )
- {
- requires_index++;
- }
- }
- requires = new String[requires_index];
- requiresMessage = new String[requires_index];
-
- requires_index = 0;
- RE tmpRE = null;
- String tmpREMessage = null;
- int tmpMinLength = 0;
- String tmpMinLengthMessage = null;
- int tmpMaxLength = 0;
- String tmpMaxLengthMessage = null;
- boolean tmpMaxLengthForce = false;
- for (int i=0; i<field.getRules().size(); i++)
- {
- Rule rule = (Rule)field.getRules().get(i);
-
- if ( rule.getMask() != null )
- {
- tmpRE = new RE(rule.getMask());
- tmpREMessage = rule.getMessage();
- }
-
- if ( rule.getMinLength() != null )
- {
- tmpMinLength = Integer.parseInt(rule.getMinLength());
- tmpMinLengthMessage = rule.getMessage();
- }
-
- if ( rule.getMaxLength() != null )
- {
- tmpMaxLength = Integer.parseInt(rule.getMaxLength());
- tmpMaxLengthMessage = rule.getMessage();
- tmpMaxLengthForce = "force".equals(rule.getAction());
- }
-
- if ( field.getGroup()!=null && rule.getRequiresProp()!=null )
- {
- requires[requires_index] = rule.getRequiresProp();
- requiresMessage[requires_index] = rule.getMessage();
- requires_index++;
- }
- }
- regexp = tmpRE;
- regexpMessage = tmpREMessage;
- minLength = tmpMinLength;
- minLengthMessage = tmpMinLengthMessage;
- maxLength = tmpMaxLength;
- maxLengthMessage = tmpMaxLengthMessage;
- maxLengthForce = tmpMaxLengthForce;
- */
-
}
@@ -373,6 +298,7 @@
valid_flag = false;
required = false;
message = null;
+ retrievable = null;
validValue = null;
testValue = null;
@@ -535,22 +461,6 @@
}
}
- /*
- if ( group != null && requires.length > 0 )
- {
- for (int i=0; i<requires.length; i++)
- {
- boolean b = pp.containsKey(((Field)group.get(requires[i]))
- .getKey());
- valid_flag &= b;
- if (requiresMessage[i] != null && !b)
- {
- message = requiresMessage[i];
- }
- }
- }
- */
-
return valid_flag;
}
@@ -646,7 +556,6 @@
{
val = onError;
}
-
return val;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
