You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2008/04/10 12:56:19 UTC
svn commit: r646752 - in
/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake:
model/BooleanField.java model/IntegerField.java model/LongField.java
model/ShortField.java validator/BooleanValidator.java
Author: tv
Date: Thu Apr 10 03:56:15 2008
New Revision: 646752
URL: http://svn.apache.org/viewvc?rev=646752&view=rev
Log:
Further simplify the value assignment in Intake fields.
Modified:
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java?rev=646752&r1=646751&r2=646752&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java Thu Apr 10 03:56:15 2008
@@ -19,9 +19,6 @@
* under the License.
*/
-import java.text.ParseException;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.BooleanValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -119,57 +116,22 @@
{
if (isMultiValued)
{
- String[] inputs = parser.getStrings(getKey());
+ Boolean[] inputs = parser.getBooleanObjects(getKey());
boolean[] values = new boolean[inputs.length];
+
for (int i = 0; i < inputs.length; i++)
{
- values[i] = StringUtils.isNotEmpty(inputs[i])
- ? getBoolean(inputs[i]).booleanValue()
- : ((Boolean) getEmptyValue()).booleanValue();
+ values[i] = inputs[i] == null
+ ? ((Boolean) getEmptyValue()).booleanValue()
+ : inputs[i].booleanValue();
}
- setTestValue(values);
- }
- else
- {
- String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val) ? getBoolean(val) : (Boolean) getEmptyValue());
- }
- }
-
- /**
- * Parses a string into a Boolean object. If the field has a validator
- * and the validator is an instance of BooleanValidator, the parse()
- * method is used to convert the string into the Boolean. Otherwise,
- * the string value is passed to the constructor to the Boolean
- * object.
- *
- * @param stringValue string to parse
- * @return a <code>Boolean</code> object
- */
- private Boolean getBoolean(String stringValue)
- {
- Boolean result = null;
- if (validator != null && validator instanceof BooleanValidator)
- {
- BooleanValidator bValidator = (BooleanValidator) validator;
- try
- {
- result = bValidator.parse(stringValue);
- }
- catch (ParseException e)
- {
- // do nothing. This should never be thrown since this method will not be
- // executed unless the Validator has already been able to parse the
- // string value
- }
+ setTestValue(values);
}
else
{
- result = Boolean.valueOf(stringValue);
+ setTestValue(parser.getBooleanObject(getKey(), (Boolean)getEmptyValue()));
}
-
- return result;
}
/**
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java?rev=646752&r1=646751&r2=646752&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java Thu Apr 10 03:56:15 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-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;
@@ -127,20 +125,21 @@
{
if (isMultiValued)
{
- String[] inputs = parser.getStrings(getKey());
+ Integer[] inputs = parser.getIntObjects(getKey());
int[] values = new int[inputs.length];
+
for (int i = 0; i < inputs.length; i++)
{
- values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Integer(inputs[i]).intValue()
- : ((Integer) getEmptyValue()).intValue();
+ values[i] = inputs[i] == null
+ ? ((Integer) getEmptyValue()).intValue()
+ : inputs[i].intValue();
}
+
setTestValue(values);
}
else
{
- String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val) ? new Integer(val) : (Integer) getEmptyValue());
+ setTestValue(parser.getIntObject(getKey(), (Integer)getEmptyValue()));
}
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java?rev=646752&r1=646751&r2=646752&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java Thu Apr 10 03:56:15 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.LongValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -125,22 +123,21 @@
{
if (isMultiValued)
{
- String[] inputs = parser.getStrings(getKey());
+ Long[] inputs = parser.getLongObjects(getKey());
long[] values = new long[inputs.length];
+
for (int i = 0; i < inputs.length; i++)
{
- values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Long(inputs[i]).longValue()
- : ((Long) getEmptyValue()).longValue();
+ values[i] = inputs[i] == null
+ ? ((Long) getEmptyValue()).longValue()
+ : inputs[i].longValue();
}
+
setTestValue(values);
}
else
{
- String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
- ? new Long(val) : (Long) getEmptyValue());
+ setTestValue(parser.getLongObject(getKey(), (Long)getEmptyValue()));
}
}
-
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java?rev=646752&r1=646751&r2=646752&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java Thu Apr 10 03:56:15 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.ShortValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -125,22 +123,30 @@
{
if (isMultiValued)
{
- String[] inputs = parser.getStrings(getKey());
+ Integer[] inputs = parser.getIntObjects(getKey());
short[] values = new short[inputs.length];
+
for (int i = 0; i < inputs.length; i++)
{
- values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Short(inputs[i]).shortValue()
- : ((Short) getEmptyValue()).shortValue();
+ values[i] = inputs[i] == null
+ ? ((Short) getEmptyValue()).shortValue()
+ : inputs[i].shortValue();
}
+
setTestValue(values);
}
else
{
- String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
- ? new Short(val) : (Short) getEmptyValue());
+ Integer value = parser.getIntObject(getKey());
+
+ if (value == null)
+ {
+ setTestValue((Short)getEmptyValue());
+ }
+ else
+ {
+ setTestValue(new Short(value.shortValue()));
+ }
}
}
-
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java?rev=646752&r1=646751&r2=646752&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java Thu Apr 10 03:56:15 2008
@@ -39,6 +39,7 @@
* <li>YES</li>
* <li>Y</li>
* <li>1</li>
+ * <li>ON</li>
* </ul>
* Valid values for Boolean.FALSE:
* <ul>
@@ -47,6 +48,7 @@
* <li>NO</li>
* <li>N</li>
* <li>0</li>
+ * <li>OFF</li>
* </ul>
*
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
@@ -57,10 +59,10 @@
extends DefaultValidator
{
/** String values which would evaluate to Boolean.TRUE */
- private static String[] trueValues = {"TRUE","T","YES","Y","1"};
+ private static String[] trueValues = {"TRUE","T","YES","Y","1","ON"};
/** String values which would evaluate to Boolean.FALSE */
- private static String[] falseValues = {"FALSE","F","NO","N","0"};
+ private static String[] falseValues = {"FALSE","F","NO","N","0","OFF"};
/**
* Default Constructor