You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/07 17:37:57 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model BigDecimalField.java BooleanField.java ComboKeyField.java DateStringField.java DoubleField.java Field.java FileItemField.java FloatField.java IntegerField.java NumberKeyField.java StringField.java StringKeyField.java
henning 2003/04/07 08:37:57
Modified: src/java/org/apache/turbine/services/intake/model
BigDecimalField.java BooleanField.java
ComboKeyField.java DateStringField.java
DoubleField.java Field.java FileItemField.java
FloatField.java IntegerField.java
NumberKeyField.java StringField.java
StringKeyField.java
Log:
Clean up all the checker methods, add multiple field methods to some
of the field types (e.g. boolean).
Revision Changes Path
1.8 +9 -18 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java
Index: BigDecimalField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BigDecimalField.java 9 Mar 2003 03:03:24 -0000 1.7
+++ BigDecimalField.java 7 Apr 2003 15:37:55 -0000 1.8
@@ -55,7 +55,11 @@
*/
import java.math.BigDecimal;
+
import java.text.DecimalFormatSymbols;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -121,28 +125,15 @@
BigDecimal[] values = new BigDecimal[inputs.length];
for (int i = 0; i < inputs.length; i++)
{
- if (inputs[i] != null && inputs[i].length() > 0)
- {
- values[i] = canonicalizeDecimalInput(inputs[i]);
- }
- else
- {
- values[i] = null;
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? canonicalizeDecimalInput(inputs[i]) : null;
}
setTestValue(values);
}
else
{
- String s = parser.getString(getKey());
- if (s != null && s.length() > 0)
- {
- setTestValue(canonicalizeDecimalInput(s));
- }
- else
- {
- setTestValue(null);
- }
+ String val = parser.getString(getKey());
+ setTestValue(StringUtils.isNotEmpty(val) ? canonicalizeDecimalInput(val) : null);
}
}
1.7 +18 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BooleanField.java 9 Mar 2003 03:06:26 -0000 1.6
+++ BooleanField.java 7 Apr 2003 15:37:55 -0000 1.7
@@ -56,8 +56,11 @@
import java.text.ParseException;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.BooleanValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -112,13 +115,22 @@
*/
protected void doSetValue()
{
- String boolStringValue = parser.getString(getKey());
- Boolean newValue = null;
- if (boolStringValue != null)
+ if (isMultiValued)
+ {
+ String[] inputs = parser.getStrings(getKey());
+ Boolean[] values = new Boolean[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
+ {
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? getBoolean(inputs[i]) : null;
+ }
+ setTestValue(values);
+ }
+ else
{
- newValue = getBoolean(boolStringValue);
+ String val = parser.getString(getKey());
+ setTestValue(StringUtils.isNotEmpty(val) ? getBoolean(val) : null);
}
- setTestValue(newValue);
}
/**
1.9 +11 -21 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java
Index: ComboKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComboKeyField.java 9 Mar 2003 03:06:26 -0000 1.8
+++ ComboKeyField.java 7 Apr 2003 15:37:55 -0000 1.9
@@ -54,7 +54,10 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.torque.om.ComboKey;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -104,32 +107,19 @@
{
if (isMultiValued)
{
- String[] ss = parser.getStrings(getKey());
- ComboKey[] ival = new ComboKey[ss.length];
- for (int i = 0; i < ss.length; i++)
+ String[] inputs = parser.getStrings(getKey());
+ ComboKey[] values = new ComboKey[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
{
- if (ss[i] != null && ss[i].length() != 0)
- {
- ival[i] = new ComboKey(ss[i]);
- }
- else
- {
- ival[i] = null;
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? new ComboKey(inputs[i]) : null;
}
- setTestValue(ival);
+ setTestValue(values);
}
else
{
String val = parser.getString(getKey());
- if (val != null && val.length() != 0)
- {
- setTestValue(new ComboKey(val));
- }
- else
- {
- setTestValue(null);
- }
+ setTestValue(StringUtils.isNotEmpty(val) ? new ComboKey(val) : null);
}
}
}
1.7 +17 -30 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DateStringField.java 9 Mar 2003 03:06:26 -0000 1.6
+++ DateStringField.java 7 Apr 2003 15:37:55 -0000 1.7
@@ -56,7 +56,11 @@
import java.text.DateFormat;
import java.text.ParseException;
+
import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.DateStringValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -139,47 +143,30 @@
{
if (isMultiValued)
{
- String[] ss = parser.getStrings(getKey());
- Date[] dates = new Date[ss.length];
- for (int i = 0; i < ss.length; i++)
+ String[] inputs = parser.getStrings(getKey());
+ Date[] values = new Date[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
{
- if (ss[i] != null && ss[i].length() != 0)
+ try
{
- try
- {
- dates[i] = getDate(ss[i]);
- }
- catch (ParseException e)
- {
- // do nothing. By the time this method is called,
- // the validator will have already ensured that the
- // string can be parsed.
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? getDate(inputs[i]) : null;
}
- else
+ catch (ParseException e)
{
- dates[i] = null;
+ values[i] = null;
}
}
- setTestValue(dates);
+ setTestValue(values);
}
else
{
String val = parser.getString(getKey());
- if (val != null && val.length() != 0)
+ try
{
- try
- {
- setTestValue(getDate(val));
- }
- catch (ParseException e)
- {
- // do nothing. By the time this method is called, the
- // validator will have already ensured that the string
- // can be parsed.
- }
+ setTestValue(StringUtils.isNotEmpty(val) ? getDate(val) : null);
}
- else
+ catch (ParseException e)
{
setTestValue(null);
}
1.5 +12 -23 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java
Index: DoubleField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DoubleField.java 9 Mar 2003 03:06:27 -0000 1.4
+++ DoubleField.java 7 Apr 2003 15:37:55 -0000 1.5
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -81,7 +83,7 @@
}
/**
- * Sets the default value for a Doulbe Field
+ * Sets the default value for a Double Field
*
* @param prop Parameter for the default values
*/
@@ -114,32 +116,19 @@
{
if (isMultiValued)
{
- String[] ss = parser.getStrings(getKey());
- Double[] ival = new Double[ss.length];
- for (int i = 0; i < ss.length; i++)
+ String[] inputs = parser.getStrings(getKey());
+ Double[] values = new Double[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
{
- if (ss[i] != null && ss[i].length() > 0)
- {
- ival[i] = new Double(ss[i]);
- }
- else
- {
- ival[i] = null;
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? new Double(inputs[i]) : null;
}
- setTestValue(ival);
+ setTestValue(values);
}
else
{
- String s = parser.getString(getKey());
- if (s != null && s.length() > 0)
- {
- setTestValue(new Double(s));
- }
- else
- {
- setTestValue(null);
- }
+ String val = parser.getString(getKey());
+ setTestValue(StringUtils.isNotEmpty(val) ? new Double(val) : null);
}
}
}
1.10 +14 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Field.java 9 Mar 2003 03:06:27 -0000 1.9
+++ Field.java 7 Apr 2003 15:37:55 -0000 1.10
@@ -56,11 +56,14 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.om.Retrievable;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.intake.IntakeException;
@@ -88,9 +91,15 @@
*/
public abstract class Field
{
+ /** Empty Value */
private static final String EMPTY = "";
+
+ /** CGI Key for "value if absent" */
private static final String VALUE_IF_ABSENT_KEY = "_vifa_";
+ /** Default Package */
+ public static final String defaultFieldPackage = "org.apache.turbine.services.intake.validator.";
+
// the following are set from the xml file and are permanent (final)
/** Name of the field. */
@@ -214,8 +223,7 @@
else if (validatorClassName != null
&& validatorClassName.indexOf('.') == -1)
{
- validatorClassName = "org.apache.turbine.services.intake.validator."
- + validatorClassName;
+ validatorClassName = defaultFieldPackage + validatorClassName;
}
if (validatorClassName != null)
@@ -275,8 +283,8 @@
String propName = field.getMapToProperty();
Method tmpGetter = null;
Method tmpSetter = null;
- if (mapToObject != null && mapToObject.length() != 0
- && propName != null && propName.length() != 0)
+ if (StringUtils.isNotEmpty(mapToObject)
+ && StringUtils.isNotEmpty(propName))
{
try
{
@@ -454,6 +462,7 @@
public void removeFromRequest()
{
parser.remove(getKey());
+ parser.remove(getKey()+ VALUE_IF_ABSENT_KEY);
}
/**
@@ -603,7 +612,6 @@
{
doSetValue();
}
-
}
else
{
1.10 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileItemField.java 9 Mar 2003 03:06:27 -0000 1.9
+++ FileItemField.java 7 Apr 2003 15:37:55 -0000 1.10
@@ -55,6 +55,7 @@
*/
import org.apache.commons.fileupload.FileItem;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.FileValidator;
import org.apache.turbine.services.intake.validator.ValidationException;
1.7 +11 -22 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java
Index: FloatField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FloatField.java 9 Mar 2003 03:06:27 -0000 1.6
+++ FloatField.java 7 Apr 2003 15:37:55 -0000 1.7
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -118,32 +120,19 @@
{
if (isMultiValued)
{
- String[] ss = parser.getStrings(getKey());
- Float[] ival = new Float[ss.length];
- for (int i = 0; i < ss.length; i++)
+ String[] inputs = parser.getStrings(getKey());
+ Float[] values = new Float[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
{
- if (ss[i] != null && ss[i].length() > 0)
- {
- ival[i] = new Float(ss[i]);
- }
- else
- {
- ival[i] = null;
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? new Float(inputs[i]) : null;
}
- setTestValue(ival);
+ setTestValue(values);
}
else
{
- String s = parser.getString(getKey());
- if (s != null && s.length() > 0)
- {
- setTestValue(new Float(s));
- }
- else
- {
- setTestValue(null);
- }
+ String val = parser.getString(getKey());
+ setTestValue(StringUtils.isNotEmpty(val) ? new Float(val) : null);
}
}
}
1.8 +10 -19 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IntegerField.java 9 Mar 2003 03:06:27 -0000 1.7
+++ IntegerField.java 7 Apr 2003 15:37:55 -0000 1.8
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.IntegerValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -115,30 +117,19 @@
{
if (isMultiValued)
{
- String[] ss = parser.getStrings(getKey());
- Integer[] ival = new Integer[ss.length];
- for (int i = 0; i < ss.length; i++)
+ String[] inputs = parser.getStrings(getKey());
+ Integer[] values = new Integer[inputs.length];
+ for (int i = 0; i < inputs.length; i++)
{
- if (ss[i] != null && ss[i].length() != 0)
- {
- ival[i] = new Integer(ss[i]);
- }
- else
- {
- ival[i] = null;
- }
+ values[i] = StringUtils.isNotEmpty(inputs[i])
+ ? new Integer(inputs[i]) : null;
}
- setTestValue(ival);
+ setTestValue(values);
}
else
{
- Integer newValue = null;
String val = parser.getString(getKey());
- if (val != null && val.length() > 0)
- {
- newValue = new Integer(val);
- }
- setTestValue(newValue);
+ setTestValue(StringUtils.isNotEmpty(val) ? new Integer(val) : null);
}
}
}
1.8 +7 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java
Index: NumberKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NumberKeyField.java 9 Mar 2003 03:06:27 -0000 1.7
+++ NumberKeyField.java 7 Apr 2003 15:37:55 -0000 1.8
@@ -55,7 +55,11 @@
*/
import java.math.BigDecimal;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.torque.om.NumberKey;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberKeyValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -120,7 +124,7 @@
NumberKey[] values = new NumberKey[inputs.length];
for (int i = 0; i < inputs.length; i++)
{
- if (inputs[i] != null && inputs[i].length() > 0)
+ if (StringUtils.isNotEmpty(inputs[i]))
{
values[i] = new NumberKey(
canonicalizeDecimalInput(inputs[i]));
@@ -135,7 +139,7 @@
else
{
String val = parser.getString(getKey());
- if (val != null && val.length() > 0)
+ if (StringUtils.isNotEmpty(val))
{
BigDecimal bd = canonicalizeDecimalInput(val);
setTestValue(new NumberKey(bd));
@@ -146,5 +150,4 @@
}
}
}
-
}
1.7 +9 -20 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StringField.java 9 Mar 2003 03:06:27 -0000 1.6
+++ StringField.java 7 Apr 2003 15:37:55 -0000 1.7
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -103,28 +105,14 @@
String[] sval = new String[ss.length];
for (int i = 0; i < ss.length; i++)
{
- if (ss[i] != null && ss[i].length() != 0)
- {
- sval[i] = ss[i];
- }
- else
- {
- sval[i] = null;
- }
+ sval[i] = (StringUtils.isNotEmpty(ss[i])) ? ss[i] : null;
}
setTestValue(sval);
}
else
{
String val = parser.getString(getKey());
- if (val != null && val.length() > 0)
- {
- setTestValue(val);
- }
- else
- {
- setTestValue(null);
- }
+ setTestValue(StringUtils.isNotEmpty(val) ? val : null);
}
}
@@ -152,9 +140,10 @@
boolean set = false;
for (int i = 0; i < ss.length; i++)
{
- if (ss[i] != null && ss[i].length() > 0)
+ set |= StringUtils.isNotEmpty(ss[i]);
+ if (set)
{
- set = true;
+ break;
}
}
if (!set)
@@ -166,7 +155,7 @@
}
else
{
- if (!setFlag || ((String) getTestValue()).length() == 0)
+ if (!setFlag || StringUtils.isEmpty((String) getTestValue()))
{
validFlag = false;
this.message = message;
1.9 +6 -18 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java
Index: StringKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StringKeyField.java 9 Mar 2003 03:06:27 -0000 1.8
+++ StringKeyField.java 7 Apr 2003 15:37:55 -0000 1.9
@@ -54,7 +54,10 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.lang.StringUtils;
+
import org.apache.torque.om.StringKey;
+
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -107,29 +110,14 @@
StringKey[] ival = new StringKey[ss.length];
for (int i = 0; i < ss.length; i++)
{
- if (ss[i] != null && ss[i].length() != 0)
- {
- ival[i] = new StringKey(ss[i]);
- }
- else
- {
- ival[i] = null;
- }
+ ival[i] = (StringUtils.isNotEmpty(ss[i])) ? new StringKey(ss[i]) : null;
}
setTestValue(ival);
}
else
{
String val = parser.getString(getKey());
- if (val != null && val.length() != 0)
- {
- setTestValue(new StringKey(val));
- }
- else
- {
- setTestValue(null);
- }
+ setTestValue((StringUtils.isNotEmpty(val)) ? new StringKey(val) : null);
}
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org