Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/org/apache/fulcrum/intake/validator/ShortValidator.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/org/apache/fulcrum/intake/validator/ShortValidator.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/org/apache/fulcrum/intake/validator/ShortValidator.html Sun Feb 11 17:30:40 2018 @@ -200,7 +200,7 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Methods inherited from class org.apache.fulcrum.intake.validator.<a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html" title="class in org.apache.fulcrum.intake.validator">NumberValidator</a></h3> -<code><a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#assertValidity(org.apache.fulcrum.intake.model.Field)">assertValidity</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#assertValidity(java.lang.String, java.util.Locale)">assertValidity</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getInvalidNumberMessage()">getInvalidNumberMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMaxValue()">getMaxValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMaxValueMessage()">getMaxValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMinValue()">getMinValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMinValueMessage()">getMinValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/Numbe rValidator.html#init(java.util.Map)">init</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setInvalidNumberMessage(java.lang.String)">setInvalidNumberMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMaxValue(T)">setMaxValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMaxValueMessage(java.lang.String)">setMaxValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMinValue(T)">setMinValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMinValueMessage(java.lang.String)">setMinValueMessage</a></code></li> +<code><a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#assertValidity(org.apache.fulcrum.intake.model.Field)">assertValidity</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#assertValidity(java.lang.String, java.util.Locale)">assertValidity</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getInvalidNumberMessage()">getInvalidNumberMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMaxValue()">getMaxValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMaxValueMessage()">getMaxValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMinValue()">getMinValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#getMinValueMessage()">getMinValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/Numbe rValidator.html#init(java.util.Map)">init</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#parseIntoNumber(java.lang.String, java.util.Locale)">parseIntoNumber</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setInvalidNumberMessage(java.lang.String)">setInvalidNumberMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMaxValue(T)">setMaxValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMaxValueMessage(java.lang.String)">setMaxValueMessage</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMinValue(T)">setMinValue</a>, <a href="../../../../../org/apache/fulcrum/intake/validator/NumberValidator.html#setMinValueMessage(java.lang.String)">setMinValueMessage</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods_inherited_from_class_org.apache.fulcrum.intake.validator.DefaultValidator">
Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/IntakeServiceFacade.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/IntakeServiceFacade.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/IntakeServiceFacade.html Sun Feb 11 17:30:40 2018 @@ -44,7 +44,7 @@ <span class="sourceLineNo">036</span> *<a name="line.36"></a> <span class="sourceLineNo">037</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.37"></a> <span class="sourceLineNo">038</span> * @author <a href="mailto:[email protected]">Quinton McCombs</a><a name="line.38"></a> -<span class="sourceLineNo">039</span> * @version $Id: IntakeServiceFacade.java 1771953 2016-11-29 20:29:12Z tv $<a name="line.39"></a> +<span class="sourceLineNo">039</span> * @version $Id: IntakeServiceFacade.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.39"></a> <span class="sourceLineNo">040</span> */<a name="line.40"></a> <span class="sourceLineNo">041</span>public class IntakeServiceFacade<a name="line.41"></a> <span class="sourceLineNo">042</span>{<a name="line.42"></a> @@ -53,11 +53,11 @@ <span class="sourceLineNo">045</span><a name="line.45"></a> <span class="sourceLineNo">046</span> /**<a name="line.46"></a> <span class="sourceLineNo">047</span> * Return whether the intake service has been initialized.<a name="line.47"></a> -<span class="sourceLineNo">048</span> * @return true if the service has been initialzed<a name="line.48"></a> +<span class="sourceLineNo">048</span> * @return true if the service has been initialized<a name="line.48"></a> <span class="sourceLineNo">049</span> */<a name="line.49"></a> <span class="sourceLineNo">050</span> public static boolean isInitialized()<a name="line.50"></a> <span class="sourceLineNo">051</span> {<a name="line.51"></a> -<span class="sourceLineNo">052</span> return (!(intakeService == null));<a name="line.52"></a> +<span class="sourceLineNo">052</span> return intakeService != null;<a name="line.52"></a> <span class="sourceLineNo">053</span> }<a name="line.53"></a> <span class="sourceLineNo">054</span><a name="line.54"></a> <span class="sourceLineNo">055</span> /**<a name="line.55"></a> @@ -99,7 +99,7 @@ <span class="sourceLineNo">091</span> * the name of the group.<a name="line.91"></a> <span class="sourceLineNo">092</span> * @return the current pool size<a name="line.92"></a> <span class="sourceLineNo">093</span> * @throws IntakeException<a name="line.93"></a> -<span class="sourceLineNo">094</span> * A non existant group was passed<a name="line.94"></a> +<span class="sourceLineNo">094</span> * A non-existent group was passed<a name="line.94"></a> <span class="sourceLineNo">095</span> */<a name="line.95"></a> <span class="sourceLineNo">096</span> public static int getSize(String groupName) throws IntakeException<a name="line.96"></a> <span class="sourceLineNo">097</span> {<a name="line.97"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/BooleanField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/BooleanField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/BooleanField.html Sun Feb 11 17:30:40 2018 @@ -33,7 +33,7 @@ <span class="sourceLineNo">025</span>/**<a name="line.25"></a> <span class="sourceLineNo">026</span> * Processor for boolean fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @version $Id: BooleanField.java 1770205 2016-11-17 15:03:41Z tv $<a name="line.28"></a> +<span class="sourceLineNo">028</span> * @version $Id: BooleanField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.28"></a> <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>public class BooleanField<a name="line.30"></a> <span class="sourceLineNo">031</span> extends Field<Boolean><a name="line.31"></a> @@ -141,7 +141,7 @@ <span class="sourceLineNo">133</span> for (int i = 0; i < inputs.length; i++)<a name="line.133"></a> <span class="sourceLineNo">134</span> {<a name="line.134"></a> <span class="sourceLineNo">135</span> values[i] = inputs[i] == null<a name="line.135"></a> -<span class="sourceLineNo">136</span> ? (getEmptyValue()).booleanValue()<a name="line.136"></a> +<span class="sourceLineNo">136</span> ? getEmptyValue().booleanValue()<a name="line.136"></a> <span class="sourceLineNo">137</span> : inputs[i].booleanValue();<a name="line.137"></a> <span class="sourceLineNo">138</span> }<a name="line.138"></a> <span class="sourceLineNo">139</span><a name="line.139"></a> @@ -164,7 +164,7 @@ <span class="sourceLineNo">156</span> boolean result = false;<a name="line.156"></a> <span class="sourceLineNo">157</span> try<a name="line.157"></a> <span class="sourceLineNo">158</span> {<a name="line.158"></a> -<span class="sourceLineNo">159</span> result = (getValue()).booleanValue();<a name="line.159"></a> +<span class="sourceLineNo">159</span> result = getValue().booleanValue();<a name="line.159"></a> <span class="sourceLineNo">160</span> }<a name="line.160"></a> <span class="sourceLineNo">161</span> catch (Exception e)<a name="line.161"></a> <span class="sourceLineNo">162</span> {<a name="line.162"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/DoubleField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/DoubleField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/DoubleField.html Sun Feb 11 17:30:40 2018 @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> * Processor for double fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> <span class="sourceLineNo">028</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.28"></a> -<span class="sourceLineNo">029</span> * @version $Id: DoubleField.java 1770205 2016-11-17 15:03:41Z tv $<a name="line.29"></a> +<span class="sourceLineNo">029</span> * @version $Id: DoubleField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.29"></a> <span class="sourceLineNo">030</span> */<a name="line.30"></a> <span class="sourceLineNo">031</span>public class DoubleField<a name="line.31"></a> <span class="sourceLineNo">032</span> extends Field<Double><a name="line.32"></a> @@ -143,7 +143,7 @@ <span class="sourceLineNo">135</span> for (int i = 0; i < inputs.length; i++)<a name="line.135"></a> <span class="sourceLineNo">136</span> {<a name="line.136"></a> <span class="sourceLineNo">137</span> values[i] = inputs[i] == null<a name="line.137"></a> -<span class="sourceLineNo">138</span> ? (getEmptyValue()).doubleValue()<a name="line.138"></a> +<span class="sourceLineNo">138</span> ? getEmptyValue().doubleValue()<a name="line.138"></a> <span class="sourceLineNo">139</span> : inputs[i].doubleValue();<a name="line.139"></a> <span class="sourceLineNo">140</span> }<a name="line.140"></a> <span class="sourceLineNo">141</span><a name="line.141"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.FieldCtor.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.FieldCtor.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.FieldCtor.html Sun Feb 11 17:30:40 2018 @@ -201,7 +201,7 @@ <span class="sourceLineNo">193</span><a name="line.193"></a> <span class="sourceLineNo">194</span> protected interface FieldCtor<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> -<span class="sourceLineNo">196</span> public Field<?> getInstance(XmlField f, Group g) throws IntakeException;<a name="line.196"></a> +<span class="sourceLineNo">196</span> Field<?> getInstance(XmlField f, Group g) throws IntakeException;<a name="line.196"></a> <span class="sourceLineNo">197</span> }<a name="line.197"></a> <span class="sourceLineNo">198</span><a name="line.198"></a> <span class="sourceLineNo">199</span> /**<a name="line.199"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FieldAdapter.html Sun Feb 11 17:30:40 2018 @@ -201,7 +201,7 @@ <span class="sourceLineNo">193</span><a name="line.193"></a> <span class="sourceLineNo">194</span> protected interface FieldCtor<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> -<span class="sourceLineNo">196</span> public Field<?> getInstance(XmlField f, Group g) throws IntakeException;<a name="line.196"></a> +<span class="sourceLineNo">196</span> Field<?> getInstance(XmlField f, Group g) throws IntakeException;<a name="line.196"></a> <span class="sourceLineNo">197</span> }<a name="line.197"></a> <span class="sourceLineNo">198</span><a name="line.198"></a> <span class="sourceLineNo">199</span> /**<a name="line.199"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FloatField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FloatField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/FloatField.html Sun Feb 11 17:30:40 2018 @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> * Processor for float fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> <span class="sourceLineNo">028</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.28"></a> -<span class="sourceLineNo">029</span> * @version $Id: FloatField.java 1770205 2016-11-17 15:03:41Z tv $<a name="line.29"></a> +<span class="sourceLineNo">029</span> * @version $Id: FloatField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.29"></a> <span class="sourceLineNo">030</span> */<a name="line.30"></a> <span class="sourceLineNo">031</span>public class FloatField<a name="line.31"></a> <span class="sourceLineNo">032</span> extends Field<Float><a name="line.32"></a> @@ -143,7 +143,7 @@ <span class="sourceLineNo">135</span> for (int i = 0; i < inputs.length; i++)<a name="line.135"></a> <span class="sourceLineNo">136</span> {<a name="line.136"></a> <span class="sourceLineNo">137</span> values[i] = inputs[i] == null<a name="line.137"></a> -<span class="sourceLineNo">138</span> ? (getEmptyValue()).floatValue()<a name="line.138"></a> +<span class="sourceLineNo">138</span> ? getEmptyValue().floatValue()<a name="line.138"></a> <span class="sourceLineNo">139</span> : inputs[i].floatValue();<a name="line.139"></a> <span class="sourceLineNo">140</span> }<a name="line.140"></a> <span class="sourceLineNo">141</span><a name="line.141"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/IntegerField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/IntegerField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/IntegerField.html Sun Feb 11 17:30:40 2018 @@ -33,7 +33,7 @@ <span class="sourceLineNo">025</span>/**<a name="line.25"></a> <span class="sourceLineNo">026</span> * Processor for int fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @version $Id: IntegerField.java 1773047 2016-12-07 11:14:53Z tv $<a name="line.28"></a> +<span class="sourceLineNo">028</span> * @version $Id: IntegerField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.28"></a> <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>public class IntegerField<a name="line.30"></a> <span class="sourceLineNo">031</span> extends Field<Integer><a name="line.31"></a> @@ -142,7 +142,7 @@ <span class="sourceLineNo">134</span> for (int i = 0; i < inputs.length; i++)<a name="line.134"></a> <span class="sourceLineNo">135</span> {<a name="line.135"></a> <span class="sourceLineNo">136</span> values[i] = inputs[i] == null<a name="line.136"></a> -<span class="sourceLineNo">137</span> ? (getEmptyValue()).intValue()<a name="line.137"></a> +<span class="sourceLineNo">137</span> ? getEmptyValue().intValue()<a name="line.137"></a> <span class="sourceLineNo">138</span> : inputs[i].intValue();<a name="line.138"></a> <span class="sourceLineNo">139</span> }<a name="line.139"></a> <span class="sourceLineNo">140</span><a name="line.140"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/LongField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/LongField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/LongField.html Sun Feb 11 17:30:40 2018 @@ -33,7 +33,7 @@ <span class="sourceLineNo">025</span>/**<a name="line.25"></a> <span class="sourceLineNo">026</span> * Processor for long fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @version $Id: LongField.java 1773047 2016-12-07 11:14:53Z tv $<a name="line.28"></a> +<span class="sourceLineNo">028</span> * @version $Id: LongField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.28"></a> <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>public class LongField<a name="line.30"></a> <span class="sourceLineNo">031</span> extends Field<Long><a name="line.31"></a> @@ -141,7 +141,7 @@ <span class="sourceLineNo">133</span> for (int i = 0; i < inputs.length; i++)<a name="line.133"></a> <span class="sourceLineNo">134</span> {<a name="line.134"></a> <span class="sourceLineNo">135</span> values[i] = inputs[i] == null<a name="line.135"></a> -<span class="sourceLineNo">136</span> ? (getEmptyValue()).longValue()<a name="line.136"></a> +<span class="sourceLineNo">136</span> ? getEmptyValue().longValue()<a name="line.136"></a> <span class="sourceLineNo">137</span> : inputs[i].longValue();<a name="line.137"></a> <span class="sourceLineNo">138</span> }<a name="line.138"></a> <span class="sourceLineNo">139</span><a name="line.139"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/ShortField.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/ShortField.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/model/ShortField.html Sun Feb 11 17:30:40 2018 @@ -33,7 +33,7 @@ <span class="sourceLineNo">025</span>/**<a name="line.25"></a> <span class="sourceLineNo">026</span> * Processor for short fields.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @version $Id: ShortField.java 1773047 2016-12-07 11:14:53Z tv $<a name="line.28"></a> +<span class="sourceLineNo">028</span> * @version $Id: ShortField.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.28"></a> <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>public class ShortField<a name="line.30"></a> <span class="sourceLineNo">031</span> extends Field<Short><a name="line.31"></a> @@ -142,7 +142,7 @@ <span class="sourceLineNo">134</span> for (int i = 0; i < inputs.length; i++)<a name="line.134"></a> <span class="sourceLineNo">135</span> {<a name="line.135"></a> <span class="sourceLineNo">136</span> values[i] = inputs[i] == null<a name="line.136"></a> -<span class="sourceLineNo">137</span> ? (getEmptyValue()).shortValue()<a name="line.137"></a> +<span class="sourceLineNo">137</span> ? getEmptyValue().shortValue()<a name="line.137"></a> <span class="sourceLineNo">138</span> : inputs[i].shortValue();<a name="line.138"></a> <span class="sourceLineNo">139</span> }<a name="line.139"></a> <span class="sourceLineNo">140</span><a name="line.140"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BigDecimalValidator.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BigDecimalValidator.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BigDecimalValidator.html Sun Feb 11 17:30:40 2018 @@ -28,63 +28,52 @@ <span class="sourceLineNo">020</span> */<a name="line.20"></a> <span class="sourceLineNo">021</span><a name="line.21"></a> <span class="sourceLineNo">022</span>import java.math.BigDecimal;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.text.NumberFormat;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.text.ParseException;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import java.util.Locale;<a name="line.25"></a> -<span class="sourceLineNo">026</span><a name="line.26"></a> -<span class="sourceLineNo">027</span><a name="line.27"></a> -<span class="sourceLineNo">028</span>/**<a name="line.28"></a> -<span class="sourceLineNo">029</span> * Validates BigDecimals with the following constraints in addition to those<a name="line.29"></a> -<span class="sourceLineNo">030</span> * listed in NumberValidator and DefaultValidator.<a name="line.30"></a> -<span class="sourceLineNo">031</span> *<a name="line.31"></a> -<span class="sourceLineNo">032</span> * <table><a name="line.32"></a> -<span class="sourceLineNo">033</span> * <caption>Validation rules</caption><a name="line.33"></a> -<span class="sourceLineNo">034</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.34"></a> -<span class="sourceLineNo">035</span> * <tr><td>minValue</td><td>greater than BigDecimal minValue</td><a name="line.35"></a> +<span class="sourceLineNo">023</span>import java.util.Locale;<a name="line.23"></a> +<span class="sourceLineNo">024</span><a name="line.24"></a> +<span class="sourceLineNo">025</span><a name="line.25"></a> +<span class="sourceLineNo">026</span>/**<a name="line.26"></a> +<span class="sourceLineNo">027</span> * Validates BigDecimals with the following constraints in addition to those<a name="line.27"></a> +<span class="sourceLineNo">028</span> * listed in NumberValidator and DefaultValidator.<a name="line.28"></a> +<span class="sourceLineNo">029</span> *<a name="line.29"></a> +<span class="sourceLineNo">030</span> * <table><a name="line.30"></a> +<span class="sourceLineNo">031</span> * <caption>Validation rules</caption><a name="line.31"></a> +<span class="sourceLineNo">032</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.32"></a> +<span class="sourceLineNo">033</span> * <tr><td>minValue</td><td>greater than BigDecimal minValue</td><a name="line.33"></a> +<span class="sourceLineNo">034</span> * <td>&nbsp;</td></tr><a name="line.34"></a> +<span class="sourceLineNo">035</span> * <tr><td>maxValue</td><td>less than BigDecimal maxValue</td><a name="line.35"></a> <span class="sourceLineNo">036</span> * <td>&nbsp;</td></tr><a name="line.36"></a> -<span class="sourceLineNo">037</span> * <tr><td>maxValue</td><td>less than BigDecimal maxValue</td><a name="line.37"></a> -<span class="sourceLineNo">038</span> * <td>&nbsp;</td></tr><a name="line.38"></a> -<span class="sourceLineNo">039</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.39"></a> -<span class="sourceLineNo">040</span> * <td>Entry was not a valid number</td></tr><a name="line.40"></a> -<span class="sourceLineNo">041</span> * </table><a name="line.41"></a> -<span class="sourceLineNo">042</span> *<a name="line.42"></a> -<span class="sourceLineNo">043</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.43"></a> -<span class="sourceLineNo">044</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.44"></a> -<span class="sourceLineNo">045</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.45"></a> -<span class="sourceLineNo">046</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.46"></a> -<span class="sourceLineNo">047</span> * @version $Id: BigDecimalValidator.java 1771953 2016-11-29 20:29:12Z tv $<a name="line.47"></a> -<span class="sourceLineNo">048</span> */<a name="line.48"></a> -<span class="sourceLineNo">049</span>public class BigDecimalValidator<a name="line.49"></a> -<span class="sourceLineNo">050</span> extends NumberValidator<BigDecimal><a name="line.50"></a> -<span class="sourceLineNo">051</span>{<a name="line.51"></a> -<span class="sourceLineNo">052</span> /**<a name="line.52"></a> -<span class="sourceLineNo">053</span> * Default Constructor<a name="line.53"></a> -<span class="sourceLineNo">054</span> */<a name="line.54"></a> -<span class="sourceLineNo">055</span> public BigDecimalValidator()<a name="line.55"></a> -<span class="sourceLineNo">056</span> {<a name="line.56"></a> -<span class="sourceLineNo">057</span> super();<a name="line.57"></a> -<span class="sourceLineNo">058</span> invalidNumberMessage = "Entry was not a valid BigDecimal";<a name="line.58"></a> -<span class="sourceLineNo">059</span> }<a name="line.59"></a> -<span class="sourceLineNo">060</span><a name="line.60"></a> -<span class="sourceLineNo">061</span> /**<a name="line.61"></a> -<span class="sourceLineNo">062</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.62"></a> -<span class="sourceLineNo">063</span> */<a name="line.63"></a> -<span class="sourceLineNo">064</span> @Override<a name="line.64"></a> -<span class="sourceLineNo">065</span> protected BigDecimal parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.65"></a> -<span class="sourceLineNo">066</span> {<a name="line.66"></a> -<span class="sourceLineNo">067</span> NumberFormat nf = NumberFormat.getInstance(locale);<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> try<a name="line.69"></a> -<span class="sourceLineNo">070</span> {<a name="line.70"></a> -<span class="sourceLineNo">071</span> Number number = nf.parse(stringValue);<a name="line.71"></a> -<span class="sourceLineNo">072</span> return new BigDecimal(number.doubleValue());<a name="line.72"></a> -<span class="sourceLineNo">073</span> }<a name="line.73"></a> -<span class="sourceLineNo">074</span> catch (ParseException e)<a name="line.74"></a> -<span class="sourceLineNo">075</span> {<a name="line.75"></a> -<span class="sourceLineNo">076</span> throw new NumberFormatException(e.getMessage());<a name="line.76"></a> -<span class="sourceLineNo">077</span> }<a name="line.77"></a> -<span class="sourceLineNo">078</span> }<a name="line.78"></a> -<span class="sourceLineNo">079</span>}<a name="line.79"></a> +<span class="sourceLineNo">037</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.37"></a> +<span class="sourceLineNo">038</span> * <td>Entry was not a valid number</td></tr><a name="line.38"></a> +<span class="sourceLineNo">039</span> * </table><a name="line.39"></a> +<span class="sourceLineNo">040</span> *<a name="line.40"></a> +<span class="sourceLineNo">041</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.41"></a> +<span class="sourceLineNo">042</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.42"></a> +<span class="sourceLineNo">043</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.43"></a> +<span class="sourceLineNo">044</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.44"></a> +<span class="sourceLineNo">045</span> * @version $Id: BigDecimalValidator.java 1823857 2018-02-11 17:11:55Z tv $<a name="line.45"></a> +<span class="sourceLineNo">046</span> */<a name="line.46"></a> +<span class="sourceLineNo">047</span>public class BigDecimalValidator<a name="line.47"></a> +<span class="sourceLineNo">048</span> extends NumberValidator<BigDecimal><a name="line.48"></a> +<span class="sourceLineNo">049</span>{<a name="line.49"></a> +<span class="sourceLineNo">050</span> /**<a name="line.50"></a> +<span class="sourceLineNo">051</span> * Default Constructor<a name="line.51"></a> +<span class="sourceLineNo">052</span> */<a name="line.52"></a> +<span class="sourceLineNo">053</span> public BigDecimalValidator()<a name="line.53"></a> +<span class="sourceLineNo">054</span> {<a name="line.54"></a> +<span class="sourceLineNo">055</span> super();<a name="line.55"></a> +<span class="sourceLineNo">056</span> invalidNumberMessage = "Entry was not a valid BigDecimal";<a name="line.56"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> +<span class="sourceLineNo">058</span><a name="line.58"></a> +<span class="sourceLineNo">059</span> /**<a name="line.59"></a> +<span class="sourceLineNo">060</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.60"></a> +<span class="sourceLineNo">061</span> */<a name="line.61"></a> +<span class="sourceLineNo">062</span> @Override<a name="line.62"></a> +<span class="sourceLineNo">063</span> protected BigDecimal parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.63"></a> +<span class="sourceLineNo">064</span> {<a name="line.64"></a> +<span class="sourceLineNo">065</span> Number number = parseIntoNumber(stringValue, locale);<a name="line.65"></a> +<span class="sourceLineNo">066</span> return new BigDecimal(number.doubleValue());<a name="line.66"></a> +<span class="sourceLineNo">067</span> }<a name="line.67"></a> +<span class="sourceLineNo">068</span>}<a name="line.68"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BooleanValidator.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BooleanValidator.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/BooleanValidator.html Sun Feb 11 17:30:40 2018 @@ -60,7 +60,7 @@ <span class="sourceLineNo">052</span> * @author <a href="mailto:[email protected]">Quinton McCombs</a><a name="line.52"></a> <span class="sourceLineNo">053</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.53"></a> <span class="sourceLineNo">054</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.54"></a> -<span class="sourceLineNo">055</span> * @version $Id: BooleanValidator.java 1823842 2018-02-11 14:55:11Z tv $<a name="line.55"></a> +<span class="sourceLineNo">055</span> * @version $Id: BooleanValidator.java 1823858 2018-02-11 17:23:06Z tv $<a name="line.55"></a> <span class="sourceLineNo">056</span> */<a name="line.56"></a> <span class="sourceLineNo">057</span>public class BooleanValidator<a name="line.57"></a> <span class="sourceLineNo">058</span> extends DefaultValidator<Boolean><a name="line.58"></a> @@ -122,14 +122,14 @@ <span class="sourceLineNo">114</span> cnt < Math.max(trueValues.length, falseValues.length); cnt++)<a name="line.114"></a> <span class="sourceLineNo">115</span> {<a name="line.115"></a> <span class="sourceLineNo">116</span> // Short-cut evaluation or bust!<a name="line.116"></a> -<span class="sourceLineNo">117</span> if ((cnt < trueValues.length) &&<a name="line.117"></a> +<span class="sourceLineNo">117</span> if (cnt < trueValues.length &&<a name="line.117"></a> <span class="sourceLineNo">118</span> stringValue.equalsIgnoreCase(trueValues[cnt]))<a name="line.118"></a> <span class="sourceLineNo">119</span> {<a name="line.119"></a> <span class="sourceLineNo">120</span> result = Boolean.TRUE;<a name="line.120"></a> <span class="sourceLineNo">121</span> break;<a name="line.121"></a> <span class="sourceLineNo">122</span> }<a name="line.122"></a> <span class="sourceLineNo">123</span><a name="line.123"></a> -<span class="sourceLineNo">124</span> if ((cnt < falseValues.length) &&<a name="line.124"></a> +<span class="sourceLineNo">124</span> if (cnt < falseValues.length &&<a name="line.124"></a> <span class="sourceLineNo">125</span> stringValue.equalsIgnoreCase(falseValues[cnt]))<a name="line.125"></a> <span class="sourceLineNo">126</span> {<a name="line.126"></a> <span class="sourceLineNo">127</span> result = Boolean.FALSE;<a name="line.127"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/CompareCallback.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/CompareCallback.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/CompareCallback.html Sun Feb 11 17:30:40 2018 @@ -46,7 +46,7 @@ <span class="sourceLineNo">038</span> *<a name="line.38"></a> <span class="sourceLineNo">039</span> * @return the result of the comparison<a name="line.39"></a> <span class="sourceLineNo">040</span> */<a name="line.40"></a> -<span class="sourceLineNo">041</span> public boolean compareValues(Comparison compare, T thisValue, T refValue);<a name="line.41"></a> +<span class="sourceLineNo">041</span> boolean compareValues(Comparison compare, T thisValue, T refValue);<a name="line.41"></a> <span class="sourceLineNo">042</span>}<a name="line.42"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/DoubleValidator.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/DoubleValidator.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/DoubleValidator.html Sun Feb 11 17:30:40 2018 @@ -8,80 +8,51 @@ <div class="sourceContainer"> <pre><span class="sourceLineNo">001</span>package org.apache.fulcrum.intake.validator;<a name="line.1"></a> <span class="sourceLineNo">002</span><a name="line.2"></a> -<span class="sourceLineNo">003</span>/*<a name="line.3"></a> -<span class="sourceLineNo">004</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.4"></a> -<span class="sourceLineNo">005</span> * or more contributor license agreements. See the NOTICE file<a name="line.5"></a> -<span class="sourceLineNo">006</span> * distributed with this work for additional information<a name="line.6"></a> -<span class="sourceLineNo">007</span> * regarding copyright ownership. The ASF licenses this file<a name="line.7"></a> -<span class="sourceLineNo">008</span> * to you under the Apache License, Version 2.0 (the<a name="line.8"></a> -<span class="sourceLineNo">009</span> * "License"); you may not use this file except in compliance<a name="line.9"></a> -<span class="sourceLineNo">010</span> * with the License. You may obtain a copy of the License at<a name="line.10"></a> -<span class="sourceLineNo">011</span> *<a name="line.11"></a> -<span class="sourceLineNo">012</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a> -<span class="sourceLineNo">013</span> *<a name="line.13"></a> -<span class="sourceLineNo">014</span> * Unless required by applicable law or agreed to in writing,<a name="line.14"></a> -<span class="sourceLineNo">015</span> * software distributed under the License is distributed on an<a name="line.15"></a> -<span class="sourceLineNo">016</span> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY<a name="line.16"></a> -<span class="sourceLineNo">017</span> * KIND, either express or implied. See the License for the<a name="line.17"></a> -<span class="sourceLineNo">018</span> * specific language governing permissions and limitations<a name="line.18"></a> -<span class="sourceLineNo">019</span> * under the License.<a name="line.19"></a> -<span class="sourceLineNo">020</span> */<a name="line.20"></a> -<span class="sourceLineNo">021</span><a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.text.NumberFormat;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.text.ParseException;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.util.Locale;<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span>/**<a name="line.26"></a> -<span class="sourceLineNo">027</span> * Validates Doubles with the following constraints in addition to those<a name="line.27"></a> -<span class="sourceLineNo">028</span> * listed in NumberValidator and DefaultValidator.<a name="line.28"></a> -<span class="sourceLineNo">029</span> *<a name="line.29"></a> -<span class="sourceLineNo">030</span> * <table><a name="line.30"></a> -<span class="sourceLineNo">031</span> * <caption>Validation rules</caption><a name="line.31"></a> -<span class="sourceLineNo">032</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.32"></a> -<span class="sourceLineNo">033</span> * <tr><td>minValue</td><td>greater than Double.MIN_VALUE</td><a name="line.33"></a> -<span class="sourceLineNo">034</span> * <td>&nbsp;</td></tr><a name="line.34"></a> -<span class="sourceLineNo">035</span> * <tr><td>maxValue</td><td>less than Double.MAX_VALUE</td><a name="line.35"></a> -<span class="sourceLineNo">036</span> * <td>&nbsp;</td></tr><a name="line.36"></a> -<span class="sourceLineNo">037</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.37"></a> -<span class="sourceLineNo">038</span> * <td>Entry was not a valid number</td></tr><a name="line.38"></a> -<span class="sourceLineNo">039</span> * </table><a name="line.39"></a> -<span class="sourceLineNo">040</span> *<a name="line.40"></a> -<span class="sourceLineNo">041</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.41"></a> -<span class="sourceLineNo">042</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.42"></a> -<span class="sourceLineNo">043</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.43"></a> -<span class="sourceLineNo">044</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.44"></a> -<span class="sourceLineNo">045</span> * @version $Id: DoubleValidator.java 1771953 2016-11-29 20:29:12Z tv $<a name="line.45"></a> -<span class="sourceLineNo">046</span> */<a name="line.46"></a> -<span class="sourceLineNo">047</span>public class DoubleValidator<a name="line.47"></a> -<span class="sourceLineNo">048</span> extends NumberValidator<Double><a name="line.48"></a> -<span class="sourceLineNo">049</span>{<a name="line.49"></a> -<span class="sourceLineNo">050</span> /**<a name="line.50"></a> -<span class="sourceLineNo">051</span> * Default Constructor<a name="line.51"></a> -<span class="sourceLineNo">052</span> */<a name="line.52"></a> -<span class="sourceLineNo">053</span> public DoubleValidator()<a name="line.53"></a> -<span class="sourceLineNo">054</span> {<a name="line.54"></a> -<span class="sourceLineNo">055</span> super();<a name="line.55"></a> -<span class="sourceLineNo">056</span> invalidNumberMessage = "Entry was not a valid Double";<a name="line.56"></a> -<span class="sourceLineNo">057</span> }<a name="line.57"></a> -<span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> /**<a name="line.59"></a> -<span class="sourceLineNo">060</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.60"></a> -<span class="sourceLineNo">061</span> */<a name="line.61"></a> -<span class="sourceLineNo">062</span> @Override<a name="line.62"></a> -<span class="sourceLineNo">063</span> protected Double parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.63"></a> -<span class="sourceLineNo">064</span> {<a name="line.64"></a> -<span class="sourceLineNo">065</span> NumberFormat nf = NumberFormat.getInstance(locale);<a name="line.65"></a> -<span class="sourceLineNo">066</span><a name="line.66"></a> -<span class="sourceLineNo">067</span> try<a name="line.67"></a> -<span class="sourceLineNo">068</span> {<a name="line.68"></a> -<span class="sourceLineNo">069</span> return Double.valueOf(nf.parse(stringValue).doubleValue());<a name="line.69"></a> -<span class="sourceLineNo">070</span> }<a name="line.70"></a> -<span class="sourceLineNo">071</span> catch (ParseException e)<a name="line.71"></a> -<span class="sourceLineNo">072</span> {<a name="line.72"></a> -<span class="sourceLineNo">073</span> throw new NumberFormatException(e.getMessage());<a name="line.73"></a> -<span class="sourceLineNo">074</span> }<a name="line.74"></a> -<span class="sourceLineNo">075</span> }<a name="line.75"></a> -<span class="sourceLineNo">076</span>}<a name="line.76"></a> +<span class="sourceLineNo">003</span>import java.util.Locale;<a name="line.3"></a> +<span class="sourceLineNo">004</span><a name="line.4"></a> +<span class="sourceLineNo">005</span>/**<a name="line.5"></a> +<span class="sourceLineNo">006</span> * Validates Doubles with the following constraints in addition to those<a name="line.6"></a> +<span class="sourceLineNo">007</span> * listed in NumberValidator and DefaultValidator.<a name="line.7"></a> +<span class="sourceLineNo">008</span> *<a name="line.8"></a> +<span class="sourceLineNo">009</span> * <table><a name="line.9"></a> +<span class="sourceLineNo">010</span> * <caption>Validation rules</caption><a name="line.10"></a> +<span class="sourceLineNo">011</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.11"></a> +<span class="sourceLineNo">012</span> * <tr><td>minValue</td><td>greater than Double.MIN_VALUE</td><a name="line.12"></a> +<span class="sourceLineNo">013</span> * <td>&nbsp;</td></tr><a name="line.13"></a> +<span class="sourceLineNo">014</span> * <tr><td>maxValue</td><td>less than Double.MAX_VALUE</td><a name="line.14"></a> +<span class="sourceLineNo">015</span> * <td>&nbsp;</td></tr><a name="line.15"></a> +<span class="sourceLineNo">016</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.16"></a> +<span class="sourceLineNo">017</span> * <td>Entry was not a valid number</td></tr><a name="line.17"></a> +<span class="sourceLineNo">018</span> * </table><a name="line.18"></a> +<span class="sourceLineNo">019</span> *<a name="line.19"></a> +<span class="sourceLineNo">020</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.20"></a> +<span class="sourceLineNo">021</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.21"></a> +<span class="sourceLineNo">022</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.22"></a> +<span class="sourceLineNo">023</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.23"></a> +<span class="sourceLineNo">024</span> * @version $Id: DoubleValidator.java 1823857 2018-02-11 17:11:55Z tv $<a name="line.24"></a> +<span class="sourceLineNo">025</span> */<a name="line.25"></a> +<span class="sourceLineNo">026</span>public class DoubleValidator<a name="line.26"></a> +<span class="sourceLineNo">027</span> extends NumberValidator<Double><a name="line.27"></a> +<span class="sourceLineNo">028</span>{<a name="line.28"></a> +<span class="sourceLineNo">029</span> /**<a name="line.29"></a> +<span class="sourceLineNo">030</span> * Default Constructor<a name="line.30"></a> +<span class="sourceLineNo">031</span> */<a name="line.31"></a> +<span class="sourceLineNo">032</span> public DoubleValidator()<a name="line.32"></a> +<span class="sourceLineNo">033</span> {<a name="line.33"></a> +<span class="sourceLineNo">034</span> super();<a name="line.34"></a> +<span class="sourceLineNo">035</span> invalidNumberMessage = "Entry was not a valid Double";<a name="line.35"></a> +<span class="sourceLineNo">036</span> }<a name="line.36"></a> +<span class="sourceLineNo">037</span><a name="line.37"></a> +<span class="sourceLineNo">038</span> /**<a name="line.38"></a> +<span class="sourceLineNo">039</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.39"></a> +<span class="sourceLineNo">040</span> */<a name="line.40"></a> +<span class="sourceLineNo">041</span> @Override<a name="line.41"></a> +<span class="sourceLineNo">042</span> protected Double parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.42"></a> +<span class="sourceLineNo">043</span> {<a name="line.43"></a> +<span class="sourceLineNo">044</span> Number number = parseIntoNumber(stringValue, locale);<a name="line.44"></a> +<span class="sourceLineNo">045</span> return Double.valueOf(number.doubleValue());<a name="line.45"></a> +<span class="sourceLineNo">046</span> }<a name="line.46"></a> +<span class="sourceLineNo">047</span>}<a name="line.47"></a> Modified: websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/FloatValidator.html ============================================================================== --- websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/FloatValidator.html (original) +++ websites/production/turbine/content/fulcrum/fulcrum-intake/apidocs/src-html/org/apache/fulcrum/intake/validator/FloatValidator.html Sun Feb 11 17:30:40 2018 @@ -8,80 +8,51 @@ <div class="sourceContainer"> <pre><span class="sourceLineNo">001</span>package org.apache.fulcrum.intake.validator;<a name="line.1"></a> <span class="sourceLineNo">002</span><a name="line.2"></a> -<span class="sourceLineNo">003</span>/*<a name="line.3"></a> -<span class="sourceLineNo">004</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.4"></a> -<span class="sourceLineNo">005</span> * or more contributor license agreements. See the NOTICE file<a name="line.5"></a> -<span class="sourceLineNo">006</span> * distributed with this work for additional information<a name="line.6"></a> -<span class="sourceLineNo">007</span> * regarding copyright ownership. The ASF licenses this file<a name="line.7"></a> -<span class="sourceLineNo">008</span> * to you under the Apache License, Version 2.0 (the<a name="line.8"></a> -<span class="sourceLineNo">009</span> * "License"); you may not use this file except in compliance<a name="line.9"></a> -<span class="sourceLineNo">010</span> * with the License. You may obtain a copy of the License at<a name="line.10"></a> -<span class="sourceLineNo">011</span> *<a name="line.11"></a> -<span class="sourceLineNo">012</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a> -<span class="sourceLineNo">013</span> *<a name="line.13"></a> -<span class="sourceLineNo">014</span> * Unless required by applicable law or agreed to in writing,<a name="line.14"></a> -<span class="sourceLineNo">015</span> * software distributed under the License is distributed on an<a name="line.15"></a> -<span class="sourceLineNo">016</span> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY<a name="line.16"></a> -<span class="sourceLineNo">017</span> * KIND, either express or implied. See the License for the<a name="line.17"></a> -<span class="sourceLineNo">018</span> * specific language governing permissions and limitations<a name="line.18"></a> -<span class="sourceLineNo">019</span> * under the License.<a name="line.19"></a> -<span class="sourceLineNo">020</span> */<a name="line.20"></a> -<span class="sourceLineNo">021</span><a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.text.NumberFormat;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.text.ParseException;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.util.Locale;<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span>/**<a name="line.26"></a> -<span class="sourceLineNo">027</span> * Validates Floats with the following constraints in addition to those<a name="line.27"></a> -<span class="sourceLineNo">028</span> * listed in NumberValidator and DefaultValidator.<a name="line.28"></a> -<span class="sourceLineNo">029</span> *<a name="line.29"></a> -<span class="sourceLineNo">030</span> * <table><a name="line.30"></a> -<span class="sourceLineNo">031</span> * <caption>Validation rules</caption><a name="line.31"></a> -<span class="sourceLineNo">032</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.32"></a> -<span class="sourceLineNo">033</span> * <tr><td>minValue</td><td>greater than Float.MIN_VALUE</td><a name="line.33"></a> -<span class="sourceLineNo">034</span> * <td>&nbsp;</td></tr><a name="line.34"></a> -<span class="sourceLineNo">035</span> * <tr><td>maxValue</td><td>less than Float.MAX_VALUE</td><a name="line.35"></a> -<span class="sourceLineNo">036</span> * <td>&nbsp;</td></tr><a name="line.36"></a> -<span class="sourceLineNo">037</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.37"></a> -<span class="sourceLineNo">038</span> * <td>Entry was not a valid number</td></tr><a name="line.38"></a> -<span class="sourceLineNo">039</span> * </table><a name="line.39"></a> -<span class="sourceLineNo">040</span> *<a name="line.40"></a> -<span class="sourceLineNo">041</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.41"></a> -<span class="sourceLineNo">042</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.42"></a> -<span class="sourceLineNo">043</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.43"></a> -<span class="sourceLineNo">044</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.44"></a> -<span class="sourceLineNo">045</span> * @version $Id: FloatValidator.java 1771953 2016-11-29 20:29:12Z tv $<a name="line.45"></a> -<span class="sourceLineNo">046</span> */<a name="line.46"></a> -<span class="sourceLineNo">047</span>public class FloatValidator<a name="line.47"></a> -<span class="sourceLineNo">048</span> extends NumberValidator<Float><a name="line.48"></a> -<span class="sourceLineNo">049</span>{<a name="line.49"></a> -<span class="sourceLineNo">050</span> /**<a name="line.50"></a> -<span class="sourceLineNo">051</span> * Default Constructor<a name="line.51"></a> -<span class="sourceLineNo">052</span> */<a name="line.52"></a> -<span class="sourceLineNo">053</span> public FloatValidator()<a name="line.53"></a> -<span class="sourceLineNo">054</span> {<a name="line.54"></a> -<span class="sourceLineNo">055</span> super();<a name="line.55"></a> -<span class="sourceLineNo">056</span> invalidNumberMessage = "Entry was not a valid Float";<a name="line.56"></a> -<span class="sourceLineNo">057</span> }<a name="line.57"></a> -<span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> /**<a name="line.59"></a> -<span class="sourceLineNo">060</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.60"></a> -<span class="sourceLineNo">061</span> */<a name="line.61"></a> -<span class="sourceLineNo">062</span> @Override<a name="line.62"></a> -<span class="sourceLineNo">063</span> protected Float parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.63"></a> -<span class="sourceLineNo">064</span> {<a name="line.64"></a> -<span class="sourceLineNo">065</span> NumberFormat nf = NumberFormat.getInstance(locale);<a name="line.65"></a> -<span class="sourceLineNo">066</span><a name="line.66"></a> -<span class="sourceLineNo">067</span> try<a name="line.67"></a> -<span class="sourceLineNo">068</span> {<a name="line.68"></a> -<span class="sourceLineNo">069</span> return Float.valueOf(nf.parse(stringValue).floatValue());<a name="line.69"></a> -<span class="sourceLineNo">070</span> }<a name="line.70"></a> -<span class="sourceLineNo">071</span> catch (ParseException e)<a name="line.71"></a> -<span class="sourceLineNo">072</span> {<a name="line.72"></a> -<span class="sourceLineNo">073</span> throw new NumberFormatException(e.getMessage());<a name="line.73"></a> -<span class="sourceLineNo">074</span> }<a name="line.74"></a> -<span class="sourceLineNo">075</span> }<a name="line.75"></a> -<span class="sourceLineNo">076</span>}<a name="line.76"></a> +<span class="sourceLineNo">003</span>import java.util.Locale;<a name="line.3"></a> +<span class="sourceLineNo">004</span><a name="line.4"></a> +<span class="sourceLineNo">005</span>/**<a name="line.5"></a> +<span class="sourceLineNo">006</span> * Validates Floats with the following constraints in addition to those<a name="line.6"></a> +<span class="sourceLineNo">007</span> * listed in NumberValidator and DefaultValidator.<a name="line.7"></a> +<span class="sourceLineNo">008</span> *<a name="line.8"></a> +<span class="sourceLineNo">009</span> * <table><a name="line.9"></a> +<span class="sourceLineNo">010</span> * <caption>Validation rules</caption><a name="line.10"></a> +<span class="sourceLineNo">011</span> * <tr><th>Name</th><th>Valid Values</th><th>Default Value</th></tr><a name="line.11"></a> +<span class="sourceLineNo">012</span> * <tr><td>minValue</td><td>greater than Float.MIN_VALUE</td><a name="line.12"></a> +<span class="sourceLineNo">013</span> * <td>&nbsp;</td></tr><a name="line.13"></a> +<span class="sourceLineNo">014</span> * <tr><td>maxValue</td><td>less than Float.MAX_VALUE</td><a name="line.14"></a> +<span class="sourceLineNo">015</span> * <td>&nbsp;</td></tr><a name="line.15"></a> +<span class="sourceLineNo">016</span> * <tr><td>invalidNumberMessage</td><td>Some text</td><a name="line.16"></a> +<span class="sourceLineNo">017</span> * <td>Entry was not a valid number</td></tr><a name="line.17"></a> +<span class="sourceLineNo">018</span> * </table><a name="line.18"></a> +<span class="sourceLineNo">019</span> *<a name="line.19"></a> +<span class="sourceLineNo">020</span> * @author <a href="mailto:[email protected]">John McNally</a><a name="line.20"></a> +<span class="sourceLineNo">021</span> * @author <a href="mailto:[email protected]">Colin Chalmers</a><a name="line.21"></a> +<span class="sourceLineNo">022</span> * @author <a href="mailto:[email protected]">J&uuml;rgen Hoffmann</a><a name="line.22"></a> +<span class="sourceLineNo">023</span> * @author <a href="mailto:[email protected]">Thomas Vandahl</a><a name="line.23"></a> +<span class="sourceLineNo">024</span> * @version $Id: FloatValidator.java 1823857 2018-02-11 17:11:55Z tv $<a name="line.24"></a> +<span class="sourceLineNo">025</span> */<a name="line.25"></a> +<span class="sourceLineNo">026</span>public class FloatValidator<a name="line.26"></a> +<span class="sourceLineNo">027</span> extends NumberValidator<Float><a name="line.27"></a> +<span class="sourceLineNo">028</span>{<a name="line.28"></a> +<span class="sourceLineNo">029</span> /**<a name="line.29"></a> +<span class="sourceLineNo">030</span> * Default Constructor<a name="line.30"></a> +<span class="sourceLineNo">031</span> */<a name="line.31"></a> +<span class="sourceLineNo">032</span> public FloatValidator()<a name="line.32"></a> +<span class="sourceLineNo">033</span> {<a name="line.33"></a> +<span class="sourceLineNo">034</span> super();<a name="line.34"></a> +<span class="sourceLineNo">035</span> invalidNumberMessage = "Entry was not a valid Float";<a name="line.35"></a> +<span class="sourceLineNo">036</span> }<a name="line.36"></a> +<span class="sourceLineNo">037</span><a name="line.37"></a> +<span class="sourceLineNo">038</span> /**<a name="line.38"></a> +<span class="sourceLineNo">039</span> * @see org.apache.fulcrum.intake.validator.NumberValidator#parseNumber(java.lang.String, java.util.Locale)<a name="line.39"></a> +<span class="sourceLineNo">040</span> */<a name="line.40"></a> +<span class="sourceLineNo">041</span> @Override<a name="line.41"></a> +<span class="sourceLineNo">042</span> protected Float parseNumber(String stringValue, Locale locale) throws NumberFormatException<a name="line.42"></a> +<span class="sourceLineNo">043</span> {<a name="line.43"></a> +<span class="sourceLineNo">044</span> Number number = parseIntoNumber(stringValue, locale);<a name="line.44"></a> +<span class="sourceLineNo">045</span> return Float.valueOf(number.floatValue());<a name="line.45"></a> +<span class="sourceLineNo">046</span> }<a name="line.46"></a> +<span class="sourceLineNo">047</span>}<a name="line.47"></a>
