[jcatapult] r2403 committed - Updated boolean converted to support no, yes, on and off.

[codesite...@google.com]

Revision: 2403
Author: bpontarelli
Date: Sun Nov 15 17:59:52 2009
Log: Updated boolean converted to support no, yes, on and off.
http://code.google.com/p/jcatapult/source/detail?r=2403

Modified:
/jcatapult-mvc/trunk/jcatapult-mvc.iml
/jcatapult-mvc/trunk/jcatapult-mvc.ipr

/jcatapult-mvc/trunk/src/java/main/org/jcatapult/mvc/parameter/convert/converters/BooleanConverter.java

/jcatapult-mvc/trunk/src/java/test/unit/org/jcatapult/mvc/parameter/convert/converters/BooleanConverterTest.java

=======================================
--- /jcatapult-mvc/trunk/jcatapult-mvc.iml Thu Nov 13 16:02:11 2008
+++ /jcatapult-mvc/trunk/jcatapult-mvc.iml Sun Nov 15 17:59:52 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" classpath="eclipse" type="JAVA_MODULE"
version="4">
+<module classpath="eclipse" relativePaths="true" type="JAVA_MODULE"
version="4">
<component name="copyright">
<Base>
<setting name="state" value="1" />
=======================================
--- /jcatapult-mvc/trunk/jcatapult-mvc.ipr Wed Oct 14 11:38:18 2009
+++ /jcatapult-mvc/trunk/jcatapult-mvc.ipr Sun Nov 15 17:59:52 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project version="4">
<component name="AntConfiguration">
<defaultAnt name="Apache Ant version 1.7.0" />
</component>
@@ -10,13 +10,8 @@
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
</component>
- <component name="CodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS" />
- <option name="USE_PER_PROJECT_SETTINGS" value="false" />
- </component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -32,11 +27,13 @@
<entry name="?*.dtd" />
<entry name="?*.tld" />
</wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="CopyrightManager" default="JCatapult">
<copyright>
<option name="notice" value="Copyright (c) &amp;#36;today.year,
JCatapult.org, All Rights Reserved&#10;&#10;Licensed under the Apache
License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this
file except in compliance with the License.&#10;You may obtain a copy of
the License at&#10;&#10;
http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by
applicable law or agreed to in writing,&#10;software distributed under the
License is distributed on an&#10;&quot;AS IS&quot; BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND,&#10;either express or implied. See
the License for the specific&#10;language governing permissions and
limitations under the License." />
<option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="" />
<option name="myName" value="JCatapult" />
<option name="myLocal" value="true" />
</copyright>
@@ -87,9 +84,6 @@
</component>
<component name="IdProvider"
IDEtalkID="C3E10093AD37246DAE72198F2F6CDB7D" />
<component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_PROFILE" value="true" />
- <version value="1.0" />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
@@ -153,6 +147,9 @@
<inspection_tool class="UnusedLabel" enabled="false"
level="WARNING" enabled_by_default="false" />
</profile>
</profiles>
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
<list size="5">
<item index="0" class="java.lang.String" itemvalue="TYPO" />
<item index="1" class="java.lang.String" itemvalue="WARNING" />
=======================================
---
/jcatapult-mvc/trunk/src/java/main/org/jcatapult/mvc/parameter/convert/converters/BooleanConverter.java
Wed Jul 23 15:03:21 2008
+++
/jcatapult-mvc/trunk/src/java/main/org/jcatapult/mvc/parameter/convert/converters/BooleanConverter.java
Sun Nov 15 17:59:52 2009
@@ -47,11 +47,12 @@
*/
protected Object stringToPrimitive(String value, Class convertTo,
Map<String, String> attributes)
throws ConversionException, ConverterStateException {
- if (!StringTools.isValidBoolean(value)) {
+ if (!value.equals("true") && !value.equals("false")
&& !value.equals("on") && !value.equals("off")
+ && !value.equals("yes") && !value.equals("no")) {
throw new ConversionException ("Unable to convert invalid
boolean String [" + value + "]");
}

- return Boolean.valueOf(value);
+ return value.equals("true") || value.equals("on") ||
value.equals("yes");
}

/**
=======================================
---
/jcatapult-mvc/trunk/src/java/test/unit/org/jcatapult/mvc/parameter/convert/converters/BooleanConverterTest.java
Tue Mar 24 14:20:57 2009
+++
/jcatapult-mvc/trunk/src/java/test/unit/org/jcatapult/mvc/parameter/convert/converters/BooleanConverterTest.java
Sun Nov 15 17:59:52 2009
@@ -45,12 +45,24 @@
b = (Boolean) converter.convertFromStrings(array("true"),
Boolean.class, null, "testExpr");
assertTrue(b);

+ b = (Boolean) converter.convertFromStrings(array("yes"),
Boolean.class, null, "testExpr");
+ assertTrue(b);
+
+ b = (Boolean) converter.convertFromStrings(array("on"),
Boolean.class, null, "testExpr");
+ assertTrue(b);
+
b = (Boolean) converter.convertFromStrings(array("true"),
Boolean.TYPE, null, "testExpr");
assertTrue(b);

b = (Boolean) converter.convertFromStrings(array("false"),
Boolean.class, null, "testExpr");
assertFalse(b);

+ b = (Boolean) converter.convertFromStrings(array("no"),
Boolean.class, null, "testExpr");
+ assertFalse(b);
+
+ b = (Boolean) converter.convertFromStrings(array("off"),
Boolean.class, null, "testExpr");
+ assertFalse(b);
+
b = (Boolean) converter.convertFromStrings(array("false"),
Boolean.TYPE, null, "testExpr");
assertFalse(b);