You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by br...@apache.org on 2017/03/13 09:49:55 UTC
svn commit: r1008235 [35/39] - in
/websites/production/commons/content/proper/commons-cli: ./ apidocs/
apidocs/org/apache/commons/cli/ apidocs/org/apache/commons/cli/class-use/
apidocs/src-html/org/apache/commons/cli/ css/ images/ images/svg/
jacoco-ag...
Modified: websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/DefaultParser.html
==============================================================================
--- websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/DefaultParser.html (original)
+++ websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/DefaultParser.html Mon Mar 13 09:49:52 2017
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head><meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>DefaultParser xref</title>
<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
</head>
@@ -33,7 +33,7 @@
<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <em class="jxr_javadoccomment"> * Default parser.</em>
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultParser.java 1677454 2015-05-03 17:13:54Z ggregory $</em>
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultParser.java 1783175 2017-02-16 07:52:05Z britter $</em>
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <em class="jxr_javadoccomment"> * @since 1.3</em>
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/cli/DefaultParser.html">DefaultParser</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../org/apache/commons/cli/CommandLineParser.html">CommandLineParser</a>
@@ -307,401 +307,414 @@
<a class="jxr_linenumber" name="L299" href="#L299">299</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isShortOption(String token)
<a class="jxr_linenumber" name="L300" href="#L300">300</a> {
<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_comment">// short options (-S, -SV, -S=V, -SV1=V2, -S1S2)</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong class="jxr_keyword">return</strong> token.startsWith(<span class="jxr_string">"-"</span>) && token.length() >= 2 && options.hasShortOption(token.substring(1, 2));
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> }
-<a class="jxr_linenumber" name="L304" href="#L304">304</a>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment"> * Tells if the token looks like a long option.</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> <em class="jxr_javadoccomment"> * @param token</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isLongOption(String token)
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> {
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <strong class="jxr_keyword">if</strong> (!token.startsWith(<span class="jxr_string">"-"</span>) || token.length() == 1)
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> {
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> }
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> <strong class="jxr_keyword">int</strong> pos = token.indexOf(<span class="jxr_string">"="</span>);
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> String t = pos == -1 ? token : token.substring(0, pos);
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong class="jxr_keyword">if</strong> (!options.getMatchingOptions(t).isEmpty())
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> {
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_comment">// long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)</em>
-<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> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (getLongPrefix(token) != <strong class="jxr_keyword">null</strong> && !token.startsWith(<span class="jxr_string">"--"</span>))
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong class="jxr_keyword">if</strong> (!token.startsWith(<span class="jxr_string">"-"</span>) || token.length() == 1)
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> {
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> }
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_comment">// remove leading "-" and "=value"</em>
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> <strong class="jxr_keyword">int</strong> pos = token.indexOf(<span class="jxr_string">"="</span>);
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> <strong class="jxr_keyword">if</strong> (options.hasShortOption(optName))
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> {
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> }
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_comment">// check for several concatenated short options</em>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong class="jxr_keyword">return</strong> optName.length() > 0 && options.hasShortOption(String.valueOf(optName.charAt(0)));
+<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> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment"> * Tells if the token looks like a long option.</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment"> * @param token</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isLongOption(String token)
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> {
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> <strong class="jxr_keyword">if</strong> (!token.startsWith(<span class="jxr_string">"-"</span>) || token.length() == 1)
<a class="jxr_linenumber" name="L326" href="#L326">326</a> {
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_comment">// -LV</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> }
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> }
-<a class="jxr_linenumber" name="L333" href="#L333">333</a>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment"> * Handles an unknown token. If the token starts with a dash an </em>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment"> * UnrecognizedOptionException is thrown. Otherwise the token is added </em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment"> * to the arguments of the command line. If the stopAtNonOption flag </em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment"> * is set, this stops the parsing and the remaining tokens are added </em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment"> * as-is in the arguments of the command line.</em>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleUnknownToken(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<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> (token.startsWith(<span class="jxr_string">"-"</span>) && token.length() > 1 && !stopAtNonOption)
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> {
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/UnrecognizedOptionException.html">UnrecognizedOptionException</a>(<span class="jxr_string">"Unrecognized option: "</span> + token, token);
-<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> cmd.addArg(token);
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> <strong class="jxr_keyword">if</strong> (stopAtNonOption)
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> {
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> skipParsing = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> }
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> }
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> <em class="jxr_javadoccomment"> * --L</em>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment"> * --L=V</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment"> * --L V</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment"> * --l</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOption(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> {
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> <strong class="jxr_keyword">if</strong> (token.indexOf('=') == -1)
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> {
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> handleLongOptionWithoutEqual(token);
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> }
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> {
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> handleLongOptionWithEqual(token);
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> }
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> }
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment"> * --L</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment"> * -L</em>
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment"> * --l</em>
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment"> * -l</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithoutEqual(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> {
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> List<String> matchingOpts = options.getMatchingOptions(token);
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong class="jxr_keyword">if</strong> (matchingOpts.isEmpty())
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> {
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> handleUnknownToken(currentToken);
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> }
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (matchingOpts.size() > 1)
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> {
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/AmbiguousOptionException.html">AmbiguousOptionException</a>(token, matchingOpts);
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> }
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> handleOption(options.getOption(matchingOpts.get(0)));
-<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>
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment"> * --L=V</em>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em class="jxr_javadoccomment"> * -L=V</em>
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment"> * --l=V</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment"> * -l=V</em>
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithEqual(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> {
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> <strong class="jxr_keyword">int</strong> pos = token.indexOf('=');
-<a class="jxr_linenumber" name="L419" href="#L419">419</a>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> String value = token.substring(pos + 1);
-<a class="jxr_linenumber" name="L421" href="#L421">421</a>
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> String opt = token.substring(0, pos);
-<a class="jxr_linenumber" name="L423" href="#L423">423</a>
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> List<String> matchingOpts = options.getMatchingOptions(opt);
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong class="jxr_keyword">if</strong> (matchingOpts.isEmpty())
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> {
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> handleUnknownToken(currentToken);
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> }
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (matchingOpts.size() > 1)
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> {
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/AmbiguousOptionException.html">AmbiguousOptionException</a>(opt, matchingOpts);
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> }
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> {
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(matchingOpts.get(0));
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> }
+<a class="jxr_linenumber" name="L329" href="#L329">329</a>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong class="jxr_keyword">int</strong> pos = token.indexOf(<span class="jxr_string">"="</span>);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> String t = pos == -1 ? token : token.substring(0, pos);
+<a class="jxr_linenumber" name="L332" href="#L332">332</a>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong class="jxr_keyword">if</strong> (!options.getMatchingOptions(t).isEmpty())
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> {
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_comment">// long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)</em>
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> }
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (getLongPrefix(token) != <strong class="jxr_keyword">null</strong> && !token.startsWith(<span class="jxr_string">"--"</span>))
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> {
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_comment">// -LV</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> }
+<a class="jxr_linenumber" name="L343" href="#L343">343</a>
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> }
+<a class="jxr_linenumber" name="L346" href="#L346">346</a>
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_javadoccomment"> * Handles an unknown token. If the token starts with a dash an </em>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment"> * UnrecognizedOptionException is thrown. Otherwise the token is added </em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment"> * to the arguments of the command line. If the stopAtNonOption flag </em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment"> * is set, this stops the parsing and the remaining tokens are added </em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment"> * as-is in the arguments of the command line.</em>
+<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"> * @param token the command line token to handle</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleUnknownToken(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> {
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> <strong class="jxr_keyword">if</strong> (token.startsWith(<span class="jxr_string">"-"</span>) && token.length() > 1 && !stopAtNonOption)
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> {
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/UnrecognizedOptionException.html">UnrecognizedOptionException</a>(<span class="jxr_string">"Unrecognized option: "</span> + token, token);
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> }
+<a class="jxr_linenumber" name="L362" href="#L362">362</a>
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> cmd.addArg(token);
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> <strong class="jxr_keyword">if</strong> (stopAtNonOption)
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> {
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> skipParsing = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> }
+<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> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment"> * --L</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment"> * --L=V</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment"> * --L V</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment"> * --l</em>
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOption(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> {
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> <strong class="jxr_keyword">if</strong> (token.indexOf('=') == -1)
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> {
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> handleLongOptionWithoutEqual(token);
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> }
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> {
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> handleLongOptionWithEqual(token);
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> }
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> }
+<a class="jxr_linenumber" name="L391" href="#L391">391</a>
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> <em class="jxr_javadoccomment"> * --L</em>
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <em class="jxr_javadoccomment"> * -L</em>
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_javadoccomment"> * --l</em>
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment"> * -l</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment"> * </em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</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">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithoutEqual(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> {
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> List<String> matchingOpts = options.getMatchingOptions(token);
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <strong class="jxr_keyword">if</strong> (matchingOpts.isEmpty())
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> {
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> handleUnknownToken(currentToken);
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> }
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (matchingOpts.size() > 1)
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> {
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/AmbiguousOptionException.html">AmbiguousOptionException</a>(token, matchingOpts);
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> }
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> {
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> handleOption(options.getOption(matchingOpts.get(0)));
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> }
+<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> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em class="jxr_javadoccomment"> * --L=V</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment"> * -L=V</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment"> * --l=V</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em class="jxr_javadoccomment"> * -l=V</em>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithEqual(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> {
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> <strong class="jxr_keyword">int</strong> pos = token.indexOf('=');
+<a class="jxr_linenumber" name="L432" href="#L432">432</a>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> String value = token.substring(pos + 1);
+<a class="jxr_linenumber" name="L434" href="#L434">434</a>
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> String opt = token.substring(0, pos);
<a class="jxr_linenumber" name="L436" href="#L436">436</a>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <strong class="jxr_keyword">if</strong> (option.acceptsArg())
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> {
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> handleOption(option);
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> currentOption.addValueForProcessing(value);
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> }
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> {
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> handleUnknownToken(currentToken);
-<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> }
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> List<String> matchingOpts = options.getMatchingOptions(opt);
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> <strong class="jxr_keyword">if</strong> (matchingOpts.isEmpty())
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> {
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> handleUnknownToken(currentToken);
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> }
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (matchingOpts.size() > 1)
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> {
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/AmbiguousOptionException.html">AmbiguousOptionException</a>(opt, matchingOpts);
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> }
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> {
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(matchingOpts.get(0));
<a class="jxr_linenumber" name="L449" href="#L449">449</a>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</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> <em class="jxr_javadoccomment"> * -S</em>
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> <em class="jxr_javadoccomment"> * -SV</em>
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> <em class="jxr_javadoccomment"> * -S V</em>
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_javadoccomment"> * -S=V</em>
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> <em class="jxr_javadoccomment"> * -S1S2</em>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment"> * -S1S2 V</em>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment"> * -SV1=V2</em>
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_javadoccomment"> * -L</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment"> * -LV</em>
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment"> * -L V</em>
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment"> * -L=V</em>
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment"> * -l</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> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleShortAndLongOption(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> {
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> String t = Util.stripLeadingHyphens(token);
-<a class="jxr_linenumber" name="L472" href="#L472">472</a>
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> <strong class="jxr_keyword">int</strong> pos = t.indexOf('=');
-<a class="jxr_linenumber" name="L474" href="#L474">474</a>
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> <strong class="jxr_keyword">if</strong> (t.length() == 1)
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> {
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_comment">// -S</em>
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">if</strong> (options.hasShortOption(t))
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> {
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> handleOption(options.getOption(t));
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> }
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> {
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> handleUnknownToken(token);
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> }
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> }
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (pos == -1)
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> {
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_comment">// no equal sign found (-xxx)</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> <strong class="jxr_keyword">if</strong> (options.hasShortOption(t))
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> {
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> handleOption(options.getOption(t));
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> }
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!options.getMatchingOptions(t).isEmpty())
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> {
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_comment">// -L or -l</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> handleLongOptionWithoutEqual(token);
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <strong class="jxr_keyword">if</strong> (option.acceptsArg())
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> {
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> handleOption(option);
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> currentOption.addValueForProcessing(value);
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> currentOption = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> }
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> {
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> handleUnknownToken(currentToken);
+<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> }
+<a class="jxr_linenumber" name="L462" href="#L462">462</a>
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment"> * Handles the following tokens:</em>
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment"> * -S</em>
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> <em class="jxr_javadoccomment"> * -SV</em>
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> <em class="jxr_javadoccomment"> * -S V</em>
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> <em class="jxr_javadoccomment"> * -S=V</em>
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> <em class="jxr_javadoccomment"> * -S1S2</em>
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_javadoccomment"> * -S1S2 V</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em class="jxr_javadoccomment"> * -SV1=V2</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"> * -L</em>
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em class="jxr_javadoccomment"> * -LV</em>
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment"> * -L V</em>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_javadoccomment"> * -L=V</em>
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> <em class="jxr_javadoccomment"> * -l</em>
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em>
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleShortAndLongOption(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> {
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> String t = Util.stripLeadingHyphens(token);
+<a class="jxr_linenumber" name="L485" href="#L485">485</a>
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> <strong class="jxr_keyword">int</strong> pos = t.indexOf('=');
+<a class="jxr_linenumber" name="L487" href="#L487">487</a>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> <strong class="jxr_keyword">if</strong> (t.length() == 1)
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> {
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_comment">// -S</em>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <strong class="jxr_keyword">if</strong> (options.hasShortOption(t))
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> {
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> handleOption(options.getOption(t));
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> }
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> {
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> handleUnknownToken(token);
<a class="jxr_linenumber" name="L498" href="#L498">498</a> }
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> {
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_comment">// look for a long prefix (-Xmx512m)</em>
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> String opt = getLongPrefix(t);
-<a class="jxr_linenumber" name="L503" href="#L503">503</a>
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> <strong class="jxr_keyword">if</strong> (opt != <strong class="jxr_keyword">null</strong> && options.getOption(opt).acceptsArg())
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> {
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> handleOption(options.getOption(opt));
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> currentOption.addValueForProcessing(t.substring(opt.length()));
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> }
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isJavaProperty(t))
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> {
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_comment">// -SV1 (-Dflag)</em>
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> handleOption(options.getOption(t.substring(0, 1)));
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> currentOption.addValueForProcessing(t.substring(1));
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> }
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> }
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (pos == -1)
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> {
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_comment">// no equal sign found (-xxx)</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> <strong class="jxr_keyword">if</strong> (options.hasShortOption(t))
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> {
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> handleOption(options.getOption(t));
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> }
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!options.getMatchingOptions(t).isEmpty())
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> {
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_comment">// -L or -l</em>
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> handleLongOptionWithoutEqual(token);
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> }
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> {
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_comment">// look for a long prefix (-Xmx512m)</em>
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> String opt = getLongPrefix(t);
+<a class="jxr_linenumber" name="L516" href="#L516">516</a>
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> <strong class="jxr_keyword">if</strong> (opt != <strong class="jxr_keyword">null</strong> && options.getOption(opt).acceptsArg())
<a class="jxr_linenumber" name="L518" href="#L518">518</a> {
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_comment">// -S1S2S3 or -S1S2V</em>
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> handleConcatenatedOptions(token);
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> }
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> }
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> }
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> {
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_comment">// equal sign found (-xxx=yyy)</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> String opt = t.substring(0, pos);
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> String value = t.substring(pos + 1);
-<a class="jxr_linenumber" name="L529" href="#L529">529</a>
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> <strong class="jxr_keyword">if</strong> (opt.length() == 1)
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> {
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em class="jxr_comment">// -S=V</em>
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(opt);
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> <strong class="jxr_keyword">if</strong> (option != <strong class="jxr_keyword">null</strong> && option.acceptsArg())
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> {
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> handleOption(option);
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> currentOption.addValueForProcessing(value);
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> }
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> {
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> handleUnknownToken(token);
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> }
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> }
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isJavaProperty(opt))
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> {
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_comment">// -SV1=V2 (-Dkey=value)</em>
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> handleOption(options.getOption(opt.substring(0, 1)));
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> currentOption.addValueForProcessing(opt.substring(1));
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> currentOption.addValueForProcessing(value);
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> }
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> {
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> <em class="jxr_comment">// -L=V or -l=V</em>
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> handleLongOptionWithEqual(token);
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> handleOption(options.getOption(opt));
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> currentOption.addValueForProcessing(t.substring(opt.length()));
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> currentOption = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> }
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isJavaProperty(t))
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> {
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_comment">// -SV1 (-Dflag)</em>
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> handleOption(options.getOption(t.substring(0, 1)));
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> currentOption.addValueForProcessing(t.substring(1));
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> currentOption = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> }
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> {
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em class="jxr_comment">// -S1S2S3 or -S1S2V</em>
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> handleConcatenatedOptions(token);
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> }
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> }
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> }
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> {
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> <em class="jxr_comment">// equal sign found (-xxx=yyy)</em>
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> String opt = t.substring(0, pos);
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> String value = t.substring(pos + 1);
+<a class="jxr_linenumber" name="L542" href="#L542">542</a>
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> <strong class="jxr_keyword">if</strong> (opt.length() == 1)
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> {
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> <em class="jxr_comment">// -S=V</em>
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(opt);
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> <strong class="jxr_keyword">if</strong> (option != <strong class="jxr_keyword">null</strong> && option.acceptsArg())
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> {
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> handleOption(option);
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> currentOption.addValueForProcessing(value);
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> currentOption = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> }
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> {
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> handleUnknownToken(token);
+<a class="jxr_linenumber" name="L556" href="#L556">556</a> }
<a class="jxr_linenumber" name="L557" href="#L557">557</a> }
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> }
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> }
-<a class="jxr_linenumber" name="L560" href="#L560">560</a>
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> <em class="jxr_javadoccomment"> * Search for a prefix that is the long name of an option (-Xmx512m)</em>
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em class="jxr_javadoccomment"> * @param token</em>
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> <strong class="jxr_keyword">private</strong> String getLongPrefix(String token)
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> {
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> String t = Util.stripLeadingHyphens(token);
-<a class="jxr_linenumber" name="L569" href="#L569">569</a>
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> <strong class="jxr_keyword">int</strong> i;
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> String opt = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> <strong class="jxr_keyword">for</strong> (i = t.length() - 2; i > 1; i--)
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> {
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> String prefix = t.substring(0, i);
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> <strong class="jxr_keyword">if</strong> (options.hasLongOption(prefix))
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> {
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> opt = prefix;
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> }
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> }
-<a class="jxr_linenumber" name="L581" href="#L581">581</a>
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> <strong class="jxr_keyword">return</strong> opt;
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> }
-<a class="jxr_linenumber" name="L584" href="#L584">584</a>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> <em class="jxr_javadoccomment"> * Check if the specified token is a Java-like property (-Dkey=value).</em>
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isJavaProperty(String token)
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> {
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> String opt = token.substring(0, 1);
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(opt);
-<a class="jxr_linenumber" name="L592" href="#L592">592</a>
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> <strong class="jxr_keyword">return</strong> option != <strong class="jxr_keyword">null</strong> && (option.getArgs() >= 2 || option.getArgs() == Option.UNLIMITED_VALUES);
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> }
-<a class="jxr_linenumber" name="L595" href="#L595">595</a>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleOption(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> {
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> <em class="jxr_comment">// check the previous option before handling the next one</em>
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> checkRequiredArgs();
-<a class="jxr_linenumber" name="L600" href="#L600">600</a>
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> option = (Option) option.clone();
-<a class="jxr_linenumber" name="L602" href="#L602">602</a>
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> updateRequiredOptions(option);
-<a class="jxr_linenumber" name="L604" href="#L604">604</a>
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> cmd.addOption(option);
-<a class="jxr_linenumber" name="L606" href="#L606">606</a>
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> <strong class="jxr_keyword">if</strong> (option.hasArg())
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> {
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> currentOption = option;
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> }
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> {
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> currentOption = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> }
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> }
-<a class="jxr_linenumber" name="L616" href="#L616">616</a>
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> <em class="jxr_javadoccomment"> * Removes the option or its group from the list of expected elements.</em>
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> <em class="jxr_javadoccomment"> * @param option</em>
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> updateRequiredOptions(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> AlreadySelectedException
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> {
-<a class="jxr_linenumber" name="L624" href="#L624">624</a> <strong class="jxr_keyword">if</strong> (option.isRequired())
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isJavaProperty(opt))
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> {
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> <em class="jxr_comment">// -SV1=V2 (-Dkey=value)</em>
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> handleOption(options.getOption(opt.substring(0, 1)));
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> currentOption.addValueForProcessing(opt.substring(1));
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> currentOption.addValueForProcessing(value);
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> currentOption = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> }
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> {
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> <em class="jxr_comment">// -L=V or -l=V</em>
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> handleLongOptionWithEqual(token);
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> }
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> }
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> }
+<a class="jxr_linenumber" name="L573" href="#L573">573</a>
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> <em class="jxr_javadoccomment"> * Search for a prefix that is the long name of an option (-Xmx512m)</em>
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> <em class="jxr_javadoccomment"> * @param token</em>
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> <strong class="jxr_keyword">private</strong> String getLongPrefix(String token)
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> {
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> String t = Util.stripLeadingHyphens(token);
+<a class="jxr_linenumber" name="L582" href="#L582">582</a>
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> <strong class="jxr_keyword">int</strong> i;
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> String opt = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> <strong class="jxr_keyword">for</strong> (i = t.length() - 2; i > 1; i--)
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> {
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> String prefix = t.substring(0, i);
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> <strong class="jxr_keyword">if</strong> (options.hasLongOption(prefix))
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> {
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> opt = prefix;
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> }
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> }
+<a class="jxr_linenumber" name="L594" href="#L594">594</a>
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> <strong class="jxr_keyword">return</strong> opt;
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> }
+<a class="jxr_linenumber" name="L597" href="#L597">597</a>
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> <em class="jxr_javadoccomment"> * Check if the specified token is a Java-like property (-Dkey=value).</em>
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isJavaProperty(String token)
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> {
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> String opt = token.substring(0, 1);
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option = options.getOption(opt);
+<a class="jxr_linenumber" name="L605" href="#L605">605</a>
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> <strong class="jxr_keyword">return</strong> option != <strong class="jxr_keyword">null</strong> && (option.getArgs() >= 2 || option.getArgs() == Option.UNLIMITED_VALUES);
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> }
+<a class="jxr_linenumber" name="L608" href="#L608">608</a>
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleOption(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> {
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> <em class="jxr_comment">// check the previous option before handling the next one</em>
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> checkRequiredArgs();
+<a class="jxr_linenumber" name="L613" href="#L613">613</a>
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> option = (Option) option.clone();
+<a class="jxr_linenumber" name="L615" href="#L615">615</a>
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> updateRequiredOptions(option);
+<a class="jxr_linenumber" name="L617" href="#L617">617</a>
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> cmd.addOption(option);
+<a class="jxr_linenumber" name="L619" href="#L619">619</a>
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> <strong class="jxr_keyword">if</strong> (option.hasArg())
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> {
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> currentOption = option;
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> }
+<a class="jxr_linenumber" name="L624" href="#L624">624</a> <strong class="jxr_keyword">else</strong>
<a class="jxr_linenumber" name="L625" href="#L625">625</a> {
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> expectedOpts.remove(option.getKey());
+<a class="jxr_linenumber" name="L626" href="#L626">626</a> currentOption = <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L627" href="#L627">627</a> }
-<a class="jxr_linenumber" name="L628" href="#L628">628</a>
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> <em class="jxr_comment">// if the option is in an OptionGroup make that option the selected option of the group</em>
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> <strong class="jxr_keyword">if</strong> (options.getOptionGroup(option) != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> {
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> <a href="../../../../org/apache/commons/cli/OptionGroup.html">OptionGroup</a> group = options.getOptionGroup(option);
-<a class="jxr_linenumber" name="L633" href="#L633">633</a>
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> <strong class="jxr_keyword">if</strong> (group.isRequired())
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> {
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> expectedOpts.remove(group);
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> }
-<a class="jxr_linenumber" name="L638" href="#L638">638</a>
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> group.setSelected(option);
+<a class="jxr_linenumber" name="L628" href="#L628">628</a> }
+<a class="jxr_linenumber" name="L629" href="#L629">629</a>
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> <em class="jxr_javadoccomment"> * Removes the option or its group from the list of expected elements.</em>
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment"> * @param option</em>
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> updateRequiredOptions(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> AlreadySelectedException
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> {
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> <strong class="jxr_keyword">if</strong> (option.isRequired())
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> {
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> expectedOpts.remove(option.getKey());
<a class="jxr_linenumber" name="L640" href="#L640">640</a> }
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> }
-<a class="jxr_linenumber" name="L642" href="#L642">642</a>
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment"> * Breaks <code>token</code> into its constituent parts</em>
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> <em class="jxr_javadoccomment"> * using the following algorithm.</em>
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> <em class="jxr_javadoccomment"> * <ul></em>
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment"> * <li>ignore the first character ("<b>-</b>")</li></em>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment"> * <li>foreach remaining character check if an {@link Option}</em>
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> <em class="jxr_javadoccomment"> * exists with that id.</li></em>
-<a class="jxr_linenumber" name="L651" href="#L651">651</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does exist then add that character</em>
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> <em class="jxr_javadoccomment"> * prepended with "<b>-</b>" to the list of processed tokens.</li></em>
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> <em class="jxr_javadoccomment"> * <li>if the {@link Option} can have an argument value and there</em>
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> <em class="jxr_javadoccomment"> * are remaining characters in the token then add the remaining</em>
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> <em class="jxr_javadoccomment"> * characters as a token to the list of processed tokens.</li></em>
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does <b>NOT</b> exist <b>AND</b></em>
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> <em class="jxr_javadoccomment"> * <code>stopAtNonOption</code> <b>IS</b> set then add the special token</em>
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> <em class="jxr_javadoccomment"> * "<b>--</b>" followed by the remaining characters and also</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment"> * the remaining tokens directly to the processed tokens list.</li></em>
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does <b>NOT</b> exist <b>AND</b></em>
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment"> * <code>stopAtNonOption</code> <b>IS NOT</b> set then add that</em>
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment"> * character prepended with "<b>-</b>".</li></em>
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> <em class="jxr_javadoccomment"> * </ul></em>
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> <em class="jxr_javadoccomment"> * @param token The current token to be <b>burst</b></em>
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> <em class="jxr_javadoccomment"> * at the first non-Option encountered.</em>
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are any problems encountered</em>
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment"> * while parsing the command line token.</em>
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleConcatenatedOptions(String token) <strong class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> {
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 1; i < token.length(); i++)
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> {
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> String ch = String.valueOf(token.charAt(i));
-<a class="jxr_linenumber" name="L675" href="#L675">675</a>
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> <strong class="jxr_keyword">if</strong> (options.hasOption(ch))
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> {
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> handleOption(options.getOption(ch));
-<a class="jxr_linenumber" name="L679" href="#L679">679</a>
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> <strong class="jxr_keyword">if</strong> (currentOption != <strong class="jxr_keyword">null</strong> && token.length() != i + 1)
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> {
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em class="jxr_comment">// add the trail as an argument of the option</em>
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> currentOption.addValueForProcessing(token.substring(i + 1));
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> }
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> }
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> {
-<a class="jxr_linenumber" name="L689" href="#L689">689</a> handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> }
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> }
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> }
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> }
+<a class="jxr_linenumber" name="L641" href="#L641">641</a>
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> <em class="jxr_comment">// if the option is in an OptionGroup make that option the selected option of the group</em>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> <strong class="jxr_keyword">if</strong> (options.getOptionGroup(option) != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> {
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> <a href="../../../../org/apache/commons/cli/OptionGroup.html">OptionGroup</a> group = options.getOptionGroup(option);
+<a class="jxr_linenumber" name="L646" href="#L646">646</a>
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> <strong class="jxr_keyword">if</strong> (group.isRequired())
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> {
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> expectedOpts.remove(group);
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> }
+<a class="jxr_linenumber" name="L651" href="#L651">651</a>
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> group.setSelected(option);
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> }
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> }
+<a class="jxr_linenumber" name="L655" href="#L655">655</a>
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> <em class="jxr_javadoccomment"> * Breaks <code>token</code> into its constituent parts</em>
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> <em class="jxr_javadoccomment"> * using the following algorithm.</em>
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment"> * <ul></em>
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment"> * <li>ignore the first character ("<b>-</b>")</li></em>
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment"> * <li>for each remaining character check if an {@link Option}</em>
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> <em class="jxr_javadoccomment"> * exists with that id.</li></em>
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does exist then add that character</em>
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> <em class="jxr_javadoccomment"> * prepended with "<b>-</b>" to the list of processed tokens.</li></em>
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> <em class="jxr_javadoccomment"> * <li>if the {@link Option} can have an argument value and there</em>
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> <em class="jxr_javadoccomment"> * are remaining characters in the token then add the remaining</em>
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment"> * characters as a token to the list of processed tokens.</li></em>
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does <b>NOT</b> exist <b>AND</b></em>
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> <em class="jxr_javadoccomment"> * <code>stopAtNonOption</code> <b>IS</b> set then add the special token</em>
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> <em class="jxr_javadoccomment"> * "<b>--</b>" followed by the remaining characters and also</em>
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> <em class="jxr_javadoccomment"> * the remaining tokens directly to the processed tokens list.</li></em>
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> <em class="jxr_javadoccomment"> * <li>if an {@link Option} does <b>NOT</b> exist <b>AND</b></em>
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> <em class="jxr_javadoccomment"> * <code>stopAtNonOption</code> <b>IS NOT</b> set then add that</em>
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> <em class="jxr_javadoccomment"> * character prepended with "<b>-</b>".</li></em>
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> <em class="jxr_javadoccomment"> * </ul></em>
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> <em class="jxr_javadoccomment"> * @param token The current token to be <b>burst</b></em>
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em class="jxr_javadoccomment"> * at the first non-Option encountered.</em>
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are any problems encountered</em>
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> <em class="jxr_javadoccomment"> * while parsing the command line token.</em>
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleConcatenatedOptions(String token) <strong class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> {
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 1; i < token.length(); i++)
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> {
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> String ch = String.valueOf(token.charAt(i));
[... 29 lines stripped ...]