svn commit: r936080 [10/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...

[britter]

Modified: 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/UrlValidator.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/UrlValidator.html
 (original)
+++ 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/UrlValidator.html
 Tue Jan 13 20:07:34 2015
@@ -25,9 +25,9 @@
 <span class="sourceLineNo">017</span>package 
org.apache.commons.validator.routines;<a name="line.17"></a>
 <span class="sourceLineNo">018</span><a name="line.18"></a>
 <span class="sourceLineNo">019</span>import java.io.Serializable;<a 
name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Arrays;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.Collections;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.HashSet;<a 
name="line.22"></a>
+<span class="sourceLineNo">020</span>import java.util.Collections;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.HashSet;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Locale;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.Set;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.regex.Matcher;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.util.regex.Pattern;<a 
name="line.25"></a>
@@ -77,7 +77,7 @@
 <span class="sourceLineNo">069</span> *  Uniform Resource Identifiers (URI): 
Generic Syntax<a name="line.69"></a>
 <span class="sourceLineNo">070</span> * &lt;/a&gt;<a name="line.70"></a>
 <span class="sourceLineNo">071</span> *<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * @version $Revision: 1647967 $ $Date: 
2014-12-26 13:44:11 +0100 (Fr, 26 Dez 2014) $<a name="line.72"></a>
+<span class="sourceLineNo">072</span> * @version $Revision: 1649932 $<a 
name="line.72"></a>
 <span class="sourceLineNo">073</span> * @since Validator 1.4<a 
name="line.73"></a>
 <span class="sourceLineNo">074</span> */<a name="line.74"></a>
 <span class="sourceLineNo">075</span>public class UrlValidator implements 
Serializable {<a name="line.75"></a>
@@ -108,142 +108,142 @@
 <span class="sourceLineNo">100</span>     */<a name="line.100"></a>
 <span class="sourceLineNo">101</span>    public static final long 
ALLOW_LOCAL_URLS = 1 &lt;&lt; 3;<a name="line.101"></a>
 <span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    // Drop numeric, and  "+-." for now<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    private static final String 
AUTHORITY_CHARS_REGEX = "\\p{Alnum}\\-\\.";<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>     * This expression derived/taken from 
the BNF for URI (RFC2396).<a name="line.107"></a>
-<span class="sourceLineNo">108</span>     */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    private static final String URL_REGEX 
=<a name="line.109"></a>
-<span class="sourceLineNo">110</span>            
"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?";<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    //        12            3  4          
5       6   7        8 9<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    private static final Pattern 
URL_PATTERN = Pattern.compile(URL_REGEX);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>    /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span>     * Schema/Protocol (ie. http:, ftp:, 
file:, etc).<a name="line.115"></a>
-<span class="sourceLineNo">116</span>     */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    private static final int 
PARSE_URL_SCHEME = 2;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>    /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>     * Includes hostname/ip and port 
number.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>     */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private static final int 
PARSE_URL_AUTHORITY = 4;<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>    private static final int 
PARSE_URL_PATH = 5;<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    private static final int 
PARSE_URL_QUERY = 7;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    private static final int 
PARSE_URL_FRAGMENT = 9;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    /**<a name="line.130"></a>
-<span class="sourceLineNo">131</span>     * Protocol (ie. http:, 
ftp:,https:).<a name="line.131"></a>
-<span class="sourceLineNo">132</span>     */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    private static final String 
SCHEME_REGEX = "^\\p{Alpha}[\\p{Alnum}\\+\\-\\.]*";<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    private static final Pattern 
SCHEME_PATTERN = Pattern.compile(SCHEME_REGEX);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>    private static final String 
AUTHORITY_REGEX =<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            "^([" + AUTHORITY_CHARS_REGEX 
+ "]*)(:\\d*)?(.*)?";<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    //        1                           
      2       3<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private static final Pattern 
AUTHORITY_PATTERN = Pattern.compile(AUTHORITY_REGEX);<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>    private static final int 
PARSE_AUTHORITY_HOST_IP = 1;<a name="line.141"></a>
+<span class="sourceLineNo">103</span>    /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span>     * This expression derived/taken from 
the BNF for URI (RFC2396).<a name="line.104"></a>
+<span class="sourceLineNo">105</span>     */<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    private static final String URL_REGEX 
=<a name="line.106"></a>
+<span class="sourceLineNo">107</span>            
"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?";<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    //        12            3  4          
5       6   7        8 9<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    private static final Pattern 
URL_PATTERN = Pattern.compile(URL_REGEX);<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>     * Schema/Protocol (ie. http:, ftp:, 
file:, etc).<a name="line.112"></a>
+<span class="sourceLineNo">113</span>     */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    private static final int 
PARSE_URL_SCHEME = 2;<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>    /**<a name="line.116"></a>
+<span class="sourceLineNo">117</span>     * Includes hostname/ip and port 
number.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>     */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    private static final int 
PARSE_URL_AUTHORITY = 4;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>    private static final int 
PARSE_URL_PATH = 5;<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>    private static final int 
PARSE_URL_QUERY = 7;<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    private static final int 
PARSE_URL_FRAGMENT = 9;<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>     * Protocol scheme (e.g. http, ftp, 
https).<a name="line.128"></a>
+<span class="sourceLineNo">129</span>     */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    private static final String 
SCHEME_REGEX = "^\\p{Alpha}[\\p{Alnum}\\+\\-\\.]*";<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    private static final Pattern 
SCHEME_PATTERN = Pattern.compile(SCHEME_REGEX);<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>    // Drop numeric, and  "+-." for now<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    // TODO does not allow for optional 
userinfo. <a name="line.134"></a>
+<span class="sourceLineNo">135</span>    // Validation of character set is 
done by isValidAuthority<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    private static final String 
AUTHORITY_CHARS_REGEX = "\\p{Alnum}\\-\\.";<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>    private static final String 
AUTHORITY_REGEX =<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            "^([" + AUTHORITY_CHARS_REGEX 
+ "]*)(:\\d*)?(.*)?";<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    //        1                           
      2       3<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    private static final Pattern 
AUTHORITY_PATTERN = Pattern.compile(AUTHORITY_REGEX);<a name="line.141"></a>
 <span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>    private static final int 
PARSE_AUTHORITY_PORT = 2;<a name="line.143"></a>
+<span class="sourceLineNo">143</span>    private static final int 
PARSE_AUTHORITY_HOST_IP = 1;<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>     * Should always be empty.<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>     */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    private static final int 
PARSE_AUTHORITY_EXTRA = 3;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    private static final String 
PATH_REGEX = "^(/[-\\w:@&amp;?=+,.!/~*'%$_;\\(\\)]*)?$";<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    private static final Pattern 
PATH_PATTERN = Pattern.compile(PATH_REGEX);<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    private static final String 
QUERY_REGEX = "^(.*)$";<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    private static final Pattern 
QUERY_PATTERN = Pattern.compile(QUERY_REGEX);<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private static final String 
LEGAL_ASCII_REGEX = "^\\p{ASCII}+$";<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    private static final Pattern 
ASCII_PATTERN = Pattern.compile(LEGAL_ASCII_REGEX);<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    private static final String 
PORT_REGEX = "^:(\\d{1,5})$";<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    private static final Pattern 
PORT_PATTERN = Pattern.compile(PORT_REGEX);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    /**<a name="line.162"></a>
-<span class="sourceLineNo">163</span>     * Holds the set of current 
validation options.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>     */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    private final long options;<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>     * The set of schemes that are 
allowed to be in a URL.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    private final Set allowedSchemes;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>     * Regular expressions used to 
manually validate authorities if IANA<a name="line.173"></a>
-<span class="sourceLineNo">174</span>     * domain name validation isn't 
desired.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>     */<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    private final RegexValidator 
authorityValidator;<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">179</span>     * If no schemes are provided, 
default to this set.<a name="line.179"></a>
-<span class="sourceLineNo">180</span>     */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    private static final String[] 
DEFAULT_SCHEMES = {"http", "https", "ftp"};<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>    /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>     * Singleton instance of this class 
with default schemes and options.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>     */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    private static final UrlValidator 
DEFAULT_URL_VALIDATOR = new UrlValidator();<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span>     * Returns the singleton instance of 
this class with default schemes and options.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>     * @return singleton instance with 
default schemes and options<a name="line.190"></a>
-<span class="sourceLineNo">191</span>     */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    public static UrlValidator 
getInstance() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        return DEFAULT_URL_VALIDATOR;<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    /**<a name="line.196"></a>
-<span class="sourceLineNo">197</span>     * Create a UrlValidator with default 
properties.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>     */<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    public UrlValidator() {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>        this(null);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>    /**<a name="line.203"></a>
-<span class="sourceLineNo">204</span>     * Behavior of validation is modified 
by passing in several strings options:<a name="line.204"></a>
-<span class="sourceLineNo">205</span>     * @param schemes Pass in one or more 
url schemes to consider valid, passing in<a name="line.205"></a>
-<span class="sourceLineNo">206</span>     *        a null will default to 
"http,https,ftp" being valid.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>     *        If a non-null schemes is 
specified then all valid schemes must<a name="line.207"></a>
-<span class="sourceLineNo">208</span>     *        be specified. Setting the 
ALLOW_ALL_SCHEMES option will<a name="line.208"></a>
-<span class="sourceLineNo">209</span>     *        ignore the contents of 
schemes.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>     */<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    public UrlValidator(String[] schemes) 
{<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        this(schemes, 0L);<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>    /**<a name="line.215"></a>
-<span class="sourceLineNo">216</span>     * Initialize a UrlValidator with the 
given validation options.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>     * @param options The options should 
be set using the public constants declared in<a name="line.217"></a>
-<span class="sourceLineNo">218</span>     * this class.  To set multiple 
options you simply add them together.  For example,<a name="line.218"></a>
-<span class="sourceLineNo">219</span>     * ALLOW_2_SLASHES + NO_FRAGMENTS 
enables both of those options.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>     */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    public UrlValidator(long options) {<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>        this(null, null, options);<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>    /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span>     * Behavior of validation is modified 
by passing in options:<a name="line.226"></a>
-<span class="sourceLineNo">227</span>     * @param schemes The set of valid 
schemes.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>     * @param options The options should 
be set using the public constants declared in<a name="line.228"></a>
-<span class="sourceLineNo">229</span>     * this class.  To set multiple 
options you simply add them together.  For example,<a name="line.229"></a>
-<span class="sourceLineNo">230</span>     * ALLOW_2_SLASHES + NO_FRAGMENTS 
enables both of those options.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>     */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    public UrlValidator(String[] schemes, 
long options) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        this(schemes, null, options);<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>    /**<a name="line.236"></a>
-<span class="sourceLineNo">237</span>     * Initialize a UrlValidator with the 
given validation options.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>     * @param authorityValidator Regular 
expression validator used to validate the authority part<a name="line.238"></a>
+<span class="sourceLineNo">145</span>    private static final int 
PARSE_AUTHORITY_PORT = 2;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span>     * Should always be empty. The code 
currently allows spaces.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>     */<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    private static final int 
PARSE_AUTHORITY_EXTRA = 3;<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>    private static final String 
PATH_REGEX = "^(/[-\\w:@&amp;?=+,.!/~*'%$_;\\(\\)]*)?$";<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    private static final Pattern 
PATH_PATTERN = Pattern.compile(PATH_REGEX);<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>    private static final String 
QUERY_REGEX = "^(.*)$";<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    private static final Pattern 
QUERY_PATTERN = Pattern.compile(QUERY_REGEX);<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    private static final String 
PORT_REGEX = "^:(\\d{1,5})$";<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    private static final Pattern 
PORT_PATTERN = Pattern.compile(PORT_REGEX);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     * Holds the set of current 
validation options.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     */<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    private final long options;<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>     * The set of schemes that are 
allowed to be in a URL.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>     */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    private final Set allowedSchemes; // 
Must be lower-case<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>    /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>     * Regular expressions used to 
manually validate authorities if IANA<a name="line.172"></a>
+<span class="sourceLineNo">173</span>     * domain name validation isn't 
desired.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>     */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    private final RegexValidator 
authorityValidator;<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>     * If no schemes are provided, 
default to this set.<a name="line.178"></a>
+<span class="sourceLineNo">179</span>     */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    private static final String[] 
DEFAULT_SCHEMES = {"http", "https", "ftp"}; // Must be lower-case<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>    /**<a name="line.182"></a>
+<span class="sourceLineNo">183</span>     * Singleton instance of this class 
with default schemes and options.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>     */<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    private static final UrlValidator 
DEFAULT_URL_VALIDATOR = new UrlValidator();<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>    /**<a name="line.187"></a>
+<span class="sourceLineNo">188</span>     * Returns the singleton instance of 
this class with default schemes and options.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>     * @return singleton instance with 
default schemes and options<a name="line.189"></a>
+<span class="sourceLineNo">190</span>     */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public static UrlValidator 
getInstance() {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        return DEFAULT_URL_VALIDATOR;<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>    /**<a name="line.195"></a>
+<span class="sourceLineNo">196</span>     * Create a UrlValidator with default 
properties.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>     */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    public UrlValidator() {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>        this(null);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    /**<a name="line.202"></a>
+<span class="sourceLineNo">203</span>     * Behavior of validation is modified 
by passing in several strings options:<a name="line.203"></a>
+<span class="sourceLineNo">204</span>     * @param schemes Pass in one or more 
url schemes to consider valid, passing in<a name="line.204"></a>
+<span class="sourceLineNo">205</span>     *        a null will default to 
"http,https,ftp" being valid.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>     *        If a non-null schemes is 
specified then all valid schemes must<a name="line.206"></a>
+<span class="sourceLineNo">207</span>     *        be specified. Setting the 
ALLOW_ALL_SCHEMES option will<a name="line.207"></a>
+<span class="sourceLineNo">208</span>     *        ignore the contents of 
schemes.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>     */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    public UrlValidator(String[] schemes) 
{<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        this(schemes, 0L);<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span>     * Initialize a UrlValidator with the 
given validation options.<a name="line.215"></a>
+<span class="sourceLineNo">216</span>     * @param options The options should 
be set using the public constants declared in<a name="line.216"></a>
+<span class="sourceLineNo">217</span>     * this class.  To set multiple 
options you simply add them together.  For example,<a name="line.217"></a>
+<span class="sourceLineNo">218</span>     * ALLOW_2_SLASHES + NO_FRAGMENTS 
enables both of those options.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>     */<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    public UrlValidator(long options) {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>        this(null, null, options);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    /**<a name="line.224"></a>
+<span class="sourceLineNo">225</span>     * Behavior of validation is modified 
by passing in options:<a name="line.225"></a>
+<span class="sourceLineNo">226</span>     * @param schemes The set of valid 
schemes. Ignored if the ALLOW_ALL_SCHEMES option is set.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>     * @param options The options should 
be set using the public constants declared in<a name="line.227"></a>
+<span class="sourceLineNo">228</span>     * this class.  To set multiple 
options you simply add them together.  For example,<a name="line.228"></a>
+<span class="sourceLineNo">229</span>     * ALLOW_2_SLASHES + NO_FRAGMENTS 
enables both of those options.<a name="line.229"></a>
+<span class="sourceLineNo">230</span>     */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public UrlValidator(String[] schemes, 
long options) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        this(schemes, null, options);<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span>     * Initialize a UrlValidator with the 
given validation options.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>     * @param authorityValidator Regular 
expression validator used to validate the authority part<a name="line.237"></a>
+<span class="sourceLineNo">238</span>     * This allows the user to override 
the standard set of domains.<a name="line.238"></a>
 <span class="sourceLineNo">239</span>     * @param options Validation options. 
Set using the public constants of this class.<a name="line.239"></a>
 <span class="sourceLineNo">240</span>     * To set multiple options, simply 
add them together:<a name="line.240"></a>
 <span class="sourceLineNo">241</span>     * 
&lt;p&gt;&lt;code&gt;ALLOW_2_SLASHES + NO_FRAGMENTS&lt;/code&gt;&lt;/p&gt;<a 
name="line.241"></a>
@@ -255,7 +255,7 @@
 <span class="sourceLineNo">247</span><a name="line.247"></a>
 <span class="sourceLineNo">248</span>    /**<a name="line.248"></a>
 <span class="sourceLineNo">249</span>     * Customizable constructor. 
Validation behavior is modifed by passing in options.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>     * @param schemes the set of valid 
schemes<a name="line.250"></a>
+<span class="sourceLineNo">250</span>     * @param schemes the set of valid 
schemes. Ignored if the ALLOW_ALL_SCHEMES option is set.<a name="line.250"></a>
 <span class="sourceLineNo">251</span>     * @param authorityValidator Regular 
expression validator used to validate the authority part<a name="line.251"></a>
 <span class="sourceLineNo">252</span>     * @param options Validation options. 
Set using the public constants of this class.<a name="line.252"></a>
 <span class="sourceLineNo">253</span>     * To set multiple options, simply 
add them together:<a name="line.253"></a>
@@ -271,234 +271,243 @@
 <span class="sourceLineNo">263</span>            if (schemes == null) {<a 
name="line.263"></a>
 <span class="sourceLineNo">264</span>                schemes = 
DEFAULT_SCHEMES;<a name="line.264"></a>
 <span class="sourceLineNo">265</span>            }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            allowedSchemes = new 
HashSet();<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            
allowedSchemes.addAll(Arrays.asList(schemes));<a name="line.267"></a>
-<span class="sourceLineNo">268</span>        }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>        this.authorityValidator = 
authorityValidator;<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    /**<a name="line.273"></a>
-<span class="sourceLineNo">274</span>     * &lt;p&gt;Checks if a field has a 
valid url address.&lt;/p&gt;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>     *<a name="line.275"></a>
-<span class="sourceLineNo">276</span>     * @param value The value validation 
is being performed on.  A &lt;code&gt;null&lt;/code&gt;<a name="line.276"></a>
-<span class="sourceLineNo">277</span>     * value is considered invalid.<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>     * @return true if the url is 
valid.<a name="line.278"></a>
-<span class="sourceLineNo">279</span>     */<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    public boolean isValid(String value) 
{<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        if (value == null) {<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>            return false;<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>        }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>        if 
(!ASCII_PATTERN.matcher(value).matches()) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            return false;<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>        // Check the whole url address 
structure<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        Matcher urlMatcher = 
URL_PATTERN.matcher(value);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        if (!urlMatcher.matches()) {<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>            return false;<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>        }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>        String scheme = 
urlMatcher.group(PARSE_URL_SCHEME);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        if (!isValidScheme(scheme)) {<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>            return false;<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>        }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>        String authority = 
urlMatcher.group(PARSE_URL_AUTHORITY);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if ("file".equals(scheme) 
&amp;&amp; "".equals(authority)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>           // Special case - file: allows 
an empty authority<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        } else {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>           // Validate the authority<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span>           if 
(!isValidAuthority(authority)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>               return false;<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>            }<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>        if 
(!isValidPath(urlMatcher.group(PARSE_URL_PATH))) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span>            return false;<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>        }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>        if 
(!isValidQuery(urlMatcher.group(PARSE_URL_QUERY))) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>            return false;<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>        }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>        if 
(!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>            return false;<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>        }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>        return true;<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>    }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>    /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span>     * Validate scheme. If schemes[] was 
initialized to a non null,<a name="line.326"></a>
-<span class="sourceLineNo">327</span>     * then only those scheme's are 
allowed.  Note this is slightly different<a name="line.327"></a>
-<span class="sourceLineNo">328</span>     * than for the constructor.<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>     * @param scheme The scheme to 
validate.  A &lt;code&gt;null&lt;/code&gt; value is considered<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>     * invalid.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>     * @return true if valid.<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>     */<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    protected boolean 
isValidScheme(String scheme) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        if (scheme == null) {<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>            return false;<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>        }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>        if 
(!SCHEME_PATTERN.matcher(scheme).matches()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            return false;<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>        }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span>        if (isOff(ALLOW_ALL_SCHEMES) 
&amp;&amp; !allowedSchemes.contains(scheme)) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>            return false;<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>        }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>        return true;<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">266</span>            allowedSchemes = new 
HashSet(schemes.length);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            for(int i=0; i &lt; 
schemes.length; i++) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>                
allowedSchemes.add(schemes[i].toLowerCase(Locale.ENGLISH));<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>            }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>        }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>        this.authorityValidator = 
authorityValidator;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    /**<a name="line.275"></a>
+<span class="sourceLineNo">276</span>     * &lt;p&gt;Checks if a field has a 
valid url address.&lt;/p&gt;<a name="line.276"></a>
+<span class="sourceLineNo">277</span>     *<a name="line.277"></a>
+<span class="sourceLineNo">278</span>     * Note that the method calls 
#isValidAuthority()<a name="line.278"></a>
+<span class="sourceLineNo">279</span>     * which checks that the domain is 
valid.<a name="line.279"></a>
+<span class="sourceLineNo">280</span>     *<a name="line.280"></a>
+<span class="sourceLineNo">281</span>     * @param value The value validation 
is being performed on.  A &lt;code&gt;null&lt;/code&gt;<a name="line.281"></a>
+<span class="sourceLineNo">282</span>     * value is considered invalid.<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>     * @return true if the url is 
valid.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>     */<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    public boolean isValid(String value) 
{<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        if (value == null) {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>            return false;<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>        }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>        // Check the whole url address 
structure<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Matcher urlMatcher = 
URL_PATTERN.matcher(value);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        if (!urlMatcher.matches()) {<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>            return false;<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>        }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>        String scheme = 
urlMatcher.group(PARSE_URL_SCHEME);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        if (!isValidScheme(scheme)) {<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>            return false;<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>        }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>        String authority = 
urlMatcher.group(PARSE_URL_AUTHORITY);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        if ("file".equals(scheme) 
&amp;&amp; "".equals(authority)) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>            // Special case - file: 
allows an empty authority<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        } else {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>            // Validate the authority<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>            if 
(!isValidAuthority(authority)) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                return false;<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>            }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span>        if 
(!isValidPath(urlMatcher.group(PARSE_URL_PATH))) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>            return false;<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>        if 
(!isValidQuery(urlMatcher.group(PARSE_URL_QUERY))) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>            return false;<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>        }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>        if 
(!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>            return false;<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>        }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span>        return true;<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>    /**<a name="line.326"></a>
+<span class="sourceLineNo">327</span>     * Validate scheme. If schemes[] was 
initialized to a non null,<a name="line.327"></a>
+<span class="sourceLineNo">328</span>     * then only those schemes are 
allowed.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>     * Otherwise the default schemes are 
"http", "https", "ftp".<a name="line.329"></a>
+<span class="sourceLineNo">330</span>     * Matching is case-blind.<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>     * @param scheme The scheme to 
validate.  A &lt;code&gt;null&lt;/code&gt; value is considered<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>     * invalid.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>     * @return true if valid.<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>     */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    protected boolean 
isValidScheme(String scheme) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        if (scheme == null) {<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>            return false;<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>        }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>        // TODO could be removed if 
external schemes were checked in the ctor before being stored<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>        if 
(!SCHEME_PATTERN.matcher(scheme).matches()) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>            return false;<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>        }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>        if (isOff(ALLOW_ALL_SCHEMES) 
&amp;&amp; !allowedSchemes.contains(scheme.toLowerCase(Locale.ENGLISH))) {<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>            return false;<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>        }<a name="line.347"></a>
 <span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>    /**<a name="line.349"></a>
-<span class="sourceLineNo">350</span>     * Returns true if the authority is 
properly formatted.  An authority is the combination<a name="line.350"></a>
-<span class="sourceLineNo">351</span>     * of hostname and port.  A 
&lt;code&gt;null&lt;/code&gt; authority value is considered invalid.<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>     * @param authority Authority value 
to validate.<a name="line.352"></a>
-<span class="sourceLineNo">353</span>     * @return true if authority 
(hostname and port) is valid.<a name="line.353"></a>
-<span class="sourceLineNo">354</span>     */<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    protected boolean 
isValidAuthority(String authority) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        if (authority == null) {<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>            return false;<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>        }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>        // check manual authority 
validation if specified<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        if (authorityValidator != null 
&amp;&amp; authorityValidator.isValid(authority)) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span>            return true;<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>        }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>        Matcher authorityMatcher = 
AUTHORITY_PATTERN.matcher(authority);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        if (!authorityMatcher.matches()) 
{<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            return false;<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>        }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>        String hostLocation = 
authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        // check if authority is hostname 
or IP address:<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        // try a hostname first since 
that's much more likely<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        DomainValidator domainValidator = 
DomainValidator.getInstance(isOn(ALLOW_LOCAL_URLS));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        if 
(!domainValidator.isValid(hostLocation)) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>            // try an IP address<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>            InetAddressValidator 
inetAddressValidator =<a name="line.376"></a>
-<span class="sourceLineNo">377</span>                
InetAddressValidator.getInstance();<a name="line.377"></a>
-<span class="sourceLineNo">378</span>            if 
(!inetAddressValidator.isValid(hostLocation)) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>                // isn't either one, so 
the URL is invalid<a name="line.379"></a>
-<span class="sourceLineNo">380</span>                return false;<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>            }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>        String port = 
authorityMatcher.group(PARSE_AUTHORITY_PORT);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (port != null &amp;&amp; 
!PORT_PATTERN.matcher(port).matches()) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>            return false;<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>        String extra = 
authorityMatcher.group(PARSE_AUTHORITY_EXTRA);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>        if (extra != null &amp;&amp; 
extra.trim().length() &gt; 0){<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            return false;<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>        }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>        return true;<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>    }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>    /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span>     * Returns true if the path is valid. 
 A &lt;code&gt;null&lt;/code&gt; value is considered invalid.<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>     * @param path Path value to 
validate.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>     * @return true if path is valid.<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>     */<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    protected boolean isValidPath(String 
path) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        if (path == null) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>            return false;<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>        }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>        if 
(!PATH_PATTERN.matcher(path).matches()) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            return false;<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span>        int slash2Count = 
countToken("//", path);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        if (isOff(ALLOW_2_SLASHES) 
&amp;&amp; (slash2Count &gt; 0)) {<a name="line.412"></a>
+<span class="sourceLineNo">349</span>        return true;<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>    /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span>     * Returns true if the authority is 
properly formatted.  An authority is the combination<a name="line.353"></a>
+<span class="sourceLineNo">354</span>     * of hostname and port.  A 
&lt;code&gt;null&lt;/code&gt; authority value is considered invalid.<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>     * Note: this implementation 
validates the domain unless a RegexValidator was provided.<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>     * If a RegexValidator was supplied 
and it matches, then the authority is regarded<a name="line.356"></a>
+<span class="sourceLineNo">357</span>     * as valid with no further checks, 
otherwise the method checks against the<a name="line.357"></a>
+<span class="sourceLineNo">358</span>     * AUTHORITY_PATTERN and the 
DomainValidator (ALLOW_LOCAL_URLS)<a name="line.358"></a>
+<span class="sourceLineNo">359</span>     * @param authority Authority value 
to validate, alllows IDN<a name="line.359"></a>
+<span class="sourceLineNo">360</span>     * @return true if authority 
(hostname and port) is valid.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>     */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    protected boolean 
isValidAuthority(String authority) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        if (authority == null) {<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>            return false;<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>        }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span>        // check manual authority 
validation if specified<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        if (authorityValidator != null 
&amp;&amp; authorityValidator.isValid(authority)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>            return true;<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>        }<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        // convert to ASCII if possible<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>        final String authorityASCII = 
DomainValidator.unicodeToASCII(authority);<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span>        Matcher authorityMatcher = 
AUTHORITY_PATTERN.matcher(authorityASCII);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        if (!authorityMatcher.matches()) 
{<a name="line.375"></a>
+<span class="sourceLineNo">376</span>            return false;<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>        }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>        String hostLocation = 
authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        // check if authority is hostname 
or IP address:<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        // try a hostname first since 
that's much more likely<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        DomainValidator domainValidator = 
DomainValidator.getInstance(isOn(ALLOW_LOCAL_URLS));<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        if 
(!domainValidator.isValid(hostLocation)) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            // try an IP address<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>            InetAddressValidator 
inetAddressValidator =<a name="line.385"></a>
+<span class="sourceLineNo">386</span>                
InetAddressValidator.getInstance();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>            if 
(!inetAddressValidator.isValid(hostLocation)) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>                // isn't either one, so 
the URL is invalid<a name="line.388"></a>
+<span class="sourceLineNo">389</span>                return false;<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>            }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>        String port = 
authorityMatcher.group(PARSE_AUTHORITY_PORT);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        if (port != null &amp;&amp; 
!PORT_PATTERN.matcher(port).matches()) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            return false;<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>        String extra = 
authorityMatcher.group(PARSE_AUTHORITY_EXTRA);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        if (extra != null &amp;&amp; 
extra.trim().length() &gt; 0){<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            return false;<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>        }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span>        return true;<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span>     * Returns true if the path is valid. 
 A &lt;code&gt;null&lt;/code&gt; value is considered invalid.<a 
name="line.407"></a>
+<span class="sourceLineNo">408</span>     * @param path Path value to 
validate.<a name="line.408"></a>
+<span class="sourceLineNo">409</span>     * @return true if path is valid.<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>     */<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    protected boolean isValidPath(String 
path) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>        if (path == null) {<a 
name="line.412"></a>
 <span class="sourceLineNo">413</span>            return false;<a 
name="line.413"></a>
 <span class="sourceLineNo">414</span>        }<a name="line.414"></a>
 <span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>        int slashCount = countToken("/", 
path);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        int dot2Count = countToken("..", 
path);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        if (dot2Count &gt; 0 &amp;&amp; 
(slashCount - slash2Count - 1) &lt;= dot2Count) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>            return false;<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>        return true;<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
+<span class="sourceLineNo">416</span>        if 
(!PATH_PATTERN.matcher(path).matches()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>            return false;<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>        }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span>        int slash2Count = 
countToken("//", path);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        if (isOff(ALLOW_2_SLASHES) 
&amp;&amp; (slash2Count &gt; 0)) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>            return false;<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>        }<a name="line.423"></a>
 <span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>    /**<a name="line.425"></a>
-<span class="sourceLineNo">426</span>     * Returns true if the query is null 
or it's a properly formatted query string.<a name="line.426"></a>
-<span class="sourceLineNo">427</span>     * @param query Query value to 
validate.<a name="line.427"></a>
-<span class="sourceLineNo">428</span>     * @return true if query is valid.<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>     */<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    protected boolean isValidQuery(String 
query) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        if (query == null) {<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>            return true;<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>        }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>        return 
QUERY_PATTERN.matcher(query).matches();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>    /**<a name="line.438"></a>
-<span class="sourceLineNo">439</span>     * Returns true if the given fragment 
is null or fragments are allowed.<a name="line.439"></a>
-<span class="sourceLineNo">440</span>     * @param fragment Fragment value to 
validate.<a name="line.440"></a>
-<span class="sourceLineNo">441</span>     * @return true if fragment is 
valid.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>     */<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    protected boolean 
isValidFragment(String fragment) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        if (fragment == null) {<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>            return true;<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>        }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>        return isOff(NO_FRAGMENTS);<a 
name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    /**<a name="line.451"></a>
-<span class="sourceLineNo">452</span>     * Returns the number of times the 
token appears in the target.<a name="line.452"></a>
-<span class="sourceLineNo">453</span>     * @param token Token value to be 
counted.<a name="line.453"></a>
-<span class="sourceLineNo">454</span>     * @param target Target value to 
count tokens in.<a name="line.454"></a>
-<span class="sourceLineNo">455</span>     * @return the number of tokens.<a 
name="line.455"></a>
-<span class="sourceLineNo">456</span>     */<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    protected int countToken(String 
token, String target) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>        int tokenIndex = 0;<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>        int count = 0;<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>        while (tokenIndex != -1) {<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>            tokenIndex = 
target.indexOf(token, tokenIndex);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>            if (tokenIndex &gt; -1) {<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>                tokenIndex++;<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>                count++;<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>            }<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        }<a name="line.466"></a>
-<span class="sourceLineNo">467</span>        return count;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>    }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>    /**<a name="line.470"></a>
-<span class="sourceLineNo">471</span>     * Tests whether the given flag is 
on.  If the flag is not a power of 2<a name="line.471"></a>
-<span class="sourceLineNo">472</span>     * (ie. 3) this tests whether the 
combination of flags is on.<a name="line.472"></a>
-<span class="sourceLineNo">473</span>     *<a name="line.473"></a>
-<span class="sourceLineNo">474</span>     * @param flag Flag value to check.<a 
name="line.474"></a>
-<span class="sourceLineNo">475</span>     *<a name="line.475"></a>
-<span class="sourceLineNo">476</span>     * @return whether the specified flag 
value is on.<a name="line.476"></a>
-<span class="sourceLineNo">477</span>     */<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    private boolean isOn(long flag) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>        return (options &amp; flag) &gt; 
0;<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span>     * Tests whether the given flag is 
off.  If the flag is not a power of 2<a name="line.483"></a>
-<span class="sourceLineNo">484</span>     * (ie. 3) this tests whether the 
combination of flags is off.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>     *<a name="line.485"></a>
-<span class="sourceLineNo">486</span>     * @param flag Flag value to check.<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>     *<a name="line.487"></a>
-<span class="sourceLineNo">488</span>     * @return whether the specified flag 
value is off.<a name="line.488"></a>
-<span class="sourceLineNo">489</span>     */<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    private boolean isOff(long flag) {<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>        return (options &amp; flag) == 
0;<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>}<a name="line.493"></a>
+<span class="sourceLineNo">425</span>        int slashCount = countToken("/", 
path);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        int dot2Count = countToken("..", 
path);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        if (dot2Count &gt; 0 &amp;&amp; 
(slashCount - slash2Count - 1) &lt;= dot2Count) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>            return false;<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>        }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>        return true;<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>    /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span>     * Returns true if the query is null 
or it's a properly formatted query string.<a name="line.435"></a>
+<span class="sourceLineNo">436</span>     * @param query Query value to 
validate.<a name="line.436"></a>
+<span class="sourceLineNo">437</span>     * @return true if query is valid.<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>     */<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    protected boolean isValidQuery(String 
query) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        if (query == null) {<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>            return true;<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>        }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span>        return 
QUERY_PATTERN.matcher(query).matches();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span>    /**<a name="line.447"></a>
+<span class="sourceLineNo">448</span>     * Returns true if the given fragment 
is null or fragments are allowed.<a name="line.448"></a>
+<span class="sourceLineNo">449</span>     * @param fragment Fragment value to 
validate.<a name="line.449"></a>
+<span class="sourceLineNo">450</span>     * @return true if fragment is 
valid.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>     */<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    protected boolean 
isValidFragment(String fragment) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        if (fragment == null) {<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>            return true;<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>        }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>        return isOff(NO_FRAGMENTS);<a 
name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    /**<a name="line.460"></a>
+<span class="sourceLineNo">461</span>     * Returns the number of times the 
token appears in the target.<a name="line.461"></a>
+<span class="sourceLineNo">462</span>     * @param token Token value to be 
counted.<a name="line.462"></a>
+<span class="sourceLineNo">463</span>     * @param target Target value to 
count tokens in.<a name="line.463"></a>
+<span class="sourceLineNo">464</span>     * @return the number of tokens.<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>     */<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    protected int countToken(String 
token, String target) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        int tokenIndex = 0;<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>        int count = 0;<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>        while (tokenIndex != -1) {<a 
name="line.469"></a>
+<span class="sourceLineNo">470</span>            tokenIndex = 
target.indexOf(token, tokenIndex);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>            if (tokenIndex &gt; -1) {<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>                tokenIndex++;<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>                count++;<a 
name="line.473"></a>
+<span class="sourceLineNo">474</span>            }<a name="line.474"></a>
+<span class="sourceLineNo">475</span>        }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>        return count;<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>    }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    /**<a name="line.479"></a>
+<span class="sourceLineNo">480</span>     * Tests whether the given flag is 
on.  If the flag is not a power of 2<a name="line.480"></a>
+<span class="sourceLineNo">481</span>     * (ie. 3) this tests whether the 
combination of flags is on.<a name="line.481"></a>
+<span class="sourceLineNo">482</span>     *<a name="line.482"></a>
+<span class="sourceLineNo">483</span>     * @param flag Flag value to check.<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>     *<a name="line.484"></a>
+<span class="sourceLineNo">485</span>     * @return whether the specified flag 
value is on.<a name="line.485"></a>
+<span class="sourceLineNo">486</span>     */<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    private boolean isOn(long flag) {<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>        return (options &amp; flag) &gt; 
0;<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>    /**<a name="line.491"></a>
+<span class="sourceLineNo">492</span>     * Tests whether the given flag is 
off.  If the flag is not a power of 2<a name="line.492"></a>
+<span class="sourceLineNo">493</span>     * (ie. 3) this tests whether the 
combination of flags is off.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>     *<a name="line.494"></a>
+<span class="sourceLineNo">495</span>     * @param flag Flag value to check.<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span>     *<a name="line.496"></a>
+<span class="sourceLineNo">497</span>     * @return whether the specified flag 
value is off.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>     */<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    private boolean isOff(long flag) {<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span>        return (options &amp; flag) == 
0;<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>}<a name="line.502"></a>
 
 
 

Modified: 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.html
 (original)
+++ 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.html
 Tue Jan 13 20:07:34 2015
@@ -49,7 +49,7 @@
 <span class="sourceLineNo">041</span> *  Routing transit number&lt;/a&gt;.<a 
name="line.41"></a>
 <span class="sourceLineNo">042</span> * &lt;/p&gt;<a name="line.42"></a>
 <span class="sourceLineNo">043</span> *<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * @version $Revision: 1647900 $ $Date: 
2014-12-25 16:03:53 +0100 (Do, 25 Dez 2014) $<a name="line.44"></a>
+<span class="sourceLineNo">044</span> * @version $Revision: 1649191 $<a 
name="line.44"></a>
 <span class="sourceLineNo">045</span> * @since Validator 1.4<a 
name="line.45"></a>
 <span class="sourceLineNo">046</span> */<a name="line.46"></a>
 <span class="sourceLineNo">047</span>public final class ABANumberCheckDigit 
extends ModulusCheckDigit {<a name="line.47"></a>
@@ -86,7 +86,7 @@
 <span class="sourceLineNo">078</span>     */<a name="line.78"></a>
 <span class="sourceLineNo">079</span>    protected int weightedValue(int 
charValue, int leftPos, int rightPos) {<a name="line.79"></a>
 <span class="sourceLineNo">080</span>        int weight = 
POSITION_WEIGHT[rightPos % 3];<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        return (charValue * weight);<a 
name="line.81"></a>
+<span class="sourceLineNo">081</span>        return charValue * weight;<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>}<a name="line.84"></a>

Modified: 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.html
 (original)
+++ 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.html
 Tue Jan 13 20:07:34 2015
@@ -44,7 +44,7 @@
 <span class="sourceLineNo">036</span> * for more details.<a name="line.36"></a>
 <span class="sourceLineNo">037</span> * &lt;/p&gt;<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @version $Revision: 1647900 $ $Date: 
2014-12-25 16:03:53 +0100 (Do, 25 Dez 2014) $<a name="line.39"></a>
+<span class="sourceLineNo">039</span> * @version $Revision: 1649191 $<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span> * @since Validator 1.4<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span> */<a name="line.41"></a>
 <span class="sourceLineNo">042</span>public final class CUSIPCheckDigit 
extends ModulusCheckDigit {<a name="line.42"></a>
@@ -69,39 +69,41 @@
 <span class="sourceLineNo">061</span>     *<a name="line.61"></a>
 <span class="sourceLineNo">062</span>     * @param character The character to 
convert<a name="line.62"></a>
 <span class="sourceLineNo">063</span>     * @param leftPos The position of the 
character in the code, counting from left to right<a name="line.63"></a>
-<span class="sourceLineNo">064</span>     * @param rightPos The positionof the 
character in the code, counting from right to left<a name="line.64"></a>
+<span class="sourceLineNo">064</span>     * @param rightPos The position of 
the character in the code, counting from right to left<a name="line.64"></a>
 <span class="sourceLineNo">065</span>     * @return The integer value of the 
character<a name="line.65"></a>
 <span class="sourceLineNo">066</span>     * @throws CheckDigitException if 
character is not alphanumeric<a name="line.66"></a>
 <span class="sourceLineNo">067</span>     */<a name="line.67"></a>
 <span class="sourceLineNo">068</span>    protected int toInt(char character, 
int leftPos, int rightPos)<a name="line.68"></a>
 <span class="sourceLineNo">069</span>            throws CheckDigitException 
{<a name="line.69"></a>
 <span class="sourceLineNo">070</span>        int charValue = 
Character.getNumericValue(character);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>        if (charValue &lt; 0 || charValue 
&gt; 35) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>            throw new 
CheckDigitException("Invalid Character[" +<a name="line.72"></a>
-<span class="sourceLineNo">073</span>                    leftPos + "] = '" + 
charValue + "'");<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        }<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        return charValue;<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    }<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>     * &lt;p&gt;Calculates the 
&lt;i&gt;weighted&lt;/i&gt; value of a charcter in the<a name="line.79"></a>
-<span class="sourceLineNo">080</span>     * code at a specified 
position.&lt;/p&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>     *<a name="line.81"></a>
-<span class="sourceLineNo">082</span>     * &lt;p&gt;For CUSIP (from right to 
left) &lt;b&gt;odd&lt;/b&gt; digits are weighted<a name="line.82"></a>
-<span class="sourceLineNo">083</span>     * with a factor of 
&lt;b&gt;one&lt;/b&gt; and &lt;b&gt;even&lt;/b&gt; digits with a factor<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>     * of &lt;b&gt;two&lt;/b&gt;. 
Weighted values &amp;gt; 9, have 9 subtracted&lt;/p&gt;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>     *<a name="line.85"></a>
-<span class="sourceLineNo">086</span>     * @param charValue The numeric value 
of the character.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>     * @param leftPos The position of the 
character in the code, counting from left to right<a name="line.87"></a>
-<span class="sourceLineNo">088</span>     * @param rightPos The positionof the 
character in the code, counting from right to left<a name="line.88"></a>
-<span class="sourceLineNo">089</span>     * @return The weighted value of the 
character.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>     */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    protected int weightedValue(int 
charValue, int leftPos, int rightPos) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        int weight = 
POSITION_WEIGHT[rightPos % 2];<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        int weightedValue = (charValue * 
weight);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        return 
ModulusCheckDigit.sumDigits(weightedValue);<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">071</span>        // the final character is only 
allowed to reach 9<a name="line.71"></a>
+<span class="sourceLineNo">072</span>        final int charMax = rightPos == 1 
? 9 : 35;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        if (charValue &lt; 0 || charValue 
&gt; charMax) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            throw new 
CheckDigitException("Invalid Character[" +<a name="line.74"></a>
+<span class="sourceLineNo">075</span>                    leftPos + "," + 
rightPos + "] = '" + charValue + "' out of range 0 to " + charMax);<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>        }<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        return charValue;<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">080</span>    /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span>     * &lt;p&gt;Calculates the 
&lt;i&gt;weighted&lt;/i&gt; value of a charcter in the<a name="line.81"></a>
+<span class="sourceLineNo">082</span>     * code at a specified 
position.&lt;/p&gt;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>     *<a name="line.83"></a>
+<span class="sourceLineNo">084</span>     * &lt;p&gt;For CUSIP (from right to 
left) &lt;b&gt;odd&lt;/b&gt; digits are weighted<a name="line.84"></a>
+<span class="sourceLineNo">085</span>     * with a factor of 
&lt;b&gt;one&lt;/b&gt; and &lt;b&gt;even&lt;/b&gt; digits with a factor<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>     * of &lt;b&gt;two&lt;/b&gt;. 
Weighted values &amp;gt; 9, have 9 subtracted&lt;/p&gt;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>     *<a name="line.87"></a>
+<span class="sourceLineNo">088</span>     * @param charValue The numeric value 
of the character.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>     * @param leftPos The position of the 
character in the code, counting from left to right<a name="line.89"></a>
+<span class="sourceLineNo">090</span>     * @param rightPos The positionof the 
character in the code, counting from right to left<a name="line.90"></a>
+<span class="sourceLineNo">091</span>     * @return The weighted value of the 
character.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>     */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    protected int weightedValue(int 
charValue, int leftPos, int rightPos) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        int weight = 
POSITION_WEIGHT[rightPos % 2];<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        int weightedValue = (charValue * 
weight);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        return 
ModulusCheckDigit.sumDigits(weightedValue);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>}<a name="line.98"></a>
 
 
 

Modified: 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
 (original)
+++ 
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
 Tue Jan 13 20:07:34 2015
@@ -52,30 +52,31 @@
 <span class="sourceLineNo">044</span> * list of implementations provided 
within Commons Validator.<a name="line.44"></a>
 <span class="sourceLineNo">045</span> *<a name="line.45"></a>
 <span class="sourceLineNo">046</span> * @see 
org.apache.commons.validator.routines.CodeValidator<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @version $Revision: 1647968 $ $Date: 
2014-12-26 13:46:11 +0100 (Fr, 26 Dez 2014) $<a name="line.47"></a>
+<span class="sourceLineNo">047</span> * @version $Revision: 1649287 $<a 
name="line.47"></a>
 <span class="sourceLineNo">048</span> * @since Validator 1.4<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span> */<a name="line.49"></a>
 <span class="sourceLineNo">050</span>public interface CheckDigit {<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>     * Calculate the &lt;i&gt;Check 
Digit&lt;/i&gt; for a code.<a name="line.53"></a>
+<span class="sourceLineNo">053</span>     * Calculates the &lt;i&gt;Check 
Digit&lt;/i&gt; for a code.<a name="line.53"></a>
 <span class="sourceLineNo">054</span>     *<a name="line.54"></a>
 <span class="sourceLineNo">055</span>     * @param code The code to calculate 
the Check Digit for.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>     * @return The calculated Check 
Digit<a name="line.56"></a>
-<span class="sourceLineNo">057</span>     * @throws CheckDigitException if an 
error occurs.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>     */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    String calculate(String code) throws 
CheckDigitException;<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>     * Validate the check digit for the 
code.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>     *<a name="line.63"></a>
-<span class="sourceLineNo">064</span>     * @param code The code to 
validate.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>     * @return 
&lt;code&gt;true&lt;/code&gt; if the check digit is valid, otherwise<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>     * &lt;code&gt;false&lt;/code&gt;.<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>     */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    boolean isValid(String code);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>}<a name="line.70"></a>
+<span class="sourceLineNo">056</span>     * The string must not include the 
check digit<a name="line.56"></a>
+<span class="sourceLineNo">057</span>     * @return The calculated Check 
Digit<a name="line.57"></a>
+<span class="sourceLineNo">058</span>     * @throws CheckDigitException if an 
error occurs.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>     */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    String calculate(String code) throws 
CheckDigitException;<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>     * Validates the check digit for the 
code.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>     *<a name="line.64"></a>
+<span class="sourceLineNo">065</span>     * @param code The code to validate, 
the string must include the check digit.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>     * @return 
&lt;code&gt;true&lt;/code&gt; if the check digit is valid, otherwise<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>     * &lt;code&gt;false&lt;/code&gt;.<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>     */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    boolean isValid(String code);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>}<a name="line.71"></a>