Modified: websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLine.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLine.html (original) +++ websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLine.html Thu Jun 8 17:47:18 2017 @@ -43,7 +43,7 @@ <a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * Additionally, any left-over or unrecognized arguments,</em> <a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * are available for further processing.</em> <a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> *</em> -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @version $Id: CommandLine.java 1788678 2017-03-25 18:32:55Z britter $</em> +<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @version $Id$</em> <a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> <strong class="jxr_keyword">implements</strong> Serializable <a class="jxr_linenumber" name="L41" href="#L41">41</a> { @@ -69,9 +69,9 @@ <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"> * @param opt the option to check</em> <a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_javadoccomment"> * @return true if set, false if not</em> -<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) +<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) <a class="jxr_linenumber" name="L67" href="#L67">67</a> { <a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">return</strong> options.contains(opt); <a class="jxr_linenumber" name="L69" href="#L69">69</a> } @@ -82,7 +82,7 @@ <a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_javadoccomment"> * @param opt Short name of the option</em> <a class="jxr_linenumber" name="L75" href="#L75">75</a> <em class="jxr_javadoccomment"> * @return true if set, false if not</em> <a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(String opt) +<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(<strong class="jxr_keyword">final</strong> String opt) <a class="jxr_linenumber" name="L78" href="#L78">78</a> { <a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> hasOption(resolveOption(opt)); <a class="jxr_linenumber" name="L80" href="#L80">80</a> } @@ -93,7 +93,7 @@ <a class="jxr_linenumber" name="L85" href="#L85">85</a> <em class="jxr_javadoccomment"> * @param opt character name of the option</em> <a class="jxr_linenumber" name="L86" href="#L86">86</a> <em class="jxr_javadoccomment"> * @return true if set, false if not</em> <a class="jxr_linenumber" name="L87" href="#L87">87</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(<strong class="jxr_keyword">char</strong> opt) +<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasOption(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt) <a class="jxr_linenumber" name="L89" href="#L89">89</a> { <a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">return</strong> hasOption(String.valueOf(opt)); <a class="jxr_linenumber" name="L91" href="#L91">91</a> } @@ -106,13 +106,13 @@ <a class="jxr_linenumber" name="L98" href="#L98">98</a> <em class="jxr_javadoccomment"> * @deprecated due to System.err message. Instead use getParsedOptionValue(String)</em> <a class="jxr_linenumber" name="L99" href="#L99">99</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L100" href="#L100">100</a> @Deprecated -<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">public</strong> Object getOptionObject(String opt) +<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">public</strong> Object getOptionObject(<strong class="jxr_keyword">final</strong> String opt) <a class="jxr_linenumber" name="L102" href="#L102">102</a> { <a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">try</strong> <a class="jxr_linenumber" name="L104" href="#L104">104</a> { <a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">return</strong> getParsedOptionValue(opt); <a class="jxr_linenumber" name="L106" href="#L106">106</a> } -<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">catch</strong> (ParseException pe) +<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> ParseException pe) <a class="jxr_linenumber" name="L108" href="#L108">108</a> { <a class="jxr_linenumber" name="L109" href="#L109">109</a> System.err.println(<span class="jxr_string">"Exception found converting "</span> + opt + <span class="jxr_string">" to desired type: "</span> + pe.getMessage()); <a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; @@ -126,15 +126,15 @@ <a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> * @return the value parsed into a particular object</em> <a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are problems turning the option value into the desired type</em> <a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * @see PatternOptionBuilder</em> -<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L124" href="#L124">124</a> { <a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">if</strong> (option == <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L126" href="#L126">126</a> { <a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; <a class="jxr_linenumber" name="L128" href="#L128">128</a> } -<a class="jxr_linenumber" name="L129" href="#L129">129</a> String res = getOptionValue(option); +<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">final</strong> String res = getOptionValue(option); <a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">if</strong> (res == <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L131" href="#L131">131</a> { <a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; @@ -151,7 +151,7 @@ <a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> * @see PatternOptionBuilder</em> <a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> * @since 1.2</em> <a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(String opt) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(<strong class="jxr_keyword">final</strong> String opt) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L147" href="#L147">147</a> { <a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">return</strong> getParsedOptionValue(resolveOption(opt)); <a class="jxr_linenumber" name="L149" href="#L149">149</a> } @@ -163,9 +163,9 @@ <a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment"> * @return the value parsed into a particular object</em> <a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are problems turning the option value into the desired type</em> <a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment"> * @see PatternOptionBuilder</em> -<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment"> * @since 1.2</em> +<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(<strong class="jxr_keyword">char</strong> opt) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">public</strong> Object getParsedOptionValue(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L161" href="#L161">161</a> { <a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">return</strong> getParsedOptionValue(String.valueOf(opt)); <a class="jxr_linenumber" name="L163" href="#L163">163</a> } @@ -177,7 +177,7 @@ <a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment"> * @param opt the name of the option</em> <a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment"> * @return the type of opt</em> <a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">public</strong> Object getOptionObject(<strong class="jxr_keyword">char</strong> opt) +<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">public</strong> Object getOptionObject(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt) <a class="jxr_linenumber" name="L173" href="#L173">173</a> { <a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">return</strong> getOptionObject(String.valueOf(opt)); <a class="jxr_linenumber" name="L175" href="#L175">175</a> } @@ -188,15 +188,15 @@ <a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * @param option the name of the option</em> <a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> * otherwise null.</em> -<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) +<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <a class="jxr_linenumber" name="L186" href="#L186">186</a> { <a class="jxr_linenumber" name="L187" href="#L187">187</a> <strong class="jxr_keyword">if</strong> (option == <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L188" href="#L188">188</a> { <a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; <a class="jxr_linenumber" name="L190" href="#L190">190</a> } -<a class="jxr_linenumber" name="L191" href="#L191">191</a> String[] values = getOptionValues(option); +<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">final</strong> String[] values = getOptionValues(option); <a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">return</strong> (values == <strong class="jxr_keyword">null</strong>) ? <strong class="jxr_keyword">null</strong> : values[0]; <a class="jxr_linenumber" name="L193" href="#L193">193</a> } <a class="jxr_linenumber" name="L194" href="#L194">194</a> @@ -207,7 +207,7 @@ <a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment"> * otherwise null.</em> <a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">public</strong> String getOptionValue(String opt) +<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> String opt) <a class="jxr_linenumber" name="L203" href="#L203">203</a> { <a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">return</strong> getOptionValue(resolveOption(opt)); <a class="jxr_linenumber" name="L205" href="#L205">205</a> } @@ -219,7 +219,7 @@ <a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment"> * otherwise null.</em> <a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">char</strong> opt) +<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt) <a class="jxr_linenumber" name="L215" href="#L215">215</a> { <a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">return</strong> getOptionValue(String.valueOf(opt)); <a class="jxr_linenumber" name="L217" href="#L217">217</a> } @@ -230,13 +230,13 @@ <a class="jxr_linenumber" name="L222" href="#L222">222</a> <em class="jxr_javadoccomment"> * @param option string name of the option</em> <a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment"> * @return Values of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment"> * otherwise null.</em> -<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) +<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <a class="jxr_linenumber" name="L228" href="#L228">228</a> { -<a class="jxr_linenumber" name="L229" href="#L229">229</a> List<String> values = <strong class="jxr_keyword">new</strong> ArrayList<String>(); +<a class="jxr_linenumber" name="L229" href="#L229">229</a> <strong class="jxr_keyword">final</strong> List<String> values = <strong class="jxr_keyword">new</strong> ArrayList<String>(); <a class="jxr_linenumber" name="L230" href="#L230">230</a> -<a class="jxr_linenumber" name="L231" href="#L231">231</a> <strong class="jxr_keyword">for</strong> (Option processedOption : options) +<a class="jxr_linenumber" name="L231" href="#L231">231</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Option processedOption : options) <a class="jxr_linenumber" name="L232" href="#L232">232</a> { <a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">if</strong> (processedOption.equals(option)) <a class="jxr_linenumber" name="L234" href="#L234">234</a> { @@ -254,7 +254,7 @@ <a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment"> * @return Values of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment"> * otherwise null.</em> <a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(String opt) +<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(<strong class="jxr_keyword">final</strong> String opt) <a class="jxr_linenumber" name="L250" href="#L250">250</a> { <a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong class="jxr_keyword">return</strong> getOptionValues(resolveOption(opt)); <a class="jxr_linenumber" name="L252" href="#L252">252</a> } @@ -268,7 +268,7 @@ <a class="jxr_linenumber" name="L260" href="#L260">260</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> resolveOption(String opt) <a class="jxr_linenumber" name="L261" href="#L261">261</a> { <a class="jxr_linenumber" name="L262" href="#L262">262</a> opt = Util.stripLeadingHyphens(opt); -<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">for</strong> (Option option : options) +<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Option option : options) <a class="jxr_linenumber" name="L264" href="#L264">264</a> { <a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">if</strong> (opt.equals(option.getOpt())) <a class="jxr_linenumber" name="L266" href="#L266">266</a> { @@ -291,7 +291,7 @@ <a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_javadoccomment"> * @return Values of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L284" href="#L284">284</a> <em class="jxr_javadoccomment"> * otherwise null.</em> <a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(<strong class="jxr_keyword">char</strong> opt) +<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong class="jxr_keyword">public</strong> String[] getOptionValues(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt) <a class="jxr_linenumber" name="L287" href="#L287">287</a> { <a class="jxr_linenumber" name="L288" href="#L288">288</a> <strong class="jxr_keyword">return</strong> getOptionValues(String.valueOf(opt)); <a class="jxr_linenumber" name="L289" href="#L289">289</a> } @@ -304,11 +304,11 @@ <a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment"> * is not specified</em> <a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment"> * otherwise <code>defaultValue</code>.</em> -<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option, String defaultValue) +<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option, <strong class="jxr_keyword">final</strong> String defaultValue) <a class="jxr_linenumber" name="L302" href="#L302">302</a> { -<a class="jxr_linenumber" name="L303" href="#L303">303</a> String answer = getOptionValue(option); +<a class="jxr_linenumber" name="L303" href="#L303">303</a> <strong class="jxr_keyword">final</strong> String answer = getOptionValue(option); <a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">return</strong> (answer != <strong class="jxr_keyword">null</strong>) ? answer : defaultValue; <a class="jxr_linenumber" name="L305" href="#L305">305</a> } <a class="jxr_linenumber" name="L306" href="#L306">306</a> @@ -321,7 +321,7 @@ <a class="jxr_linenumber" name="L313" href="#L313">313</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment"> * otherwise <code>defaultValue</code>.</em> <a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L316" href="#L316">316</a> <strong class="jxr_keyword">public</strong> String getOptionValue(String opt, String defaultValue) +<a class="jxr_linenumber" name="L316" href="#L316">316</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> String opt, <strong class="jxr_keyword">final</strong> String defaultValue) <a class="jxr_linenumber" name="L317" href="#L317">317</a> { <a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong class="jxr_keyword">return</strong> getOptionValue(resolveOption(opt), defaultValue); <a class="jxr_linenumber" name="L319" href="#L319">319</a> } @@ -335,7 +335,7 @@ <a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_javadoccomment"> * @return Value of the argument if option is set, and has an argument,</em> <a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment"> * otherwise <code>defaultValue</code>.</em> <a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">char</strong> opt, String defaultValue) +<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong class="jxr_keyword">public</strong> String getOptionValue(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> opt, <strong class="jxr_keyword">final</strong> String defaultValue) <a class="jxr_linenumber" name="L331" href="#L331">331</a> { <a class="jxr_linenumber" name="L332" href="#L332">332</a> <strong class="jxr_keyword">return</strong> getOptionValue(String.valueOf(opt), defaultValue); <a class="jxr_linenumber" name="L333" href="#L333">333</a> } @@ -351,17 +351,17 @@ <a class="jxr_linenumber" name="L343" href="#L343">343</a> <em class="jxr_javadoccomment"> * @param option name of the option</em> <a class="jxr_linenumber" name="L344" href="#L344">344</a> <em class="jxr_javadoccomment"> * @return The Properties mapped by the option, never <tt>null</tt></em> <a class="jxr_linenumber" name="L345" href="#L345">345</a> <em class="jxr_javadoccomment"> * even if the option doesn't exists</em> -<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment"> * @since 1.5</em> <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> <strong class="jxr_keyword">public</strong> Properties getOptionProperties(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) +<a class="jxr_linenumber" name="L348" href="#L348">348</a> <strong class="jxr_keyword">public</strong> Properties getOptionProperties(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> option) <a class="jxr_linenumber" name="L349" href="#L349">349</a> { -<a class="jxr_linenumber" name="L350" href="#L350">350</a> Properties props = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong class="jxr_keyword">final</strong> Properties props = <strong class="jxr_keyword">new</strong> Properties(); <a class="jxr_linenumber" name="L351" href="#L351">351</a> -<a class="jxr_linenumber" name="L352" href="#L352">352</a> <strong class="jxr_keyword">for</strong> (Option processedOption : options) +<a class="jxr_linenumber" name="L352" href="#L352">352</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Option processedOption : options) <a class="jxr_linenumber" name="L353" href="#L353">353</a> { <a class="jxr_linenumber" name="L354" href="#L354">354</a> <strong class="jxr_keyword">if</strong> (processedOption.equals(option)) <a class="jxr_linenumber" name="L355" href="#L355">355</a> { -<a class="jxr_linenumber" name="L356" href="#L356">356</a> List<String> values = processedOption.getValuesList(); +<a class="jxr_linenumber" name="L356" href="#L356">356</a> <strong class="jxr_keyword">final</strong> List<String> values = processedOption.getValuesList(); <a class="jxr_linenumber" name="L357" href="#L357">357</a> <strong class="jxr_keyword">if</strong> (values.size() >= 2) <a class="jxr_linenumber" name="L358" href="#L358">358</a> { <a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_comment">// use the first 2 arguments as the key/value pair</em> @@ -391,15 +391,15 @@ <a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment"> * even if the option doesn't exists</em> <a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment"> * @since 1.2</em> <a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong class="jxr_keyword">public</strong> Properties getOptionProperties(String opt) +<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong class="jxr_keyword">public</strong> Properties getOptionProperties(<strong class="jxr_keyword">final</strong> String opt) <a class="jxr_linenumber" name="L387" href="#L387">387</a> { -<a class="jxr_linenumber" name="L388" href="#L388">388</a> Properties props = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong class="jxr_keyword">final</strong> Properties props = <strong class="jxr_keyword">new</strong> Properties(); <a class="jxr_linenumber" name="L389" href="#L389">389</a> -<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong class="jxr_keyword">for</strong> (Option option : options) +<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Option option : options) <a class="jxr_linenumber" name="L391" href="#L391">391</a> { <a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong class="jxr_keyword">if</strong> (opt.equals(option.getOpt()) || opt.equals(option.getLongOpt())) <a class="jxr_linenumber" name="L393" href="#L393">393</a> { -<a class="jxr_linenumber" name="L394" href="#L394">394</a> List<String> values = option.getValuesList(); +<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong class="jxr_keyword">final</strong> List<String> values = option.getValuesList(); <a class="jxr_linenumber" name="L395" href="#L395">395</a> <strong class="jxr_keyword">if</strong> (values.size() >= 2) <a class="jxr_linenumber" name="L396" href="#L396">396</a> { <a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_comment">// use the first 2 arguments as the key/value pair</em> @@ -423,7 +423,7 @@ <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">public</strong> String[] getArgs() <a class="jxr_linenumber" name="L417" href="#L417">417</a> { -<a class="jxr_linenumber" name="L418" href="#L418">418</a> String[] answer = <strong class="jxr_keyword">new</strong> String[args.size()]; +<a class="jxr_linenumber" name="L418" href="#L418">418</a> <strong class="jxr_keyword">final</strong> String[] answer = <strong class="jxr_keyword">new</strong> String[args.size()]; <a class="jxr_linenumber" name="L419" href="#L419">419</a> <a class="jxr_linenumber" name="L420" href="#L420">420</a> args.toArray(answer); <a class="jxr_linenumber" name="L421" href="#L421">421</a> @@ -467,7 +467,7 @@ <a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment"> * @param arg the unrecognized option/argument.</em> <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> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> addArg(String arg) +<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> addArg(<strong class="jxr_keyword">final</strong> String arg) <a class="jxr_linenumber" name="L463" href="#L463">463</a> { <a class="jxr_linenumber" name="L464" href="#L464">464</a> args.add(arg); <a class="jxr_linenumber" name="L465" href="#L465">465</a> } @@ -477,7 +477,7 @@ <a class="jxr_linenumber" name="L469" href="#L469">469</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L470" href="#L470">470</a> <em class="jxr_javadoccomment"> * @param opt the processed option</em> <a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L472" href="#L472">472</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> addOption(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) +<a class="jxr_linenumber" name="L472" href="#L472">472</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> addOption(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) <a class="jxr_linenumber" name="L473" href="#L473">473</a> { <a class="jxr_linenumber" name="L474" href="#L474">474</a> options.add(opt); <a class="jxr_linenumber" name="L475" href="#L475">475</a> } @@ -500,10 +500,10 @@ <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> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a>[] getOptions() <a class="jxr_linenumber" name="L494" href="#L494">494</a> { -<a class="jxr_linenumber" name="L495" href="#L495">495</a> Collection<Option> processed = options; +<a class="jxr_linenumber" name="L495" href="#L495">495</a> <strong class="jxr_keyword">final</strong> Collection<Option> processed = options; <a class="jxr_linenumber" name="L496" href="#L496">496</a> <a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_comment">// reinitialise array</em> -<a class="jxr_linenumber" name="L498" href="#L498">498</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a>[] optionsArray = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a>[processed.size()]; +<a class="jxr_linenumber" name="L498" href="#L498">498</a> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a>[] optionsArray = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a>[processed.size()]; <a class="jxr_linenumber" name="L499" href="#L499">499</a> <a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_comment">// return the array</em> <a class="jxr_linenumber" name="L501" href="#L501">501</a> <strong class="jxr_keyword">return</strong> processed.toArray(optionsArray); @@ -529,7 +529,7 @@ <a class="jxr_linenumber" name="L521" href="#L521">521</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L522" href="#L522">522</a> <em class="jxr_javadoccomment"> * @return this Builder instance for method chaining.</em> <a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L524" href="#L524">524</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/Option.html">Builder</a> addOption(<a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) +<a class="jxr_linenumber" name="L524" href="#L524">524</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/Option.html">Builder</a> addOption(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt) <a class="jxr_linenumber" name="L525" href="#L525">525</a> { <a class="jxr_linenumber" name="L526" href="#L526">526</a> commandLine.addOption(opt); <a class="jxr_linenumber" name="L527" href="#L527">527</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>; @@ -542,7 +542,7 @@ <a class="jxr_linenumber" name="L534" href="#L534">534</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L535" href="#L535">535</a> <em class="jxr_javadoccomment"> * @return this Builder instance for method chaining.</em> <a class="jxr_linenumber" name="L536" href="#L536">536</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L537" href="#L537">537</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/Option.html">Builder</a> addArg(String arg) +<a class="jxr_linenumber" name="L537" href="#L537">537</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/Option.html">Builder</a> addArg(<strong class="jxr_keyword">final</strong> String arg) <a class="jxr_linenumber" name="L538" href="#L538">538</a> { <a class="jxr_linenumber" name="L539" href="#L539">539</a> commandLine.addArg(arg); <a class="jxr_linenumber" name="L540" href="#L540">540</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
Modified: websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLineParser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLineParser.html (original) +++ websites/production/commons/content/proper/commons-cli/xref/org/apache/commons/cli/CommandLineParser.html Thu Jun 8 17:47:18 2017 @@ -30,7 +30,7 @@ <a class="jxr_linenumber" name="L22" href="#L22">22</a> <em class="jxr_javadoccomment"> * can parse a String array according to the {@link Options} specified</em> <a class="jxr_linenumber" name="L23" href="#L23">23</a> <em class="jxr_javadoccomment"> * and return a {@link CommandLine}.</em> <a class="jxr_linenumber" name="L24" href="#L24">24</a> <em class="jxr_javadoccomment"> *</em> -<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment"> * @version $Id: CommandLineParser.java 1443102 2013-02-06 18:12:16Z tn $</em> +<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment"> * @version $Id$</em> <a class="jxr_linenumber" name="L26" href="#L26">26</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../org/apache/commons/cli/CommandLineParser.html">CommandLineParser</a> <a class="jxr_linenumber" name="L28" href="#L28">28</a> { 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 Thu Jun 8 17:47:18 2017 @@ -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 1783175 2017-02-16 07:52:05Z britter $</em> +<a class="jxr_linenumber" name="L28" href="#L28">28</a> <em class="jxr_javadoccomment"> * @version $Id$</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> @@ -63,7 +63,7 @@ <a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment">/** The required options and groups expected to be found when parsing the command line. */</em> <a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">protected</strong> List expectedOpts; <a class="jxr_linenumber" name="L57" href="#L57">57</a> -<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, String[] arguments) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, <strong class="jxr_keyword">final</strong> String[] arguments) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L59" href="#L59">59</a> { <a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">return</strong> parse(options, arguments, <strong class="jxr_keyword">null</strong>); <a class="jxr_linenumber" name="L61" href="#L61">61</a> } @@ -79,12 +79,12 @@ <a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are any problems encountered</em> <a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> * while parsing the command line tokens.</em> <a class="jxr_linenumber" name="L73" href="#L73">73</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, String[] arguments, Properties properties) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, <strong class="jxr_keyword">final</strong> String[] arguments, <strong class="jxr_keyword">final</strong> Properties properties) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L75" href="#L75">75</a> { <a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">return</strong> parse(options, arguments, properties, false); <a class="jxr_linenumber" name="L77" href="#L77">77</a> } <a class="jxr_linenumber" name="L78" href="#L78">78</a> -<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, String[] arguments, <strong class="jxr_keyword">boolean</strong> stopAtNonOption) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, <strong class="jxr_keyword">final</strong> String[] arguments, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> stopAtNonOption) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L80" href="#L80">80</a> { <a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">return</strong> parse(options, arguments, <strong class="jxr_keyword">null</strong>, stopAtNonOption); <a class="jxr_linenumber" name="L82" href="#L82">82</a> } @@ -104,7 +104,7 @@ <a class="jxr_linenumber" name="L96" href="#L96">96</a> <em class="jxr_javadoccomment"> * @throws ParseException if there are any problems encountered</em> <a class="jxr_linenumber" name="L97" href="#L97">97</a> <em class="jxr_javadoccomment"> * while parsing the command line tokens.</em> <a class="jxr_linenumber" name="L98" href="#L98">98</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, String[] arguments, Properties properties, <strong class="jxr_keyword">boolean</strong> stopAtNonOption) +<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/cli/CommandLine.html">CommandLine</a> parse(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Options.html">Options</a> options, <strong class="jxr_keyword">final</strong> String[] arguments, <strong class="jxr_keyword">final</strong> Properties properties, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> stopAtNonOption) <a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/commons/cli/ParseException.html">ParseException</a> <a class="jxr_linenumber" name="L101" href="#L101">101</a> { <a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">this</strong>.options = options; @@ -114,7 +114,7 @@ <a class="jxr_linenumber" name="L106" href="#L106">106</a> expectedOpts = <strong class="jxr_keyword">new</strong> ArrayList(options.getRequiredOptions()); <a class="jxr_linenumber" name="L107" href="#L107">107</a> <a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_comment">// clear the data from the groups</em> -<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">for</strong> (OptionGroup group : options.getOptionGroups()) +<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> OptionGroup group : options.getOptionGroups()) <a class="jxr_linenumber" name="L110" href="#L110">110</a> { <a class="jxr_linenumber" name="L111" href="#L111">111</a> group.setSelected(<strong class="jxr_keyword">null</strong>); <a class="jxr_linenumber" name="L112" href="#L112">112</a> } @@ -123,7 +123,7 @@ <a class="jxr_linenumber" name="L115" href="#L115">115</a> <a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">if</strong> (arguments != <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L117" href="#L117">117</a> { -<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">for</strong> (String argument : arguments) +<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String argument : arguments) <a class="jxr_linenumber" name="L119" href="#L119">119</a> { <a class="jxr_linenumber" name="L120" href="#L120">120</a> handleToken(argument); <a class="jxr_linenumber" name="L121" href="#L121">121</a> } @@ -145,31 +145,31 @@ <a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @param properties The value properties to be processed.</em> <a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleProperties(Properties properties) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleProperties(<strong class="jxr_keyword">final</strong> Properties properties) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L141" href="#L141">141</a> { <a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">if</strong> (properties == <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L143" href="#L143">143</a> { <a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">return</strong>; <a class="jxr_linenumber" name="L145" href="#L145">145</a> } <a class="jxr_linenumber" name="L146" href="#L146">146</a> -<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">for</strong> (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) +<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) <a class="jxr_linenumber" name="L148" href="#L148">148</a> { -<a class="jxr_linenumber" name="L149" href="#L149">149</a> String option = e.nextElement().toString(); +<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">final</strong> String option = e.nextElement().toString(); <a class="jxr_linenumber" name="L150" href="#L150">150</a> -<a class="jxr_linenumber" name="L151" href="#L151">151</a> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt = options.getOption(option); +<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/Option.html">Option</a> opt = options.getOption(option); <a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">if</strong> (opt == <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L153" href="#L153">153</a> { <a class="jxr_linenumber" name="L154" href="#L154">154</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">"Default option wasn't defined"</span>, option); <a class="jxr_linenumber" name="L155" href="#L155">155</a> } <a class="jxr_linenumber" name="L156" href="#L156">156</a> <a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_comment">// if the option is part of a group, check if another option of the group has been selected</em> -<a class="jxr_linenumber" name="L158" href="#L158">158</a> <a href="../../../../org/apache/commons/cli/OptionGroup.html">OptionGroup</a> group = options.getOptionGroup(opt); -<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">boolean</strong> selected = group != <strong class="jxr_keyword">null</strong> && group.getSelected() != <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/cli/OptionGroup.html">OptionGroup</a> group = options.getOptionGroup(opt); +<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> selected = group != <strong class="jxr_keyword">null</strong> && group.getSelected() != <strong class="jxr_keyword">null</strong>; <a class="jxr_linenumber" name="L160" href="#L160">160</a> <a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">if</strong> (!cmd.hasOption(option) && !selected) <a class="jxr_linenumber" name="L162" href="#L162">162</a> { <a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_comment">// get the value from the properties</em> -<a class="jxr_linenumber" name="L164" href="#L164">164</a> String value = properties.getProperty(option); +<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">final</strong> String value = properties.getProperty(option); <a class="jxr_linenumber" name="L165" href="#L165">165</a> <a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">if</strong> (opt.hasArg()) <a class="jxr_linenumber" name="L167" href="#L167">167</a> { @@ -199,7 +199,7 @@ <a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment"> * @throws MissingOptionException if any of the required Options</em> <a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment"> * are not present.</em> <a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkRequiredOptions() <strong class="jxr_keyword">throws</strong> MissingOptionException +<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkRequiredOptions() <strong class="jxr_keyword">throws</strong> MissingOptionException <a class="jxr_linenumber" name="L195" href="#L195">195</a> { <a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_comment">// if there are required options that have not been processed</em> <a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">if</strong> (!expectedOpts.isEmpty()) @@ -226,7 +226,7 @@ <a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment"> * @param token the command line token to handle</em> <a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment"> * @throws ParseException</em> <a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleToken(String token) <strong class="jxr_keyword">throws</strong> ParseException +<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleToken(<strong class="jxr_keyword">final</strong> String token) <strong class="jxr_keyword">throws</strong> ParseException <a class="jxr_linenumber" name="L222" href="#L222">222</a> { <a class="jxr_linenumber" name="L223" href="#L223">223</a> currentToken = token; <a class="jxr_linenumber" name="L224" href="#L224">224</a> @@ -266,7 +266,7 @@ <a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_javadoccomment"> * @param token</em> <a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isArgument(String token) +<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isArgument(<strong class="jxr_keyword">final</strong> String token) <a class="jxr_linenumber" name="L262" href="#L262">262</a> { <a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">return</strong> !isOption(token) || isNegativeNumber(token); <a class="jxr_linenumber" name="L264" href="#L264">264</a> } @@ -276,14 +276,14 @@ <a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment"> * @param token</em> <a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isNegativeNumber(String token) +<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isNegativeNumber(<strong class="jxr_keyword">final</strong> String token) <a class="jxr_linenumber" name="L272" href="#L272">272</a> { <a class="jxr_linenumber" name="L273" href="#L273">273</a> <strong class="jxr_keyword">try</strong> <a class="jxr_linenumber" name="L274" href="#L274">274</a> { <a class="jxr_linenumber" name="L275" href="#L275">275</a> Double.parseDouble(token); <a class="jxr_linenumber" name="L276" href="#L276">276</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; <a class="jxr_linenumber" name="L277" href="#L277">277</a> } -<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">catch</strong> (NumberFormatException e) +<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> NumberFormatException e) <a class="jxr_linenumber" name="L279" href="#L279">279</a> { <a class="jxr_linenumber" name="L280" href="#L280">280</a> <strong class="jxr_keyword">return</strong> false; <a class="jxr_linenumber" name="L281" href="#L281">281</a> } @@ -294,7 +294,7 @@ <a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment"> * @param token</em> <a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L289" href="#L289">289</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isOption(String token) +<a class="jxr_linenumber" name="L289" href="#L289">289</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isOption(<strong class="jxr_keyword">final</strong> String token) <a class="jxr_linenumber" name="L290" href="#L290">290</a> { <a class="jxr_linenumber" name="L291" href="#L291">291</a> <strong class="jxr_keyword">return</strong> isLongOption(token) || isShortOption(token); <a class="jxr_linenumber" name="L292" href="#L292">292</a> } @@ -304,7 +304,7 @@ <a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment"> * </em> <a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment"> * @param token</em> <a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment"> */</em> -<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="L299" href="#L299">299</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isShortOption(<strong class="jxr_keyword">final</strong> 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">if</strong> (!token.startsWith(<span class="jxr_string">"-"</span>) || token.length() == 1) @@ -313,8 +313,8 @@ <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="L308" href="#L308">308</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pos = token.indexOf(<span class="jxr_string">"="</span>); +<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong class="jxr_keyword">final</strong> 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>; @@ -328,15 +328,15 @@ <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="L323" href="#L323">323</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isLongOption(<strong class="jxr_keyword">final</strong> 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> <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="L330" href="#L330">330</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pos = token.indexOf(<span class="jxr_string">"="</span>); +<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">final</strong> 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> { @@ -361,7 +361,7 @@ <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="L356" href="#L356">356</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleUnknownToken(<strong class="jxr_keyword">final</strong> 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> { @@ -385,7 +385,7 @@ <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="L380" href="#L380">380</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOption(<strong class="jxr_keyword">final</strong> 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> { @@ -407,9 +407,9 @@ <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="L402" href="#L402">402</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithoutEqual(<strong class="jxr_keyword">final</strong> 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="L404" href="#L404">404</a> <strong class="jxr_keyword">final</strong> 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); @@ -434,15 +434,15 @@ <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="L429" href="#L429">429</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLongOptionWithEqual(<strong class="jxr_keyword">final</strong> 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="L431" href="#L431">431</a> <strong class="jxr_keyword">final</strong> <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="L433" href="#L433">433</a> <strong class="jxr_keyword">final</strong> 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="L435" href="#L435">435</a> <strong class="jxr_keyword">final</strong> 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> List<String> matchingOpts = options.getMatchingOptions(opt); +<a class="jxr_linenumber" name="L437" href="#L437">437</a> <strong class="jxr_keyword">final</strong> 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); @@ -453,7 +453,7 @@ <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="L448" href="#L448">448</a> <strong class="jxr_keyword">final</strong> <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> <strong class="jxr_keyword">if</strong> (option.acceptsArg()) <a class="jxr_linenumber" name="L451" href="#L451">451</a> { @@ -487,11 +487,11 @@ <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="L482" href="#L482">482</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleShortAndLongOption(<strong class="jxr_keyword">final</strong> 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="L484" href="#L484">484</a> <strong class="jxr_keyword">final</strong> 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="L486" href="#L486">486</a> <strong class="jxr_keyword">final</strong> <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> { @@ -520,7 +520,7 @@ <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="L515" href="#L515">515</a> <strong class="jxr_keyword">final</strong> 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> { @@ -545,13 +545,13 @@ <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="L540" href="#L540">540</a> <strong class="jxr_keyword">final</strong> String opt = t.substring(0, pos); +<a class="jxr_linenumber" name="L541" href="#L541">541</a> <strong class="jxr_keyword">final</strong> 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="L546" href="#L546">546</a> <strong class="jxr_keyword">final</strong> <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); @@ -584,15 +584,15 @@ <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="L579" href="#L579">579</a> <strong class="jxr_keyword">private</strong> String getLongPrefix(<strong class="jxr_keyword">final</strong> 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="L581" href="#L581">581</a> <strong class="jxr_keyword">final</strong> 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="L587" href="#L587">587</a> <strong class="jxr_keyword">final</strong> 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; @@ -606,10 +606,10 @@ <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="L601" href="#L601">601</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isJavaProperty(<strong class="jxr_keyword">final</strong> 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="L603" href="#L603">603</a> <strong class="jxr_keyword">final</strong> String opt = token.substring(0, 1); +<a class="jxr_linenumber" name="L604" href="#L604">604</a> <strong class="jxr_keyword">final</strong> <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> } @@ -640,7 +640,7 @@ <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="L635" href="#L635">635</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> updateRequiredOptions(<strong class="jxr_keyword">final</strong> <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> { @@ -650,7 +650,7 @@ <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="L645" href="#L645">645</a> <strong class="jxr_keyword">final</strong> <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> { @@ -688,11 +688,11 @@ <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="L683" href="#L683">683</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleConcatenatedOptions(<strong class="jxr_keyword">final</strong> 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)); +<a class="jxr_linenumber" name="L687" href="#L687">687</a> <strong class="jxr_keyword">final</strong> String ch = String.valueOf(token.charAt(i)); <a class="jxr_linenumber" name="L688" href="#L688">688</a> <a class="jxr_linenumber" name="L689" href="#L689">689</a> <strong class="jxr_keyword">if</strong> (options.hasOption(ch)) <a class="jxr_linenumber" name="L690" href="#L690">690</a> {