Modified:
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/UrlValidator.html
==============================================================================
---
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/UrlValidator.html
(original)
+++
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/UrlValidator.html
Fri Dec 26 12:51:02 2014
@@ -77,7 +77,7 @@
<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em
class="jxr_javadoccomment"> * Uniform Resource Identifiers (URI): Generic
Syntax</em>
<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em
class="jxr_javadoccomment"> * </a></em>
<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em
class="jxr_javadoccomment"> * @version $Revision: 1647900 $ $Date: 2014-12-25
16:03:53 +0100 (Do, 25 Dez 2014) $</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em
class="jxr_javadoccomment"> * @version $Revision: 1647967 $ $Date: 2014-12-26
13:44:11 +0100 (Fr, 26 Dez 2014) $</em>
<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em
class="jxr_javadoccomment"> * @since Validator 1.4</em>
<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../org/apache/commons/validator/routines/UrlValidator.html">UrlValidator</a>
<strong class="jxr_keyword">implements</strong> Serializable {
@@ -266,249 +266,239 @@
<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong
class="jxr_keyword">this</strong>.options = options;
<a class="jxr_linenumber" name="L259" href="#L259">259</a>
<a class="jxr_linenumber" name="L260" href="#L260">260</a> <strong
class="jxr_keyword">if</strong> (isOn(ALLOW_ALL_SCHEMES)) {
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong
class="jxr_keyword">this</strong>.allowedSchemes = Collections.EMPTY_SET;
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>
allowedSchemes = Collections.EMPTY_SET;
<a class="jxr_linenumber" name="L262" href="#L262">262</a> } <strong
class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong
class="jxr_keyword">if</strong> (schemes == <strong
class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="L264" href="#L264">264</a>
schemes = DEFAULT_SCHEMES;
<a class="jxr_linenumber" name="L265" href="#L265">265</a> }
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong
class="jxr_keyword">this</strong>.allowedSchemes = <strong
class="jxr_keyword">new</strong> HashSet();
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <strong
class="jxr_keyword">this</strong>.allowedSchemes.addAll(Arrays.asList(schemes));
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
allowedSchemes = <strong class="jxr_keyword">new</strong> HashSet();
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>
allowedSchemes.addAll(Arrays.asList(schemes));
<a class="jxr_linenumber" name="L268" href="#L268">268</a> }
<a class="jxr_linenumber" name="L269" href="#L269">269</a>
<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">this</strong>.authorityValidator = authorityValidator;
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> }
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em
class="jxr_javadoccomment"> * <p>Checks if a field has a valid url
address.</p></em>
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em
class="jxr_javadoccomment"> * @param value The value validation is being
performed on. A <code>null</code></em>
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em
class="jxr_javadoccomment"> * value is considered invalid.</em>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em
class="jxr_javadoccomment"> * @return true if the url is valid.</em>
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">boolean</strong> isValid(String value) {
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong
class="jxr_keyword">if</strong> (value == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> }
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong
class="jxr_keyword">if</strong> (!ASCII_PATTERN.matcher(value).matches()) {
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> }
-<a class="jxr_linenumber" name="L289" href="#L289">289</a>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em
class="jxr_comment">// Check the whole url address structure</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> Matcher
urlMatcher = URL_PATTERN.matcher(value);
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> <strong
class="jxr_keyword">if</strong> (!urlMatcher.matches()) {
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> }
-<a class="jxr_linenumber" name="L295" href="#L295">295</a>
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> String
scheme = urlMatcher.group(PARSE_URL_SCHEME);
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong
class="jxr_keyword">if</strong> (!isValidScheme(scheme)) {
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> }
-<a class="jxr_linenumber" name="L300" href="#L300">300</a>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> String
authority = urlMatcher.group(PARSE_URL_AUTHORITY);
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong
class="jxr_keyword">if</strong> (<span
class="jxr_string">"file"</span>.equals(scheme) && <span
class="jxr_string">""</span>.equals(authority)) {
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em
class="jxr_comment">// Special case - file: allows an empty authority</em>
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> } <strong
class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em
class="jxr_comment">// Validate the authority</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <strong
class="jxr_keyword">if</strong> (!isValidAuthority(authority)) {
-<a class="jxr_linenumber" name="L307" href="#L307">307</a>
<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> }
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> }
-<a class="jxr_linenumber" name="L310" href="#L310">310</a>
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong
class="jxr_keyword">if</strong>
(!isValidPath(urlMatcher.group(PARSE_URL_PATH))) {
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> }
-<a class="jxr_linenumber" name="L314" href="#L314">314</a>
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong
class="jxr_keyword">if</strong>
(!isValidQuery(urlMatcher.group(PARSE_URL_QUERY))) {
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> }
-<a class="jxr_linenumber" name="L318" href="#L318">318</a>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong
class="jxr_keyword">if</strong>
(!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> }
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> }
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em
class="jxr_javadoccomment"> * Validate scheme. If schemes[] was initialized
to a non null,</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em
class="jxr_javadoccomment"> * then only those scheme's are allowed. Note
this is slightly different</em>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em
class="jxr_javadoccomment"> * than for the constructor.</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em
class="jxr_javadoccomment"> * @param scheme The scheme to validate. A
<code>null</code> value is considered</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em
class="jxr_javadoccomment"> * invalid.</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em
class="jxr_javadoccomment"> * @return true if valid.</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidScheme(String scheme) {
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> <strong
class="jxr_keyword">if</strong> (scheme == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> }
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <strong
class="jxr_keyword">if</strong> (!SCHEME_PATTERN.matcher(scheme).matches()) {
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> }
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> <strong
class="jxr_keyword">if</strong> (isOff(ALLOW_ALL_SCHEMES)) {
-<a class="jxr_linenumber" name="L344" href="#L344">344</a>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <strong
class="jxr_keyword">if</strong> (!<strong
class="jxr_keyword">this</strong>.allowedSchemes.contains(scheme)) {
-<a class="jxr_linenumber" name="L346" href="#L346">346</a>
<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> }
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> }
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> }
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> <em
class="jxr_javadoccomment"> * Returns true if the authority is properly
formatted. An authority is the combination</em>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em
class="jxr_javadoccomment"> * of hostname and port. A
<code>null</code> authority value is considered invalid.</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em
class="jxr_javadoccomment"> * @param authority Authority value to
validate.</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em
class="jxr_javadoccomment"> * @return true if authority (hostname and port)
is valid.</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidAuthority(String authority) {
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> <strong
class="jxr_keyword">if</strong> (authority == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> }
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em
class="jxr_comment">// check manual authority validation if specified</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> <strong
class="jxr_keyword">if</strong> (authorityValidator != <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> <strong
class="jxr_keyword">if</strong> (authorityValidator.isValid(authority)) {
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>
<strong class="jxr_keyword">return</strong> <strong
class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> }
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> }
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> Matcher
authorityMatcher = AUTHORITY_PATTERN.matcher(authority);
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> <strong
class="jxr_keyword">if</strong> (!authorityMatcher.matches()) {
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> }
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> String
hostLocation = authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em
class="jxr_comment">// check if authority is hostname or IP address:</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em
class="jxr_comment">// try a hostname first since that's much more likely</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <a
href="../../../../../org/apache/commons/validator/routines/DomainValidator.html">DomainValidator</a>
domainValidator = DomainValidator.getInstance(isOn(ALLOW_LOCAL_URLS));
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> <strong
class="jxr_keyword">if</strong> (!domainValidator.isValid(hostLocation)) {
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em
class="jxr_comment">// try an IP address</em>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <a
href="../../../../../org/apache/commons/validator/routines/InetAddressValidator.html">InetAddressValidator</a>
inetAddressValidator =
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>
InetAddressValidator.getInstance();
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> <strong
class="jxr_keyword">if</strong> (!inetAddressValidator.isValid(hostLocation)) {
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em
class="jxr_comment">// isn't either one, so the URL is invalid</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>
<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> }
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> }
-<a class="jxr_linenumber" name="L389" href="#L389">389</a>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> String port
= authorityMatcher.group(PARSE_AUTHORITY_PORT);
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> <strong
class="jxr_keyword">if</strong> (port != <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong
class="jxr_keyword">if</strong> (!PORT_PATTERN.matcher(port).matches()) {
-<a class="jxr_linenumber" name="L393" href="#L393">393</a>
<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> }
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> }
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> }
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em
class="jxr_javadoccomment"> * <p>Checks if a field has a valid url
address.</p></em>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em
class="jxr_javadoccomment"> * @param value The value validation is being
performed on. A <code>null</code></em>
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em
class="jxr_javadoccomment"> * value is considered invalid.</em>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em
class="jxr_javadoccomment"> * @return true if the url is valid.</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">boolean</strong> isValid(String value) {
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> <strong
class="jxr_keyword">if</strong> (value == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> }
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong
class="jxr_keyword">if</strong> (!ASCII_PATTERN.matcher(value).matches()) {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> }
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em
class="jxr_comment">// Check the whole url address structure</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> Matcher
urlMatcher = URL_PATTERN.matcher(value);
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> <strong
class="jxr_keyword">if</strong> (!urlMatcher.matches()) {
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> }
+<a class="jxr_linenumber" name="L294" href="#L294">294</a>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> String
scheme = urlMatcher.group(PARSE_URL_SCHEME);
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> <strong
class="jxr_keyword">if</strong> (!isValidScheme(scheme)) {
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> }
+<a class="jxr_linenumber" name="L299" href="#L299">299</a>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> String
authority = urlMatcher.group(PARSE_URL_AUTHORITY);
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong
class="jxr_keyword">if</strong> (<span
class="jxr_string">"file"</span>.equals(scheme) && <span
class="jxr_string">""</span>.equals(authority)) {
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em
class="jxr_comment">// Special case - file: allows an empty authority</em>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> } <strong
class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em
class="jxr_comment">// Validate the authority</em>
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> <strong
class="jxr_keyword">if</strong> (!isValidAuthority(authority)) {
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>
<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> }
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> }
+<a class="jxr_linenumber" name="L309" href="#L309">309</a>
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> <strong
class="jxr_keyword">if</strong>
(!isValidPath(urlMatcher.group(PARSE_URL_PATH))) {
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> }
+<a class="jxr_linenumber" name="L313" href="#L313">313</a>
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <strong
class="jxr_keyword">if</strong>
(!isValidQuery(urlMatcher.group(PARSE_URL_QUERY))) {
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> }
+<a class="jxr_linenumber" name="L317" href="#L317">317</a>
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong
class="jxr_keyword">if</strong>
(!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> }
+<a class="jxr_linenumber" name="L321" href="#L321">321</a>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> }
+<a class="jxr_linenumber" name="L324" href="#L324">324</a>
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> <em
class="jxr_javadoccomment"> * Validate scheme. If schemes[] was initialized
to a non null,</em>
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em
class="jxr_javadoccomment"> * then only those scheme's are allowed. Note
this is slightly different</em>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em
class="jxr_javadoccomment"> * than for the constructor.</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em
class="jxr_javadoccomment"> * @param scheme The scheme to validate. A
<code>null</code> value is considered</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em
class="jxr_javadoccomment"> * invalid.</em>
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em
class="jxr_javadoccomment"> * @return true if valid.</em>
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidScheme(String scheme) {
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <strong
class="jxr_keyword">if</strong> (scheme == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> }
+<a class="jxr_linenumber" name="L337" href="#L337">337</a>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <strong
class="jxr_keyword">if</strong> (!SCHEME_PATTERN.matcher(scheme).matches()) {
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> }
+<a class="jxr_linenumber" name="L341" href="#L341">341</a>
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> <strong
class="jxr_keyword">if</strong> (isOff(ALLOW_ALL_SCHEMES) &&
!allowedSchemes.contains(scheme)) {
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> }
+<a class="jxr_linenumber" name="L345" href="#L345">345</a>
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> }
+<a class="jxr_linenumber" name="L348" href="#L348">348</a>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em
class="jxr_javadoccomment"> * Returns true if the authority is properly
formatted. An authority is the combination</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em
class="jxr_javadoccomment"> * of hostname and port. A
<code>null</code> authority value is considered invalid.</em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em
class="jxr_javadoccomment"> * @param authority Authority value to
validate.</em>
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em
class="jxr_javadoccomment"> * @return true if authority (hostname and port)
is valid.</em>
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidAuthority(String authority) {
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <strong
class="jxr_keyword">if</strong> (authority == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> }
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> <em
class="jxr_comment">// check manual authority validation if specified</em>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong
class="jxr_keyword">if</strong> (authorityValidator != <strong
class="jxr_keyword">null</strong> &&
authorityValidator.isValid(authority)) {
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> }
+<a class="jxr_linenumber" name="L364" href="#L364">364</a>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> Matcher
authorityMatcher = AUTHORITY_PATTERN.matcher(authority);
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> <strong
class="jxr_keyword">if</strong> (!authorityMatcher.matches()) {
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> }
+<a class="jxr_linenumber" name="L369" href="#L369">369</a>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> String
hostLocation = authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em
class="jxr_comment">// check if authority is hostname or IP address:</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em
class="jxr_comment">// try a hostname first since that's much more likely</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> <a
href="../../../../../org/apache/commons/validator/routines/DomainValidator.html">DomainValidator</a>
domainValidator = DomainValidator.getInstance(isOn(ALLOW_LOCAL_URLS));
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <strong
class="jxr_keyword">if</strong> (!domainValidator.isValid(hostLocation)) {
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em
class="jxr_comment">// try an IP address</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <a
href="../../../../../org/apache/commons/validator/routines/InetAddressValidator.html">InetAddressValidator</a>
inetAddressValidator =
+<a class="jxr_linenumber" name="L377" href="#L377">377</a>
InetAddressValidator.getInstance();
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <strong
class="jxr_keyword">if</strong> (!inetAddressValidator.isValid(hostLocation)) {
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em
class="jxr_comment">// isn't either one, so the URL is invalid</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a>
<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> }
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> }
+<a class="jxr_linenumber" name="L383" href="#L383">383</a>
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> String port
= authorityMatcher.group(PARSE_AUTHORITY_PORT);
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <strong
class="jxr_keyword">if</strong> (port != <strong
class="jxr_keyword">null</strong> &&
!PORT_PATTERN.matcher(port).matches()) {
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> }
+<a class="jxr_linenumber" name="L388" href="#L388">388</a>
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> String
extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong
class="jxr_keyword">if</strong> (extra != <strong
class="jxr_keyword">null</strong> && extra.trim().length() > 0){
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> }
+<a class="jxr_linenumber" name="L393" href="#L393">393</a>
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> }
<a class="jxr_linenumber" name="L396" href="#L396">396</a>
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> String
extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <strong
class="jxr_keyword">if</strong> (extra != <strong
class="jxr_keyword">null</strong> && extra.trim().length() > 0){
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> }
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> }
-<a class="jxr_linenumber" name="L404" href="#L404">404</a>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em
class="jxr_javadoccomment"> * Returns true if the path is valid. A
<code>null</code> value is considered invalid.</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em
class="jxr_javadoccomment"> * @param path Path value to validate.</em>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em
class="jxr_javadoccomment"> * @return true if path is valid.</em>
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidPath(String path) {
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> <strong
class="jxr_keyword">if</strong> (path == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> }
-<a class="jxr_linenumber" name="L414" href="#L414">414</a>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <strong
class="jxr_keyword">if</strong> (!PATH_PATTERN.matcher(path).matches()) {
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> }
-<a class="jxr_linenumber" name="L418" href="#L418">418</a>
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> <strong
class="jxr_keyword">int</strong> slash2Count = countToken(<span
class="jxr_string">"//"</span>, path);
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> <strong
class="jxr_keyword">if</strong> (isOff(ALLOW_2_SLASHES) && (slash2Count
> 0)) {
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> <strong
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> }
-<a class="jxr_linenumber" name="L423" href="#L423">423</a>
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> <strong
class="jxr_keyword">int</strong> slashCount = countToken(<span
class="jxr_string">"/"</span>, path);
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong
class="jxr_keyword">int</strong> dot2Count = countToken(<span
class="jxr_string">".."</span>, path);
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> <strong
class="jxr_keyword">if</strong> (dot2Count > 0) {
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> <strong
class="jxr_keyword">if</strong> ((slashCount - slash2Count - 1) <=
dot2Count) {
-<a class="jxr_linenumber" name="L428" href="#L428">428</a>
<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> }
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> }
-<a class="jxr_linenumber" name="L431" href="#L431">431</a>
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> }
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em
class="jxr_javadoccomment"> * Returns true if the path is valid. A
<code>null</code> value is considered invalid.</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> <em
class="jxr_javadoccomment"> * @param path Path value to validate.</em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em
class="jxr_javadoccomment"> * @return true if path is valid.</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidPath(String path) {
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> <strong
class="jxr_keyword">if</strong> (path == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> }
+<a class="jxr_linenumber" name="L406" href="#L406">406</a>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong
class="jxr_keyword">if</strong> (!PATH_PATTERN.matcher(path).matches()) {
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> }
+<a class="jxr_linenumber" name="L410" href="#L410">410</a>
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> <strong
class="jxr_keyword">int</strong> slash2Count = countToken(<span
class="jxr_string">"//"</span>, path);
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong
class="jxr_keyword">if</strong> (isOff(ALLOW_2_SLASHES) && (slash2Count
> 0)) {
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> }
+<a class="jxr_linenumber" name="L415" href="#L415">415</a>
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> <strong
class="jxr_keyword">int</strong> slashCount = countToken(<span
class="jxr_string">"/"</span>, path);
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> <strong
class="jxr_keyword">int</strong> dot2Count = countToken(<span
class="jxr_string">".."</span>, path);
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <strong
class="jxr_keyword">if</strong> (dot2Count > 0 && (slashCount -
slash2Count - 1) <= dot2Count) {
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <strong
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> }
+<a class="jxr_linenumber" name="L421" href="#L421">421</a>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> }
+<a class="jxr_linenumber" name="L424" href="#L424">424</a>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em
class="jxr_javadoccomment"> * Returns true if the query is null or it's a
properly formatted query string.</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em
class="jxr_javadoccomment"> * @param query Query value to validate.</em>
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> <em
class="jxr_javadoccomment"> * @return true if query is valid.</em>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidQuery(String query) {
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> <strong
class="jxr_keyword">if</strong> (query == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> }
<a class="jxr_linenumber" name="L434" href="#L434">434</a>
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em
class="jxr_javadoccomment"> * Returns true if the query is null or it's a
properly formatted query string.</em>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em
class="jxr_javadoccomment"> * @param query Query value to validate.</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em
class="jxr_javadoccomment"> * @return true if query is valid.</em>
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidQuery(String query) {
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> <strong
class="jxr_keyword">if</strong> (query == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> }
-<a class="jxr_linenumber" name="L444" href="#L444">444</a>
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> <strong
class="jxr_keyword">return</strong> QUERY_PATTERN.matcher(query).matches();
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> }
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> <strong
class="jxr_keyword">return</strong> QUERY_PATTERN.matcher(query).matches();
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> }
+<a class="jxr_linenumber" name="L437" href="#L437">437</a>
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em
class="jxr_javadoccomment"> * Returns true if the given fragment is null or
fragments are allowed.</em>
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em
class="jxr_javadoccomment"> * @param fragment Fragment value to
validate.</em>
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> <em
class="jxr_javadoccomment"> * @return true if fragment is valid.</em>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidFragment(String fragment) {
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <strong
class="jxr_keyword">if</strong> (fragment == <strong
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> }
<a class="jxr_linenumber" name="L447" href="#L447">447</a>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em
class="jxr_javadoccomment"> * Returns true if the given fragment is null or
fragments are allowed.</em>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em
class="jxr_javadoccomment"> * @param fragment Fragment value to
validate.</em>
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em
class="jxr_javadoccomment"> * @return true if fragment is valid.</em>
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">boolean</strong> isValidFragment(String fragment) {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> <strong
class="jxr_keyword">if</strong> (fragment == <strong
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> }
-<a class="jxr_linenumber" name="L457" href="#L457">457</a>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <strong
class="jxr_keyword">return</strong> isOff(NO_FRAGMENTS);
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> }
-<a class="jxr_linenumber" name="L460" href="#L460">460</a>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em
class="jxr_javadoccomment"> * Returns the number of times the token appears
in the target.</em>
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em
class="jxr_javadoccomment"> * @param token Token value to be counted.</em>
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em
class="jxr_javadoccomment"> * @param target Target value to count tokens
in.</em>
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em
class="jxr_javadoccomment"> * @return the number of tokens.</em>
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> <strong
class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong>
countToken(String token, String target) {
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> <strong
class="jxr_keyword">int</strong> tokenIndex = 0;
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> <strong
class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> <strong
class="jxr_keyword">while</strong> (tokenIndex != -1) {
-<a class="jxr_linenumber" name="L471" href="#L471">471</a>
tokenIndex = target.indexOf(token, tokenIndex);
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> <strong
class="jxr_keyword">if</strong> (tokenIndex > -1) {
-<a class="jxr_linenumber" name="L473" href="#L473">473</a>
tokenIndex++;
-<a class="jxr_linenumber" name="L474" href="#L474">474</a>
count++;
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> }
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> }
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> <strong
class="jxr_keyword">return</strong> count;
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> }
-<a class="jxr_linenumber" name="L479" href="#L479">479</a>
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> <em
class="jxr_javadoccomment"> * Tests whether the given flag is on. If the
flag is not a power of 2</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em
class="jxr_javadoccomment"> * (ie. 3) this tests whether the combination of
flags is on.</em>
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em
class="jxr_javadoccomment"> * @param flag Flag value to check.</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <strong
class="jxr_keyword">return</strong> isOff(NO_FRAGMENTS);
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> }
+<a class="jxr_linenumber" name="L450" href="#L450">450</a>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em
class="jxr_javadoccomment"> * Returns the number of times the token appears
in the target.</em>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> <em
class="jxr_javadoccomment"> * @param token Token value to be counted.</em>
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> <em
class="jxr_javadoccomment"> * @param target Target value to count tokens
in.</em>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> <em
class="jxr_javadoccomment"> * @return the number of tokens.</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> <strong
class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong>
countToken(String token, String target) {
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> <strong
class="jxr_keyword">int</strong> tokenIndex = 0;
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong
class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong
class="jxr_keyword">while</strong> (tokenIndex != -1) {
+<a class="jxr_linenumber" name="L461" href="#L461">461</a>
tokenIndex = target.indexOf(token, tokenIndex);
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong
class="jxr_keyword">if</strong> (tokenIndex > -1) {
+<a class="jxr_linenumber" name="L463" href="#L463">463</a>
tokenIndex++;
+<a class="jxr_linenumber" name="L464" href="#L464">464</a>
count++;
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> }
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> }
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> <strong
class="jxr_keyword">return</strong> count;
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> }
+<a class="jxr_linenumber" name="L469" href="#L469">469</a>
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em
class="jxr_javadoccomment"> * Tests whether the given flag is on. If the
flag is not a power of 2</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em
class="jxr_javadoccomment"> * (ie. 3) this tests whether the combination of
flags is on.</em>
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> <em
class="jxr_javadoccomment"> * @param flag Flag value to check.</em>
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em
class="jxr_javadoccomment"> * @return whether the specified flag value is
on.</em>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">boolean</strong> isOn(<strong
class="jxr_keyword">long</strong> flag) {
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> <strong
class="jxr_keyword">return</strong> (options & flag) > 0;
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> }
+<a class="jxr_linenumber" name="L481" href="#L481">481</a>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em
class="jxr_javadoccomment"> * Tests whether the given flag is off. If the
flag is not a power of 2</em>
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em
class="jxr_javadoccomment"> * (ie. 3) this tests whether the combination of
flags is off.</em>
<a class="jxr_linenumber" name="L485" href="#L485">485</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> <em
class="jxr_javadoccomment"> * @return whether the specified flag value is
on.</em>
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">boolean</strong> isOn(<strong
class="jxr_keyword">long</strong> flag) {
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <strong
class="jxr_keyword">return</strong> (<strong
class="jxr_keyword">this</strong>.options & flag) > 0;
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> }
-<a class="jxr_linenumber" name="L491" href="#L491">491</a>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em
class="jxr_javadoccomment"> * Tests whether the given flag is off. If the
flag is not a power of 2</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em
class="jxr_javadoccomment"> * (ie. 3) this tests whether the combination of
flags is off.</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em
class="jxr_javadoccomment"> * @param flag Flag value to check.</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em
class="jxr_javadoccomment"> * @return whether the specified flag value is
off.</em>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">boolean</strong> isOff(<strong
class="jxr_keyword">long</strong> flag) {
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <strong
class="jxr_keyword">return</strong> (<strong
class="jxr_keyword">this</strong>.options & flag) == 0;
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> }
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> }
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> <em
class="jxr_javadoccomment"> * @param flag Flag value to check.</em>
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> <em
class="jxr_javadoccomment"> * @return whether the specified flag value is
off.</em>
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">boolean</strong> isOff(<strong
class="jxr_keyword">long</strong> flag) {
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <strong
class="jxr_keyword">return</strong> (options & flag) == 0;
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> }
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2014 <a
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
==============================================================================
---
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
(original)
+++
websites/production/commons/content/proper/commons-validator/xref/org/apache/commons/validator/routines/checkdigit/CheckDigit.html
Fri Dec 26 12:51:02 2014
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em
class="jxr_javadoccomment"> * list of implementations provided within Commons
Validator.</em>
<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em
class="jxr_javadoccomment"> * @see
org.apache.commons.validator.routines.CodeValidator</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em
class="jxr_javadoccomment"> * @version $Revision: 1647900 $ $Date: 2014-12-25
16:03:53 +0100 (Do, 25 Dez 2014) $</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em
class="jxr_javadoccomment"> * @version $Revision: 1647968 $ $Date: 2014-12-26
13:46:11 +0100 (Fr, 26 Dez 2014) $</em>
<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em
class="jxr_javadoccomment"> * @since Validator 1.4</em>
<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">interface</strong> <a
href="../../../../../../org/apache/commons/validator/routines/checkdigit/CheckDigit.html">CheckDigit</a>
{
@@ -64,7 +64,7 @@
<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em
class="jxr_javadoccomment"> * @return The calculated Check Digit</em>
<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em
class="jxr_javadoccomment"> * @throws CheckDigitException if an error
occurs.</em>
<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong
class="jxr_keyword">public</strong> String calculate(String code) <strong
class="jxr_keyword">throws</strong> CheckDigitException;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> String
calculate(String code) <strong class="jxr_keyword">throws</strong>
CheckDigitException;
<a class="jxr_linenumber" name="L60" href="#L60">60</a>
<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em
class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em
class="jxr_javadoccomment"> * Validate the check digit for the code.</em>
@@ -73,7 +73,7 @@
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em
class="jxr_javadoccomment"> * @return <code>true</code> if the
check digit is valid, otherwise</em>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em
class="jxr_javadoccomment"> * <code>false</code>.</em>
<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">boolean</strong> isValid(String code);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">boolean</strong> isValid(String code);
<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<a class="jxr_linenumber" name="L70" href="#L70">70</a> }
</pre>
