commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brit...@apache.org
Subject svn commit: r936080 [9/44] - in /websites/production/commons/content/proper/commons-validator: ./ apidocs/ apidocs/org/apache/commons/validator/ apidocs/org/apache/commons/validator/class-use/ apidocs/org/apache/commons/validator/routines/ apidocs/org/...
Date Tue, 13 Jan 2015 20:07:39 GMT
Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/DoubleValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/DoubleValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/DoubleValidator.html Tue Jan 13 20:07:34 2015
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> *    one of the &lt;code&gt;validate()&lt;/code&gt; methods to validate and receive a<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *    &lt;i&gt;converted&lt;/i&gt; &lt;code&gt;Double&lt;/code&gt; value.&lt;/p&gt;<a name="line.38"></a>
 <span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.40"></a>
 <span class="sourceLineNo">041</span> *    methods can be used to perform minimum, maximum and range checks:&lt;/p&gt;<a name="line.41"></a>
 <span class="sourceLineNo">042</span> *    &lt;ul&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *       &lt;li&gt;&lt;code&gt;minValue()&lt;/code&gt; checks whether the value is greater<a name="line.43"></a>
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span> *       &lt;li&gt;using a specified pattern with a specified &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *    &lt;/ul&gt;<a name="line.60"></a>
 <span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.62"></a>
+<span class="sourceLineNo">062</span> * @version $Revision: 1649191 $<a name="line.62"></a>
 <span class="sourceLineNo">063</span> * @since Validator 1.3.0<a name="line.63"></a>
 <span class="sourceLineNo">064</span> */<a name="line.64"></a>
 <span class="sourceLineNo">065</span>public class DoubleValidator extends AbstractNumberValidator {<a name="line.65"></a>
@@ -252,12 +252,11 @@
 <span class="sourceLineNo">244</span><a name="line.244"></a>
 <span class="sourceLineNo">245</span>        if (value instanceof Double) {<a name="line.245"></a>
 <span class="sourceLineNo">246</span>            return value;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        } else {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>            return new Double(((Number)value).doubleValue());<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>}<a name="line.252"></a>
+<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        return new Double(((Number)value).doubleValue());<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>}<a name="line.251"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/EmailValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/EmailValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/EmailValidator.html Tue Jan 13 20:07:34 2015
@@ -31,159 +31,146 @@
 <span class="sourceLineNo">023</span>/**<a name="line.23"></a>
 <span class="sourceLineNo">024</span> * &lt;p&gt;Perform email validations.&lt;/p&gt;<a name="line.24"></a>
 <span class="sourceLineNo">025</span> * &lt;p&gt;<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * This class is a Singleton; you can retrieve the instance via the getInstance() method.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;/p&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;p&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * Based on a script by &lt;a href="mailto:stamhankar@hotmail.com"&gt;Sandeep V. Tamhankar&lt;/a&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * http://javascript.internet.com<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * &lt;/p&gt;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * &lt;p&gt;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * This implementation is not guaranteed to catch all possible errors in an email address.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * For example, an address like nobody@noplace.somedog will pass validator, even though there<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * is no TLD "somedog"<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * &lt;/p&gt;.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * @version $Revision: 1608584 $ $Date: 2014-07-07 21:54:07 +0200 (Mo, 07 Jul 2014) $<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @since Validator 1.4<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>public class EmailValidator implements Serializable {<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>    private static final long serialVersionUID = 1705927040799295880L;<a name="line.43"></a>
+<span class="sourceLineNo">026</span> * Based on a script by &lt;a href="mailto:stamhankar@hotmail.com"&gt;Sandeep V. Tamhankar&lt;/a&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * http://javascript.internet.com<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;/p&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * &lt;p&gt;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * This implementation is not guaranteed to catch all possible errors in an email address.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * &lt;/p&gt;.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @version $Revision: 1649927 $<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * @since Validator 1.4<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class EmailValidator implements Serializable {<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>    private static final long serialVersionUID = 1705927040799295880L;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>    private static final String SPECIAL_CHARS = "\\p{Cntrl}\\(\\)&lt;&gt;@,;:'\\\\\\\"\\.\\[\\]";<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    private static final String VALID_CHARS = "[^\\s" + SPECIAL_CHARS + "]";<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    private static final String QUOTED_USER = "(\"[^\"]*\")";<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    private static final String WORD = "((" + VALID_CHARS + "|')+|" + QUOTED_USER + ")";<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>    private static final String SPECIAL_CHARS = "\\p{Cntrl}\\(\\)&lt;&gt;@,;:'\\\\\\\"\\.\\[\\]";<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    private static final String VALID_CHARS = "[^\\s" + SPECIAL_CHARS + "]";<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    private static final String QUOTED_USER = "(\"[^\"]*\")";<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    private static final String WORD = "((" + VALID_CHARS + "|')+|" + QUOTED_USER + ")";<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>    private static final String LEGAL_ASCII_REGEX = "^\\p{ASCII}+$";<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    private static final String EMAIL_REGEX = "^\\s*?(.+)@(.+?)\\s*$";<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    private static final String IP_DOMAIN_REGEX = "^\\[(.*)\\]$";<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    private static final String USER_REGEX = "^\\s*" + WORD + "(\\." + WORD + ")*$";<a name="line.53"></a>
+<span class="sourceLineNo">045</span>    private static final String EMAIL_REGEX = "^\\s*?(.+)@(.+?)\\s*$";<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    private static final String IP_DOMAIN_REGEX = "^\\[(.*)\\]$";<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    private static final String USER_REGEX = "^\\s*" + WORD + "(\\." + WORD + ")*$";<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>    private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    private static final Pattern IP_DOMAIN_PATTERN = Pattern.compile(IP_DOMAIN_REGEX);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    private static final Pattern USER_PATTERN = Pattern.compile(USER_REGEX);<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>    private final boolean allowLocal;<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>    private static final Pattern MATCH_ASCII_PATTERN = Pattern.compile(LEGAL_ASCII_REGEX);<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    private static final Pattern IP_DOMAIN_PATTERN = Pattern.compile(IP_DOMAIN_REGEX);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    private static final Pattern USER_PATTERN = Pattern.compile(USER_REGEX);<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>    private final boolean allowLocal;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>    /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>     * Singleton instance of this class, which<a name="line.63"></a>
-<span class="sourceLineNo">064</span>     *  doesn't consider local addresses as valid.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>     */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    private static final EmailValidator EMAIL_VALIDATOR = new EmailValidator(false);<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>
-<span class="sourceLineNo">069</span>     * Singleton instance of this class, which does<a name="line.69"></a>
-<span class="sourceLineNo">070</span>     *  consider local addresses valid.<a name="line.70"></a>
+<span class="sourceLineNo">055</span>    /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span>     * Singleton instance of this class, which<a name="line.56"></a>
+<span class="sourceLineNo">057</span>     *  doesn't consider local addresses as valid.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>     */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    private static final EmailValidator EMAIL_VALIDATOR = new EmailValidator(false);<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>     * Singleton instance of this class, which does<a name="line.62"></a>
+<span class="sourceLineNo">063</span>     *  consider local addresses valid.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>     */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL = new EmailValidator(true);<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>    /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span>     * Returns the Singleton instance of this validator.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>     *<a name="line.69"></a>
+<span class="sourceLineNo">070</span>     * @return singleton instance of this validator.<a name="line.70"></a>
 <span class="sourceLineNo">071</span>     */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL = new EmailValidator(true);<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>     * Returns the Singleton instance of this validator.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>     *<a name="line.76"></a>
-<span class="sourceLineNo">077</span>     * @return singleton instance of this validator.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>     */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public static EmailValidator getInstance() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        return EMAIL_VALIDATOR;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>    /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span>     * Returns the Singleton instance of this validator,<a name="line.84"></a>
-<span class="sourceLineNo">085</span>     *  with local validation as required.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>     *<a name="line.86"></a>
-<span class="sourceLineNo">087</span>     * @param allowLocal Should local addresses be considered valid?<a name="line.87"></a>
-<span class="sourceLineNo">088</span>     * @return singleton instance of this validator<a name="line.88"></a>
-<span class="sourceLineNo">089</span>     */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    public static EmailValidator getInstance(boolean allowLocal) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        if(allowLocal) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>           return EMAIL_VALIDATOR_WITH_LOCAL;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        return EMAIL_VALIDATOR;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span>     * Protected constructor for subclasses to use.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>     *<a name="line.99"></a>
-<span class="sourceLineNo">100</span>     * @param allowLocal Should local addresses be considered valid?<a name="line.100"></a>
-<span class="sourceLineNo">101</span>     */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    protected EmailValidator(boolean allowLocal) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        super();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        this.allowLocal = allowLocal;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>    /**<a name="line.107"></a>
-<span class="sourceLineNo">108</span>     * &lt;p&gt;Checks if a field has a valid e-mail address.&lt;/p&gt;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>     *<a name="line.109"></a>
-<span class="sourceLineNo">110</span>     * @param email The value validation is being performed on.  A &lt;code&gt;null&lt;/code&gt;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>     *              value is considered invalid.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>     * @return true if the email address is valid.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>     */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    public boolean isValid(String email) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        if (email == null) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            return false;<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>        Matcher asciiMatcher = MATCH_ASCII_PATTERN.matcher(email);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        if (!asciiMatcher.matches()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            return false;<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>        // Check the whole email address structure<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        Matcher emailMatcher = EMAIL_PATTERN.matcher(email);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        if (!emailMatcher.matches()) {<a name="line.126"></a>
+<span class="sourceLineNo">072</span>    public static EmailValidator getInstance() {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        return EMAIL_VALIDATOR;<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">077</span>     * Returns the Singleton instance of this validator,<a name="line.77"></a>
+<span class="sourceLineNo">078</span>     *  with local validation as required.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>     *<a name="line.79"></a>
+<span class="sourceLineNo">080</span>     * @param allowLocal Should local addresses be considered valid?<a name="line.80"></a>
+<span class="sourceLineNo">081</span>     * @return singleton instance of this validator<a name="line.81"></a>
+<span class="sourceLineNo">082</span>     */<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    public static EmailValidator getInstance(boolean allowLocal) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        if(allowLocal) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>           return EMAIL_VALIDATOR_WITH_LOCAL;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        return EMAIL_VALIDATOR;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span>     * Protected constructor for subclasses to use.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>     *<a name="line.92"></a>
+<span class="sourceLineNo">093</span>     * @param allowLocal Should local addresses be considered valid?<a name="line.93"></a>
+<span class="sourceLineNo">094</span>     */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    protected EmailValidator(boolean allowLocal) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        super();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        this.allowLocal = allowLocal;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span>     * &lt;p&gt;Checks if a field has a valid e-mail address.&lt;/p&gt;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>     *<a name="line.102"></a>
+<span class="sourceLineNo">103</span>     * @param email The value validation is being performed on.  A &lt;code&gt;null&lt;/code&gt;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>     *              value is considered invalid.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>     * @return true if the email address is valid.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>     */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    public boolean isValid(String email) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        if (email == null) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            return false;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>        if (email.endsWith(".")) { // check this first - it's cheap!<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            return false;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>        // Check the whole email address structure<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        Matcher emailMatcher = EMAIL_PATTERN.matcher(email);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        if (!emailMatcher.matches()) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>            return false;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>        }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>        if (!isValidUser(emailMatcher.group(1))) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>            return false;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>        if (!isValidDomain(emailMatcher.group(2))) {<a name="line.126"></a>
 <span class="sourceLineNo">127</span>            return false;<a name="line.127"></a>
 <span class="sourceLineNo">128</span>        }<a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>        if (email.endsWith(".")) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            return false;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>        if (!isValidUser(emailMatcher.group(1))) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            return false;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>        if (!isValidDomain(emailMatcher.group(2))) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            return false;<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>
-<span class="sourceLineNo">142</span>        return true;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span>     * Returns true if the domain component of an email address is valid.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>     *<a name="line.147"></a>
-<span class="sourceLineNo">148</span>     * @param domain being validated.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>     * @return true if the email address's domain is valid.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>     */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    protected boolean isValidDomain(String domain) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        // see if domain is an IP address in brackets<a name="line.152"></a>
-<span class="sourceLineNo">153</span>        Matcher ipDomainMatcher = IP_DOMAIN_PATTERN.matcher(domain);<a name="line.153"></a>
+<span class="sourceLineNo">130</span>        return true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>    /**<a name="line.133"></a>
+<span class="sourceLineNo">134</span>     * Returns true if the domain component of an email address is valid.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>     *<a name="line.135"></a>
+<span class="sourceLineNo">136</span>     * @param domain being validated, may be in IDN format<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     * @return true if the email address's domain is valid.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>     */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    protected boolean isValidDomain(String domain) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        // see if domain is an IP address in brackets<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        Matcher ipDomainMatcher = IP_DOMAIN_PATTERN.matcher(domain);<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>        if (ipDomainMatcher.matches()) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            InetAddressValidator inetAddressValidator =<a name="line.144"></a>
+<span class="sourceLineNo">145</span>                    InetAddressValidator.getInstance();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            return inetAddressValidator.isValid(ipDomainMatcher.group(1));<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        // Domain is symbolic name<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        DomainValidator domainValidator =<a name="line.149"></a>
+<span class="sourceLineNo">150</span>                DomainValidator.getInstance(allowLocal);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>        return domainValidator.isValid(domain) ||<a name="line.151"></a>
+<span class="sourceLineNo">152</span>                domainValidator.isValidTld(domain);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
 <span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>        if (ipDomainMatcher.matches()) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>            InetAddressValidator inetAddressValidator =<a name="line.156"></a>
-<span class="sourceLineNo">157</span>                    InetAddressValidator.getInstance();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>            return inetAddressValidator.isValid(ipDomainMatcher.group(1));<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        } else {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            // Domain is symbolic name<a name="line.160"></a>
-<span class="sourceLineNo">161</span>            DomainValidator domainValidator =<a name="line.161"></a>
-<span class="sourceLineNo">162</span>                    DomainValidator.getInstance(allowLocal);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>            return domainValidator.isValid(domain) ||<a name="line.163"></a>
-<span class="sourceLineNo">164</span>                    domainValidator.isValidTld(domain);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     * Returns true if the user component of an email address is valid.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     *<a name="line.170"></a>
-<span class="sourceLineNo">171</span>     * @param user being validated<a name="line.171"></a>
-<span class="sourceLineNo">172</span>     * @return true if the user name is valid.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>     */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    protected boolean isValidUser(String user) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        return USER_PATTERN.matcher(user).matches();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>}<a name="line.178"></a>
+<span class="sourceLineNo">155</span>    /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span>     * Returns true if the user component of an email address is valid.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>     *<a name="line.157"></a>
+<span class="sourceLineNo">158</span>     * @param user being validated<a name="line.158"></a>
+<span class="sourceLineNo">159</span>     * @return true if the user name is valid.<a name="line.159"></a>
+<span class="sourceLineNo">160</span>     */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    protected boolean isValidUser(String user) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        return USER_PATTERN.matcher(user).matches();<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>}<a name="line.165"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/FloatValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/FloatValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/FloatValidator.html Tue Jan 13 20:07:34 2015
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> *    one of the &lt;code&gt;validate()&lt;/code&gt; methods to validate and receive a<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *    &lt;i&gt;converted&lt;/i&gt; &lt;code&gt;Float&lt;/code&gt; value.&lt;/p&gt;<a name="line.38"></a>
 <span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.40"></a>
 <span class="sourceLineNo">041</span> *    methods can be used to perform minimum, maximum and range checks:&lt;/p&gt;<a name="line.41"></a>
 <span class="sourceLineNo">042</span> *    &lt;ul&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *       &lt;li&gt;&lt;code&gt;minValue()&lt;/code&gt; checks whether the value is greater<a name="line.43"></a>
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span> *       &lt;li&gt;using a specified pattern with a specified &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *    &lt;/ul&gt;<a name="line.60"></a>
 <span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.62"></a>
+<span class="sourceLineNo">062</span> * @version $Revision: 1649191 $<a name="line.62"></a>
 <span class="sourceLineNo">063</span> * @since Validator 1.3.0<a name="line.63"></a>
 <span class="sourceLineNo">064</span> */<a name="line.64"></a>
 <span class="sourceLineNo">065</span>public class FloatValidator extends AbstractNumberValidator {<a name="line.65"></a>

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ISBNValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ISBNValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ISBNValidator.html Tue Jan 13 20:07:34 2015
@@ -58,7 +58,7 @@
 <span class="sourceLineNo">050</span> *       Transition details&lt;/a&gt;.&lt;/li&gt;<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * &lt;/ul&gt;<a name="line.51"></a>
 <span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * @version $Revision: 1441678 $ $Date: 2013-02-02 02:31:07 +0100 (Sa, 02 Feb 2013) $<a name="line.53"></a>
+<span class="sourceLineNo">053</span> * @version $Revision: 1649191 $<a name="line.53"></a>
 <span class="sourceLineNo">054</span> * @since Validator 1.4<a name="line.54"></a>
 <span class="sourceLineNo">055</span> */<a name="line.55"></a>
 <span class="sourceLineNo">056</span>public class ISBNValidator implements Serializable {<a name="line.56"></a>

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/InetAddressValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/InetAddressValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/InetAddressValidator.html Tue Jan 13 20:07:34 2015
@@ -26,86 +26,171 @@
 <span class="sourceLineNo">018</span>package org.apache.commons.validator.routines;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.Serializable;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;p&gt;&lt;b&gt;InetAddress&lt;/b&gt; validation and conversion routines (&lt;code&gt;java.net.InetAddress&lt;/code&gt;).&lt;/p&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * &lt;p&gt;This class provides methods to validate a candidate IP address.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> *<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;p&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * This class is a Singleton; you can retrieve the instance via the {@link #getInstance()} method.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * &lt;/p&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * @version $Revision: 1227719 $<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * @since Validator 1.4<a name="line.32"></a>
-<span class="sourceLineNo">033</span> */<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class InetAddressValidator implements Serializable {<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>    private static final long serialVersionUID = -919201640201914789L;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>    private static final String IPV4_REGEX =<a name="line.38"></a>
-<span class="sourceLineNo">039</span>            "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$";<a name="line.39"></a>
+<span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Arrays;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.List;<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> * &lt;p&gt;&lt;b&gt;InetAddress&lt;/b&gt; validation and conversion routines (&lt;code&gt;java.net.InetAddress&lt;/code&gt;).&lt;/p&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;p&gt;This class provides methods to validate a candidate IP address.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * &lt;p&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * This class is a Singleton; you can retrieve the instance via the {@link #getInstance()} method.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * &lt;/p&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * @version $Revision: 1650785 $<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * @since Validator 1.4<a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public class InetAddressValidator implements Serializable {<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>    private static final long serialVersionUID = -919201640201914789L;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>    /**<a name="line.41"></a>
-<span class="sourceLineNo">042</span>     * Singleton instance of this class.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>     */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    private static final InetAddressValidator VALIDATOR = new InetAddressValidator();<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>    /** IPv4 RegexValidator */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    private final RegexValidator ipv4Validator = new RegexValidator(IPV4_REGEX);<a name="line.47"></a>
+<span class="sourceLineNo">041</span>    private static final String IPV4_REGEX =<a name="line.41"></a>
+<span class="sourceLineNo">042</span>            "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$";<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>    /**<a name="line.44"></a>
+<span class="sourceLineNo">045</span>     * Singleton instance of this class.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>     */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    private static final InetAddressValidator VALIDATOR = new InetAddressValidator();<a name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>    /**<a name="line.49"></a>
-<span class="sourceLineNo">050</span>     * Returns the singleton instance of this validator.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>     * @return the singleton instance of this validator<a name="line.51"></a>
-<span class="sourceLineNo">052</span>     */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    public static InetAddressValidator getInstance() {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>        return VALIDATOR;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>    /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span>     * Checks if the specified string is a valid IP address.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>     * @param inetAddress the string to validate<a name="line.59"></a>
-<span class="sourceLineNo">060</span>     * @return true if the string validates as an IP address<a name="line.60"></a>
-<span class="sourceLineNo">061</span>     */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    public boolean isValid(String inetAddress) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>        return isValidInet4Address(inetAddress);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>     * Validates an IPv4 address. Returns true if valid.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>     * @param inet4Address the IPv4 address to validate<a name="line.68"></a>
-<span class="sourceLineNo">069</span>     * @return true if the argument contains a valid IPv4 address<a name="line.69"></a>
-<span class="sourceLineNo">070</span>     */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public boolean isValidInet4Address(String inet4Address) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>        // verify that address conforms to generic IPv4 format<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        String[] groups = ipv4Validator.match(inet4Address);<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>        if (groups == null) return false;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>        // verify that address subgroups are legal<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        for (int i = 0; i &lt;= 3; i++) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>            String ipSegment = groups[i];<a name="line.79"></a>
-<span class="sourceLineNo">080</span>            if (ipSegment == null || ipSegment.length() &lt;= 0) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>                return false;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>            }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>            int iIpSegment = 0;<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>            try {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>                iIpSegment = Integer.parseInt(ipSegment);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>            } catch(NumberFormatException e) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>                return false;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>            }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>            if (iIpSegment &gt; 255) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>                return false;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>            }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>        return true;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>}<a name="line.100"></a>
+<span class="sourceLineNo">049</span>    /** IPv4 RegexValidator */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    private final RegexValidator ipv4Validator = new RegexValidator(IPV4_REGEX);<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>     * Returns the singleton instance of this validator.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>     * @return the singleton instance of this validator<a name="line.54"></a>
+<span class="sourceLineNo">055</span>     */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    public static InetAddressValidator getInstance() {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>        return VALIDATOR;<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>    /**<a name="line.60"></a>
+<span class="sourceLineNo">061</span>     * Checks if the specified string is a valid IP address.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>     * @param inetAddress the string to validate<a name="line.62"></a>
+<span class="sourceLineNo">063</span>     * @return true if the string validates as an IP address<a name="line.63"></a>
+<span class="sourceLineNo">064</span>     */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    public boolean isValid(String inetAddress) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>        return isValidInet4Address(inetAddress) || isValidInet6Address(inetAddress);<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>
+<span class="sourceLineNo">069</span>    /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span>     * Validates an IPv4 address. Returns true if valid.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>     * @param inet4Address the IPv4 address to validate<a name="line.71"></a>
+<span class="sourceLineNo">072</span>     * @return true if the argument contains a valid IPv4 address<a name="line.72"></a>
+<span class="sourceLineNo">073</span>     */<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    public boolean isValidInet4Address(String inet4Address) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        // verify that address conforms to generic IPv4 format<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        String[] groups = ipv4Validator.match(inet4Address);<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>        if (groups == null) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>            return false;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>        // verify that address subgroups are legal<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        for (int i = 0; i &lt;= 3; i++) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>            String ipSegment = groups[i];<a name="line.84"></a>
+<span class="sourceLineNo">085</span>            if (ipSegment == null || ipSegment.length() == 0) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>                return false;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>            }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>            int iIpSegment = 0;<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>            try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>                iIpSegment = Integer.parseInt(ipSegment);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>            } catch(NumberFormatException e) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>                return false;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>            if (iIpSegment &gt; 255) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>                return false;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>            if (ipSegment.length() &gt; 1 &amp;&amp; ipSegment.startsWith("0")) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>                return false;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>        }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>        return true;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>     * Validates an IPv6 address. Returns true if valid.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>     * @param inet6Address the IPv6 address to validate<a name="line.112"></a>
+<span class="sourceLineNo">113</span>     * @return true if the argument contains a valid IPv6 address<a name="line.113"></a>
+<span class="sourceLineNo">114</span>     * <a name="line.114"></a>
+<span class="sourceLineNo">115</span>     * @since 1.4.1<a name="line.115"></a>
+<span class="sourceLineNo">116</span>     */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    public boolean isValidInet6Address(String inet6Address) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        boolean containsCompressedZeroes = inet6Address.indexOf("::") &gt; -1; // contains is Java 1.5<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        if (containsCompressedZeroes &amp;&amp; (inet6Address.indexOf("::") != inet6Address.lastIndexOf("::"))) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            return false;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        if ((inet6Address.startsWith(":") &amp;&amp; !inet6Address.startsWith("::"))<a name="line.122"></a>
+<span class="sourceLineNo">123</span>                || (inet6Address.endsWith(":") &amp;&amp; !inet6Address.endsWith("::"))) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            return false;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        Object[] octets = inet6Address.split(":");<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        if (containsCompressedZeroes) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            List octetList = new ArrayList(Arrays.asList(octets));<a name="line.128"></a>
+<span class="sourceLineNo">129</span>            if (inet6Address.endsWith("::")) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>                // String.split() drops ending empty segments<a name="line.130"></a>
+<span class="sourceLineNo">131</span>                octetList.add("");<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            } else if (inet6Address.startsWith("::") &amp;&amp; !octetList.isEmpty()) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>                octetList.remove(0);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>            }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            octets = octetList.toArray();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        if (octets.length &gt; 8) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            return false;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        int validOctets = 0;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        int emptyOctets = 0;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>        for (int index = 0; index &lt; octets.length; index++) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>            String octet = (String) octets[index];<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            if (octet.length() == 0) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>                emptyOctets++;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>                if (emptyOctets &gt; 1) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>                    return false;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>                }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>            } else {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>                emptyOctets = 0;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>                if (octet.indexOf(".") &gt; -1) { // contains is Java 1.5+<a name="line.151"></a>
+<span class="sourceLineNo">152</span>                    if (!inet6Address.endsWith(octet)) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>                        return false;<a name="line.153"></a>
+<span class="sourceLineNo">154</span>                    }<a name="line.154"></a>
+<span class="sourceLineNo">155</span>                    if (index &gt; octets.length - 1 || index &gt; 6) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>                        // IPV4 occupies last two octets<a name="line.156"></a>
+<span class="sourceLineNo">157</span>                        return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>                    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span>                    if (!isValidInet4Address(octet)) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>                        return false;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>                    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>                    validOctets += 2;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>                    continue;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>                }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>                if (octet.length() &gt; 4) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>                    return false;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>                }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>                int octetInt = 0;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>                try {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>                    octetInt = Integer.valueOf(octet, 16).intValue();<a name="line.170"></a>
+<span class="sourceLineNo">171</span>                } catch (NumberFormatException e) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                    return false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                if (octetInt &lt; 0 || octetInt &gt; 0xffff) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                    return false;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>            validOctets++;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        if (validOctets &lt; 8 &amp;&amp; !containsCompressedZeroes) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>            return false;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        return true;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>}<a name="line.185"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/IntegerValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/IntegerValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/IntegerValidator.html Tue Jan 13 20:07:34 2015
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> *    one of the &lt;code&gt;validate()&lt;/code&gt; methods to validate and receive a<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *    &lt;i&gt;converted&lt;/i&gt; &lt;code&gt;Integer&lt;/code&gt; value.&lt;/p&gt;<a name="line.38"></a>
 <span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.40"></a>
 <span class="sourceLineNo">041</span> *    methods can be used to perform minimum, maximum and range checks:&lt;/p&gt;<a name="line.41"></a>
 <span class="sourceLineNo">042</span> *    &lt;ul&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *       &lt;li&gt;&lt;code&gt;minValue()&lt;/code&gt; checks whether the value is greater<a name="line.43"></a>
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span> *       &lt;li&gt;using a specified pattern with a specified &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *    &lt;/ul&gt;<a name="line.60"></a>
 <span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.62"></a>
+<span class="sourceLineNo">062</span> * @version $Revision: 1649191 $<a name="line.62"></a>
 <span class="sourceLineNo">063</span> * @since Validator 1.3.0<a name="line.63"></a>
 <span class="sourceLineNo">064</span> */<a name="line.64"></a>
 <span class="sourceLineNo">065</span>public class IntegerValidator extends AbstractNumberValidator {<a name="line.65"></a>
@@ -256,11 +256,10 @@
 <span class="sourceLineNo">248</span>        if (longValue &lt; Integer.MIN_VALUE ||<a name="line.248"></a>
 <span class="sourceLineNo">249</span>            longValue &gt; Integer.MAX_VALUE) {<a name="line.249"></a>
 <span class="sourceLineNo">250</span>            return null;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        } else {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>            return new Integer((int)longValue);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>}<a name="line.255"></a>
+<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        return new Integer((int)longValue);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>}<a name="line.254"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/LongValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/LongValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/LongValidator.html Tue Jan 13 20:07:34 2015
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> *    one of the &lt;code&gt;validate()&lt;/code&gt; methods to validate and receive a<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *    &lt;i&gt;converted&lt;/i&gt; &lt;code&gt;Long&lt;/code&gt; value.&lt;/p&gt;<a name="line.38"></a>
 <span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.40"></a>
 <span class="sourceLineNo">041</span> *    methods can be used to perform minimum, maximum and range checks:&lt;/p&gt;<a name="line.41"></a>
 <span class="sourceLineNo">042</span> *    &lt;ul&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *       &lt;li&gt;&lt;code&gt;minValue()&lt;/code&gt; checks whether the value is greater<a name="line.43"></a>
@@ -66,7 +66,7 @@
 <span class="sourceLineNo">058</span> *       &lt;li&gt;using the format for the &lt;i&gt;default&lt;/i&gt; &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.58"></a>
 <span class="sourceLineNo">059</span> *    &lt;/ul&gt;<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.61"></a>
+<span class="sourceLineNo">061</span> * @version $Revision: 1649191 $<a name="line.61"></a>
 <span class="sourceLineNo">062</span> * @since Validator 1.3.0<a name="line.62"></a>
 <span class="sourceLineNo">063</span> */<a name="line.63"></a>
 <span class="sourceLineNo">064</span>public class LongValidator extends AbstractNumberValidator {<a name="line.64"></a>
@@ -251,12 +251,11 @@
 <span class="sourceLineNo">243</span><a name="line.243"></a>
 <span class="sourceLineNo">244</span>        if (value instanceof Long) {<a name="line.244"></a>
 <span class="sourceLineNo">245</span>            return value;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>            return new Long(((Number)value).longValue());<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>}<a name="line.251"></a>
+<span class="sourceLineNo">246</span>        }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        return new Long(((Number)value).longValue());<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span>}<a name="line.250"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/PercentValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/PercentValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/PercentValidator.html Tue Jan 13 20:07:34 2015
@@ -50,7 +50,7 @@
 <span class="sourceLineNo">042</span> *    and BigInteger) since percentages are converted to fractions (i.e &lt;code&gt;50%&lt;/code&gt; is<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *    converted to &lt;code&gt;0.5&lt;/code&gt;).&lt;/p&gt;<a name="line.43"></a>
 <span class="sourceLineNo">044</span> *<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.45"></a>
+<span class="sourceLineNo">045</span> * @version $Revision: 1649191 $<a name="line.45"></a>
 <span class="sourceLineNo">046</span> * @since Validator 1.3.0<a name="line.46"></a>
 <span class="sourceLineNo">047</span> */<a name="line.47"></a>
 <span class="sourceLineNo">048</span>public class PercentValidator extends BigDecimalValidator {<a name="line.48"></a>

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/RegexValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/RegexValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/RegexValidator.html Tue Jan 13 20:07:34 2015
@@ -70,7 +70,7 @@
 <span class="sourceLineNo">062</span> * to the {@link Pattern} API are safe to use in a multi-threaded environment.<a name="line.62"></a>
 <span class="sourceLineNo">063</span> * &lt;/p&gt;<a name="line.63"></a>
 <span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @version $Revision: 1647900 $ $Date: 2014-12-25 16:03:53 +0100 (Do, 25 Dez 2014) $<a name="line.65"></a>
+<span class="sourceLineNo">065</span> * @version $Revision: 1649191 $<a name="line.65"></a>
 <span class="sourceLineNo">066</span> * @since Validator 1.4<a name="line.66"></a>
 <span class="sourceLineNo">067</span> */<a name="line.67"></a>
 <span class="sourceLineNo">068</span>public class RegexValidator implements Serializable {<a name="line.68"></a>

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ShortValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ShortValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/ShortValidator.html Tue Jan 13 20:07:34 2015
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> *    one of the &lt;code&gt;validate()&lt;/code&gt; methods to validate and receive a<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *    &lt;i&gt;converted&lt;/i&gt; &lt;code&gt;Short&lt;/code&gt; value.&lt;/p&gt;<a name="line.38"></a>
 <span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.40"></a>
 <span class="sourceLineNo">041</span> *    methods can be used to perform minimum, maximum and range checks:&lt;/p&gt;<a name="line.41"></a>
 <span class="sourceLineNo">042</span> *    &lt;ul&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *       &lt;li&gt;&lt;code&gt;minValue()&lt;/code&gt; checks whether the value is greater<a name="line.43"></a>
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span> *       &lt;li&gt;using a specified pattern with a specified &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *    &lt;/ul&gt;<a name="line.60"></a>
 <span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.62"></a>
+<span class="sourceLineNo">062</span> * @version $Revision: 1649191 $<a name="line.62"></a>
 <span class="sourceLineNo">063</span> * @since Validator 1.3.0<a name="line.63"></a>
 <span class="sourceLineNo">064</span> */<a name="line.64"></a>
 <span class="sourceLineNo">065</span>public class ShortValidator extends AbstractNumberValidator {<a name="line.65"></a>
@@ -256,11 +256,10 @@
 <span class="sourceLineNo">248</span>        if (longValue &lt; Short.MIN_VALUE ||<a name="line.248"></a>
 <span class="sourceLineNo">249</span>            longValue &gt; Short.MAX_VALUE) {<a name="line.249"></a>
 <span class="sourceLineNo">250</span>            return null;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        } else {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>            return new Short((short)longValue);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>}<a name="line.255"></a>
+<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        return new Short((short)longValue);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>}<a name="line.254"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/TimeValidator.html
==============================================================================
--- websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/TimeValidator.html (original)
+++ websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/TimeValidator.html Tue Jan 13 20:07:34 2015
@@ -60,20 +60,20 @@
 <span class="sourceLineNo">052</span> *    can be used to adjust the &lt;code&gt;TimeZone&lt;/code&gt; of the &lt;code&gt;Calendar&lt;/code&gt;<a name="line.52"></a>
 <span class="sourceLineNo">053</span> *    object afterwards.&lt;/p&gt;<a name="line.53"></a>
 <span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;p&gt;Once a value has been sucessfully converted the following<a name="line.55"></a>
+<span class="sourceLineNo">055</span> * &lt;p&gt;Once a value has been successfully converted the following<a name="line.55"></a>
 <span class="sourceLineNo">056</span> *    methods can be used to perform various time comparison checks:&lt;/p&gt;<a name="line.56"></a>
 <span class="sourceLineNo">057</span> *    &lt;ul&gt;<a name="line.57"></a>
 <span class="sourceLineNo">058</span> *       &lt;li&gt;&lt;code&gt;compareTime()&lt;/code&gt; compares the hours, minutes, seconds<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *           and milliseconds of two calendars, returing 0, -1 or +1 indicating<a name="line.59"></a>
+<span class="sourceLineNo">059</span> *           and milliseconds of two calendars, returning 0, -1 or +1 indicating<a name="line.59"></a>
 <span class="sourceLineNo">060</span> *           whether the first time is equal, before or after the second.&lt;/li&gt;<a name="line.60"></a>
 <span class="sourceLineNo">061</span> *       &lt;li&gt;&lt;code&gt;compareSeconds()&lt;/code&gt; compares the hours, minutes and<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *           seconds of two times, returing 0, -1 or +1 indicating<a name="line.62"></a>
+<span class="sourceLineNo">062</span> *           seconds of two times, returning 0, -1 or +1 indicating<a name="line.62"></a>
 <span class="sourceLineNo">063</span> *           whether the first is equal to, before or after the second.&lt;/li&gt;<a name="line.63"></a>
 <span class="sourceLineNo">064</span> *       &lt;li&gt;&lt;code&gt;compareMinutes()&lt;/code&gt; compares the hours and minutes<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *           two times, returing 0, -1 or +1 indicating<a name="line.65"></a>
+<span class="sourceLineNo">065</span> *           two times, returning 0, -1 or +1 indicating<a name="line.65"></a>
 <span class="sourceLineNo">066</span> *           whether the first is equal to, before or after the second.&lt;/li&gt;<a name="line.66"></a>
 <span class="sourceLineNo">067</span> *       &lt;li&gt;&lt;code&gt;compareHours()&lt;/code&gt; compares the hours<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *           of two times, returing 0, -1 or +1 indicating<a name="line.68"></a>
+<span class="sourceLineNo">068</span> *           of two times, returning 0, -1 or +1 indicating<a name="line.68"></a>
 <span class="sourceLineNo">069</span> *           whether the first is equal to, before or after the second.&lt;/li&gt;<a name="line.69"></a>
 <span class="sourceLineNo">070</span> *    &lt;/ul&gt;<a name="line.70"></a>
 <span class="sourceLineNo">071</span> *<a name="line.71"></a>
@@ -87,7 +87,7 @@
 <span class="sourceLineNo">079</span> *       &lt;li&gt;using the format for the &lt;i&gt;default&lt;/i&gt; &lt;code&gt;Locale&lt;/code&gt;&lt;/li&gt;<a name="line.79"></a>
 <span class="sourceLineNo">080</span> *    &lt;/ul&gt;<a name="line.80"></a>
 <span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @version $Revision: 1227719 $ $Date: 2012-01-05 18:45:51 +0100 (Do, 05 Jan 2012) $<a name="line.82"></a>
+<span class="sourceLineNo">082</span> * @version $Revision: 1649191 $<a name="line.82"></a>
 <span class="sourceLineNo">083</span> * @since Validator 1.3.0<a name="line.83"></a>
 <span class="sourceLineNo">084</span> */<a name="line.84"></a>
 <span class="sourceLineNo">085</span>public class TimeValidator extends AbstractCalendarValidator {<a name="line.85"></a>



Mime
View raw message