Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLine.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLine.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLine.html Thu Jun 8 17:47:18 2017 @@ -43,7 +43,7 @@ <span class="sourceLineNo">035</span> * Additionally, any left-over or unrecognized arguments,<a name="line.35"></a> <span class="sourceLineNo">036</span> * are available for further processing.<a name="line.36"></a> <span class="sourceLineNo">037</span> *<a name="line.37"></a> -<span class="sourceLineNo">038</span> * @version $Id: CommandLine.java 1788678 2017-03-25 18:32:55Z britter $<a name="line.38"></a> +<span class="sourceLineNo">038</span> * @version $Id$<a name="line.38"></a> <span class="sourceLineNo">039</span> */<a name="line.39"></a> <span class="sourceLineNo">040</span>public class CommandLine implements Serializable<a name="line.40"></a> <span class="sourceLineNo">041</span>{<a name="line.41"></a> @@ -69,9 +69,9 @@ <span class="sourceLineNo">061</span> *<a name="line.61"></a> <span class="sourceLineNo">062</span> * @param opt the option to check<a name="line.62"></a> <span class="sourceLineNo">063</span> * @return true if set, false if not<a name="line.63"></a> -<span class="sourceLineNo">064</span> * @since 1.4<a name="line.64"></a> +<span class="sourceLineNo">064</span> * @since 1.5<a name="line.64"></a> <span class="sourceLineNo">065</span> */<a name="line.65"></a> -<span class="sourceLineNo">066</span> public boolean hasOption(Option opt)<a name="line.66"></a> +<span class="sourceLineNo">066</span> public boolean hasOption(final Option opt)<a name="line.66"></a> <span class="sourceLineNo">067</span> {<a name="line.67"></a> <span class="sourceLineNo">068</span> return options.contains(opt);<a name="line.68"></a> <span class="sourceLineNo">069</span> }<a name="line.69"></a> @@ -82,7 +82,7 @@ <span class="sourceLineNo">074</span> * @param opt Short name of the option<a name="line.74"></a> <span class="sourceLineNo">075</span> * @return true if set, false if not<a name="line.75"></a> <span class="sourceLineNo">076</span> */<a name="line.76"></a> -<span class="sourceLineNo">077</span> public boolean hasOption(String opt)<a name="line.77"></a> +<span class="sourceLineNo">077</span> public boolean hasOption(final String opt)<a name="line.77"></a> <span class="sourceLineNo">078</span> {<a name="line.78"></a> <span class="sourceLineNo">079</span> return hasOption(resolveOption(opt));<a name="line.79"></a> <span class="sourceLineNo">080</span> }<a name="line.80"></a> @@ -93,7 +93,7 @@ <span class="sourceLineNo">085</span> * @param opt character name of the option<a name="line.85"></a> <span class="sourceLineNo">086</span> * @return true if set, false if not<a name="line.86"></a> <span class="sourceLineNo">087</span> */<a name="line.87"></a> -<span class="sourceLineNo">088</span> public boolean hasOption(char opt)<a name="line.88"></a> +<span class="sourceLineNo">088</span> public boolean hasOption(final char opt)<a name="line.88"></a> <span class="sourceLineNo">089</span> {<a name="line.89"></a> <span class="sourceLineNo">090</span> return hasOption(String.valueOf(opt));<a name="line.90"></a> <span class="sourceLineNo">091</span> }<a name="line.91"></a> @@ -106,13 +106,13 @@ <span class="sourceLineNo">098</span> * @deprecated due to System.err message. Instead use getParsedOptionValue(String)<a name="line.98"></a> <span class="sourceLineNo">099</span> */<a name="line.99"></a> <span class="sourceLineNo">100</span> @Deprecated<a name="line.100"></a> -<span class="sourceLineNo">101</span> public Object getOptionObject(String opt)<a name="line.101"></a> +<span class="sourceLineNo">101</span> public Object getOptionObject(final String opt)<a name="line.101"></a> <span class="sourceLineNo">102</span> {<a name="line.102"></a> <span class="sourceLineNo">103</span> try<a name="line.103"></a> <span class="sourceLineNo">104</span> {<a name="line.104"></a> <span class="sourceLineNo">105</span> return getParsedOptionValue(opt);<a name="line.105"></a> <span class="sourceLineNo">106</span> }<a name="line.106"></a> -<span class="sourceLineNo">107</span> catch (ParseException pe)<a name="line.107"></a> +<span class="sourceLineNo">107</span> catch (final ParseException pe)<a name="line.107"></a> <span class="sourceLineNo">108</span> {<a name="line.108"></a> <span class="sourceLineNo">109</span> System.err.println("Exception found converting " + opt + " to desired type: " + pe.getMessage());<a name="line.109"></a> <span class="sourceLineNo">110</span> return null;<a name="line.110"></a> @@ -126,15 +126,15 @@ <span class="sourceLineNo">118</span> * @return the value parsed into a particular object<a name="line.118"></a> <span class="sourceLineNo">119</span> * @throws ParseException if there are problems turning the option value into the desired type<a name="line.119"></a> <span class="sourceLineNo">120</span> * @see PatternOptionBuilder<a name="line.120"></a> -<span class="sourceLineNo">121</span> * @since 1.4<a name="line.121"></a> +<span class="sourceLineNo">121</span> * @since 1.5<a name="line.121"></a> <span class="sourceLineNo">122</span> */<a name="line.122"></a> -<span class="sourceLineNo">123</span> public Object getParsedOptionValue(Option option) throws ParseException<a name="line.123"></a> +<span class="sourceLineNo">123</span> public Object getParsedOptionValue(final Option option) throws ParseException<a name="line.123"></a> <span class="sourceLineNo">124</span> {<a name="line.124"></a> <span class="sourceLineNo">125</span> if (option == null)<a name="line.125"></a> <span class="sourceLineNo">126</span> {<a name="line.126"></a> <span class="sourceLineNo">127</span> return null;<a name="line.127"></a> <span class="sourceLineNo">128</span> }<a name="line.128"></a> -<span class="sourceLineNo">129</span> String res = getOptionValue(option);<a name="line.129"></a> +<span class="sourceLineNo">129</span> final String res = getOptionValue(option);<a name="line.129"></a> <span class="sourceLineNo">130</span> if (res == null)<a name="line.130"></a> <span class="sourceLineNo">131</span> {<a name="line.131"></a> <span class="sourceLineNo">132</span> return null;<a name="line.132"></a> @@ -151,7 +151,7 @@ <span class="sourceLineNo">143</span> * @see PatternOptionBuilder<a name="line.143"></a> <span class="sourceLineNo">144</span> * @since 1.2<a name="line.144"></a> <span class="sourceLineNo">145</span> */<a name="line.145"></a> -<span class="sourceLineNo">146</span> public Object getParsedOptionValue(String opt) throws ParseException<a name="line.146"></a> +<span class="sourceLineNo">146</span> public Object getParsedOptionValue(final String opt) throws ParseException<a name="line.146"></a> <span class="sourceLineNo">147</span> {<a name="line.147"></a> <span class="sourceLineNo">148</span> return getParsedOptionValue(resolveOption(opt));<a name="line.148"></a> <span class="sourceLineNo">149</span> }<a name="line.149"></a> @@ -163,9 +163,9 @@ <span class="sourceLineNo">155</span> * @return the value parsed into a particular object<a name="line.155"></a> <span class="sourceLineNo">156</span> * @throws ParseException if there are problems turning the option value into the desired type<a name="line.156"></a> <span class="sourceLineNo">157</span> * @see PatternOptionBuilder<a name="line.157"></a> -<span class="sourceLineNo">158</span> * @since 1.2<a name="line.158"></a> +<span class="sourceLineNo">158</span> * @since 1.5<a name="line.158"></a> <span class="sourceLineNo">159</span> */<a name="line.159"></a> -<span class="sourceLineNo">160</span> public Object getParsedOptionValue(char opt) throws ParseException<a name="line.160"></a> +<span class="sourceLineNo">160</span> public Object getParsedOptionValue(final char opt) throws ParseException<a name="line.160"></a> <span class="sourceLineNo">161</span> {<a name="line.161"></a> <span class="sourceLineNo">162</span> return getParsedOptionValue(String.valueOf(opt));<a name="line.162"></a> <span class="sourceLineNo">163</span> }<a name="line.163"></a> @@ -177,7 +177,7 @@ <span class="sourceLineNo">169</span> * @param opt the name of the option<a name="line.169"></a> <span class="sourceLineNo">170</span> * @return the type of opt<a name="line.170"></a> <span class="sourceLineNo">171</span> */<a name="line.171"></a> -<span class="sourceLineNo">172</span> public Object getOptionObject(char opt)<a name="line.172"></a> +<span class="sourceLineNo">172</span> public Object getOptionObject(final char opt)<a name="line.172"></a> <span class="sourceLineNo">173</span> {<a name="line.173"></a> <span class="sourceLineNo">174</span> return getOptionObject(String.valueOf(opt));<a name="line.174"></a> <span class="sourceLineNo">175</span> }<a name="line.175"></a> @@ -188,15 +188,15 @@ <span class="sourceLineNo">180</span> * @param option the name of the option<a name="line.180"></a> <span class="sourceLineNo">181</span> * @return Value of the argument if option is set, and has an argument,<a name="line.181"></a> <span class="sourceLineNo">182</span> * otherwise null.<a name="line.182"></a> -<span class="sourceLineNo">183</span> * @since 1.4<a name="line.183"></a> +<span class="sourceLineNo">183</span> * @since 1.5<a name="line.183"></a> <span class="sourceLineNo">184</span> */<a name="line.184"></a> -<span class="sourceLineNo">185</span> public String getOptionValue(Option option)<a name="line.185"></a> +<span class="sourceLineNo">185</span> public String getOptionValue(final Option option)<a name="line.185"></a> <span class="sourceLineNo">186</span> {<a name="line.186"></a> <span class="sourceLineNo">187</span> if (option == null)<a name="line.187"></a> <span class="sourceLineNo">188</span> {<a name="line.188"></a> <span class="sourceLineNo">189</span> return null;<a name="line.189"></a> <span class="sourceLineNo">190</span> }<a name="line.190"></a> -<span class="sourceLineNo">191</span> String[] values = getOptionValues(option);<a name="line.191"></a> +<span class="sourceLineNo">191</span> final String[] values = getOptionValues(option);<a name="line.191"></a> <span class="sourceLineNo">192</span> return (values == null) ? null : values[0];<a name="line.192"></a> <span class="sourceLineNo">193</span> }<a name="line.193"></a> <span class="sourceLineNo">194</span><a name="line.194"></a> @@ -207,7 +207,7 @@ <span class="sourceLineNo">199</span> * @return Value of the argument if option is set, and has an argument,<a name="line.199"></a> <span class="sourceLineNo">200</span> * otherwise null.<a name="line.200"></a> <span class="sourceLineNo">201</span> */<a name="line.201"></a> -<span class="sourceLineNo">202</span> public String getOptionValue(String opt)<a name="line.202"></a> +<span class="sourceLineNo">202</span> public String getOptionValue(final String opt)<a name="line.202"></a> <span class="sourceLineNo">203</span> {<a name="line.203"></a> <span class="sourceLineNo">204</span> return getOptionValue(resolveOption(opt));<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> @@ -219,7 +219,7 @@ <span class="sourceLineNo">211</span> * @return Value of the argument if option is set, and has an argument,<a name="line.211"></a> <span class="sourceLineNo">212</span> * otherwise null.<a name="line.212"></a> <span class="sourceLineNo">213</span> */<a name="line.213"></a> -<span class="sourceLineNo">214</span> public String getOptionValue(char opt)<a name="line.214"></a> +<span class="sourceLineNo">214</span> public String getOptionValue(final char opt)<a name="line.214"></a> <span class="sourceLineNo">215</span> {<a name="line.215"></a> <span class="sourceLineNo">216</span> return getOptionValue(String.valueOf(opt));<a name="line.216"></a> <span class="sourceLineNo">217</span> }<a name="line.217"></a> @@ -230,13 +230,13 @@ <span class="sourceLineNo">222</span> * @param option string name of the option<a name="line.222"></a> <span class="sourceLineNo">223</span> * @return Values of the argument if option is set, and has an argument,<a name="line.223"></a> <span class="sourceLineNo">224</span> * otherwise null.<a name="line.224"></a> -<span class="sourceLineNo">225</span> * @since 1.4<a name="line.225"></a> +<span class="sourceLineNo">225</span> * @since 1.5<a name="line.225"></a> <span class="sourceLineNo">226</span> */<a name="line.226"></a> -<span class="sourceLineNo">227</span> public String[] getOptionValues(Option option)<a name="line.227"></a> +<span class="sourceLineNo">227</span> public String[] getOptionValues(final Option option)<a name="line.227"></a> <span class="sourceLineNo">228</span> {<a name="line.228"></a> -<span class="sourceLineNo">229</span> List<String> values = new ArrayList<String>();<a name="line.229"></a> +<span class="sourceLineNo">229</span> final List<String> values = new ArrayList<String>();<a name="line.229"></a> <span class="sourceLineNo">230</span><a name="line.230"></a> -<span class="sourceLineNo">231</span> for (Option processedOption : options)<a name="line.231"></a> +<span class="sourceLineNo">231</span> for (final Option processedOption : options)<a name="line.231"></a> <span class="sourceLineNo">232</span> {<a name="line.232"></a> <span class="sourceLineNo">233</span> if (processedOption.equals(option))<a name="line.233"></a> <span class="sourceLineNo">234</span> {<a name="line.234"></a> @@ -254,7 +254,7 @@ <span class="sourceLineNo">246</span> * @return Values of the argument if option is set, and has an argument,<a name="line.246"></a> <span class="sourceLineNo">247</span> * otherwise null.<a name="line.247"></a> <span class="sourceLineNo">248</span> */<a name="line.248"></a> -<span class="sourceLineNo">249</span> public String[] getOptionValues(String opt)<a name="line.249"></a> +<span class="sourceLineNo">249</span> public String[] getOptionValues(final String opt)<a name="line.249"></a> <span class="sourceLineNo">250</span> {<a name="line.250"></a> <span class="sourceLineNo">251</span> return getOptionValues(resolveOption(opt));<a name="line.251"></a> <span class="sourceLineNo">252</span> }<a name="line.252"></a> @@ -268,7 +268,7 @@ <span class="sourceLineNo">260</span> private Option resolveOption(String opt)<a name="line.260"></a> <span class="sourceLineNo">261</span> {<a name="line.261"></a> <span class="sourceLineNo">262</span> opt = Util.stripLeadingHyphens(opt);<a name="line.262"></a> -<span class="sourceLineNo">263</span> for (Option option : options)<a name="line.263"></a> +<span class="sourceLineNo">263</span> for (final Option option : options)<a name="line.263"></a> <span class="sourceLineNo">264</span> {<a name="line.264"></a> <span class="sourceLineNo">265</span> if (opt.equals(option.getOpt()))<a name="line.265"></a> <span class="sourceLineNo">266</span> {<a name="line.266"></a> @@ -291,7 +291,7 @@ <span class="sourceLineNo">283</span> * @return Values of the argument if option is set, and has an argument,<a name="line.283"></a> <span class="sourceLineNo">284</span> * otherwise null.<a name="line.284"></a> <span class="sourceLineNo">285</span> */<a name="line.285"></a> -<span class="sourceLineNo">286</span> public String[] getOptionValues(char opt)<a name="line.286"></a> +<span class="sourceLineNo">286</span> public String[] getOptionValues(final char opt)<a name="line.286"></a> <span class="sourceLineNo">287</span> {<a name="line.287"></a> <span class="sourceLineNo">288</span> return getOptionValues(String.valueOf(opt));<a name="line.288"></a> <span class="sourceLineNo">289</span> }<a name="line.289"></a> @@ -304,11 +304,11 @@ <span class="sourceLineNo">296</span> * is not specified<a name="line.296"></a> <span class="sourceLineNo">297</span> * @return Value of the argument if option is set, and has an argument,<a name="line.297"></a> <span class="sourceLineNo">298</span> * otherwise <code>defaultValue</code>.<a name="line.298"></a> -<span class="sourceLineNo">299</span> * @since 1.4<a name="line.299"></a> +<span class="sourceLineNo">299</span> * @since 1.5<a name="line.299"></a> <span class="sourceLineNo">300</span> */<a name="line.300"></a> -<span class="sourceLineNo">301</span> public String getOptionValue(Option option, String defaultValue)<a name="line.301"></a> +<span class="sourceLineNo">301</span> public String getOptionValue(final Option option, final String defaultValue)<a name="line.301"></a> <span class="sourceLineNo">302</span> {<a name="line.302"></a> -<span class="sourceLineNo">303</span> String answer = getOptionValue(option);<a name="line.303"></a> +<span class="sourceLineNo">303</span> final String answer = getOptionValue(option);<a name="line.303"></a> <span class="sourceLineNo">304</span> return (answer != null) ? answer : defaultValue;<a name="line.304"></a> <span class="sourceLineNo">305</span> }<a name="line.305"></a> <span class="sourceLineNo">306</span><a name="line.306"></a> @@ -321,7 +321,7 @@ <span class="sourceLineNo">313</span> * @return Value of the argument if option is set, and has an argument,<a name="line.313"></a> <span class="sourceLineNo">314</span> * otherwise <code>defaultValue</code>.<a name="line.314"></a> <span class="sourceLineNo">315</span> */<a name="line.315"></a> -<span class="sourceLineNo">316</span> public String getOptionValue(String opt, String defaultValue)<a name="line.316"></a> +<span class="sourceLineNo">316</span> public String getOptionValue(final String opt, final String defaultValue)<a name="line.316"></a> <span class="sourceLineNo">317</span> {<a name="line.317"></a> <span class="sourceLineNo">318</span> return getOptionValue(resolveOption(opt), defaultValue);<a name="line.318"></a> <span class="sourceLineNo">319</span> }<a name="line.319"></a> @@ -335,7 +335,7 @@ <span class="sourceLineNo">327</span> * @return Value of the argument if option is set, and has an argument,<a name="line.327"></a> <span class="sourceLineNo">328</span> * otherwise <code>defaultValue</code>.<a name="line.328"></a> <span class="sourceLineNo">329</span> */<a name="line.329"></a> -<span class="sourceLineNo">330</span> public String getOptionValue(char opt, String defaultValue)<a name="line.330"></a> +<span class="sourceLineNo">330</span> public String getOptionValue(final char opt, final String defaultValue)<a name="line.330"></a> <span class="sourceLineNo">331</span> {<a name="line.331"></a> <span class="sourceLineNo">332</span> return getOptionValue(String.valueOf(opt), defaultValue);<a name="line.332"></a> <span class="sourceLineNo">333</span> }<a name="line.333"></a> @@ -351,17 +351,17 @@ <span class="sourceLineNo">343</span> * @param option name of the option<a name="line.343"></a> <span class="sourceLineNo">344</span> * @return The Properties mapped by the option, never <tt>null</tt><a name="line.344"></a> <span class="sourceLineNo">345</span> * even if the option doesn't exists<a name="line.345"></a> -<span class="sourceLineNo">346</span> * @since 1.4<a name="line.346"></a> +<span class="sourceLineNo">346</span> * @since 1.5<a name="line.346"></a> <span class="sourceLineNo">347</span> */<a name="line.347"></a> -<span class="sourceLineNo">348</span> public Properties getOptionProperties(Option option)<a name="line.348"></a> +<span class="sourceLineNo">348</span> public Properties getOptionProperties(final Option option)<a name="line.348"></a> <span class="sourceLineNo">349</span> {<a name="line.349"></a> -<span class="sourceLineNo">350</span> Properties props = new Properties();<a name="line.350"></a> +<span class="sourceLineNo">350</span> final Properties props = new Properties();<a name="line.350"></a> <span class="sourceLineNo">351</span><a name="line.351"></a> -<span class="sourceLineNo">352</span> for (Option processedOption : options)<a name="line.352"></a> +<span class="sourceLineNo">352</span> for (final Option processedOption : options)<a name="line.352"></a> <span class="sourceLineNo">353</span> {<a name="line.353"></a> <span class="sourceLineNo">354</span> if (processedOption.equals(option))<a name="line.354"></a> <span class="sourceLineNo">355</span> {<a name="line.355"></a> -<span class="sourceLineNo">356</span> List<String> values = processedOption.getValuesList();<a name="line.356"></a> +<span class="sourceLineNo">356</span> final List<String> values = processedOption.getValuesList();<a name="line.356"></a> <span class="sourceLineNo">357</span> if (values.size() >= 2)<a name="line.357"></a> <span class="sourceLineNo">358</span> {<a name="line.358"></a> <span class="sourceLineNo">359</span> // use the first 2 arguments as the key/value pair<a name="line.359"></a> @@ -391,15 +391,15 @@ <span class="sourceLineNo">383</span> * even if the option doesn't exists<a name="line.383"></a> <span class="sourceLineNo">384</span> * @since 1.2<a name="line.384"></a> <span class="sourceLineNo">385</span> */<a name="line.385"></a> -<span class="sourceLineNo">386</span> public Properties getOptionProperties(String opt)<a name="line.386"></a> +<span class="sourceLineNo">386</span> public Properties getOptionProperties(final String opt)<a name="line.386"></a> <span class="sourceLineNo">387</span> {<a name="line.387"></a> -<span class="sourceLineNo">388</span> Properties props = new Properties();<a name="line.388"></a> +<span class="sourceLineNo">388</span> final Properties props = new Properties();<a name="line.388"></a> <span class="sourceLineNo">389</span><a name="line.389"></a> -<span class="sourceLineNo">390</span> for (Option option : options)<a name="line.390"></a> +<span class="sourceLineNo">390</span> for (final Option option : options)<a name="line.390"></a> <span class="sourceLineNo">391</span> {<a name="line.391"></a> <span class="sourceLineNo">392</span> if (opt.equals(option.getOpt()) || opt.equals(option.getLongOpt()))<a name="line.392"></a> <span class="sourceLineNo">393</span> {<a name="line.393"></a> -<span class="sourceLineNo">394</span> List<String> values = option.getValuesList();<a name="line.394"></a> +<span class="sourceLineNo">394</span> final List<String> values = option.getValuesList();<a name="line.394"></a> <span class="sourceLineNo">395</span> if (values.size() >= 2)<a name="line.395"></a> <span class="sourceLineNo">396</span> {<a name="line.396"></a> <span class="sourceLineNo">397</span> // use the first 2 arguments as the key/value pair<a name="line.397"></a> @@ -423,7 +423,7 @@ <span class="sourceLineNo">415</span> */<a name="line.415"></a> <span class="sourceLineNo">416</span> public String[] getArgs()<a name="line.416"></a> <span class="sourceLineNo">417</span> {<a name="line.417"></a> -<span class="sourceLineNo">418</span> String[] answer = new String[args.size()];<a name="line.418"></a> +<span class="sourceLineNo">418</span> final String[] answer = new String[args.size()];<a name="line.418"></a> <span class="sourceLineNo">419</span><a name="line.419"></a> <span class="sourceLineNo">420</span> args.toArray(answer);<a name="line.420"></a> <span class="sourceLineNo">421</span><a name="line.421"></a> @@ -467,7 +467,7 @@ <span class="sourceLineNo">459</span> *<a name="line.459"></a> <span class="sourceLineNo">460</span> * @param arg the unrecognized option/argument.<a name="line.460"></a> <span class="sourceLineNo">461</span> */<a name="line.461"></a> -<span class="sourceLineNo">462</span> protected void addArg(String arg)<a name="line.462"></a> +<span class="sourceLineNo">462</span> protected void addArg(final String arg)<a name="line.462"></a> <span class="sourceLineNo">463</span> {<a name="line.463"></a> <span class="sourceLineNo">464</span> args.add(arg);<a name="line.464"></a> <span class="sourceLineNo">465</span> }<a name="line.465"></a> @@ -477,7 +477,7 @@ <span class="sourceLineNo">469</span> *<a name="line.469"></a> <span class="sourceLineNo">470</span> * @param opt the processed option<a name="line.470"></a> <span class="sourceLineNo">471</span> */<a name="line.471"></a> -<span class="sourceLineNo">472</span> protected void addOption(Option opt)<a name="line.472"></a> +<span class="sourceLineNo">472</span> protected void addOption(final Option opt)<a name="line.472"></a> <span class="sourceLineNo">473</span> {<a name="line.473"></a> <span class="sourceLineNo">474</span> options.add(opt);<a name="line.474"></a> <span class="sourceLineNo">475</span> }<a name="line.475"></a> @@ -500,10 +500,10 @@ <span class="sourceLineNo">492</span> */<a name="line.492"></a> <span class="sourceLineNo">493</span> public Option[] getOptions()<a name="line.493"></a> <span class="sourceLineNo">494</span> {<a name="line.494"></a> -<span class="sourceLineNo">495</span> Collection<Option> processed = options;<a name="line.495"></a> +<span class="sourceLineNo">495</span> final Collection<Option> processed = options;<a name="line.495"></a> <span class="sourceLineNo">496</span><a name="line.496"></a> <span class="sourceLineNo">497</span> // reinitialise array<a name="line.497"></a> -<span class="sourceLineNo">498</span> Option[] optionsArray = new Option[processed.size()];<a name="line.498"></a> +<span class="sourceLineNo">498</span> final Option[] optionsArray = new Option[processed.size()];<a name="line.498"></a> <span class="sourceLineNo">499</span><a name="line.499"></a> <span class="sourceLineNo">500</span> // return the array<a name="line.500"></a> <span class="sourceLineNo">501</span> return processed.toArray(optionsArray);<a name="line.501"></a> @@ -529,7 +529,7 @@ <span class="sourceLineNo">521</span> *<a name="line.521"></a> <span class="sourceLineNo">522</span> * @return this Builder instance for method chaining.<a name="line.522"></a> <span class="sourceLineNo">523</span> */<a name="line.523"></a> -<span class="sourceLineNo">524</span> public Builder addOption(Option opt)<a name="line.524"></a> +<span class="sourceLineNo">524</span> public Builder addOption(final Option opt)<a name="line.524"></a> <span class="sourceLineNo">525</span> {<a name="line.525"></a> <span class="sourceLineNo">526</span> commandLine.addOption(opt);<a name="line.526"></a> <span class="sourceLineNo">527</span> return this;<a name="line.527"></a> @@ -542,7 +542,7 @@ <span class="sourceLineNo">534</span> *<a name="line.534"></a> <span class="sourceLineNo">535</span> * @return this Builder instance for method chaining.<a name="line.535"></a> <span class="sourceLineNo">536</span> */<a name="line.536"></a> -<span class="sourceLineNo">537</span> public Builder addArg(String arg)<a name="line.537"></a> +<span class="sourceLineNo">537</span> public Builder addArg(final String arg)<a name="line.537"></a> <span class="sourceLineNo">538</span> {<a name="line.538"></a> <span class="sourceLineNo">539</span> commandLine.addArg(arg);<a name="line.539"></a> <span class="sourceLineNo">540</span> return this;<a name="line.540"></a>
Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLineParser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLineParser.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/CommandLineParser.html Thu Jun 8 17:47:18 2017 @@ -30,7 +30,7 @@ <span class="sourceLineNo">022</span> * can parse a String array according to the {@link Options} specified<a name="line.22"></a> <span class="sourceLineNo">023</span> * and return a {@link CommandLine}.<a name="line.23"></a> <span class="sourceLineNo">024</span> *<a name="line.24"></a> -<span class="sourceLineNo">025</span> * @version $Id: CommandLineParser.java 1443102 2013-02-06 18:12:16Z tn $<a name="line.25"></a> +<span class="sourceLineNo">025</span> * @version $Id$<a name="line.25"></a> <span class="sourceLineNo">026</span> */<a name="line.26"></a> <span class="sourceLineNo">027</span>public interface CommandLineParser<a name="line.27"></a> <span class="sourceLineNo">028</span>{<a name="line.28"></a> Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/DefaultParser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/DefaultParser.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/DefaultParser.html Thu Jun 8 17:47:18 2017 @@ -33,7 +33,7 @@ <span class="sourceLineNo">025</span>/**<a name="line.25"></a> <span class="sourceLineNo">026</span> * Default parser.<a name="line.26"></a> <span class="sourceLineNo">027</span> * <a name="line.27"></a> -<span class="sourceLineNo">028</span> * @version $Id: DefaultParser.java 1783175 2017-02-16 07:52:05Z britter $<a name="line.28"></a> +<span class="sourceLineNo">028</span> * @version $Id$<a name="line.28"></a> <span class="sourceLineNo">029</span> * @since 1.3<a name="line.29"></a> <span class="sourceLineNo">030</span> */<a name="line.30"></a> <span class="sourceLineNo">031</span>public class DefaultParser implements CommandLineParser<a name="line.31"></a> @@ -63,7 +63,7 @@ <span class="sourceLineNo">055</span> /** The required options and groups expected to be found when parsing the command line. */<a name="line.55"></a> <span class="sourceLineNo">056</span> protected List expectedOpts;<a name="line.56"></a> <span class="sourceLineNo">057</span> <a name="line.57"></a> -<span class="sourceLineNo">058</span> public CommandLine parse(Options options, String[] arguments) throws ParseException<a name="line.58"></a> +<span class="sourceLineNo">058</span> public CommandLine parse(final Options options, final String[] arguments) throws ParseException<a name="line.58"></a> <span class="sourceLineNo">059</span> {<a name="line.59"></a> <span class="sourceLineNo">060</span> return parse(options, arguments, null);<a name="line.60"></a> <span class="sourceLineNo">061</span> }<a name="line.61"></a> @@ -79,12 +79,12 @@ <span class="sourceLineNo">071</span> * @throws ParseException if there are any problems encountered<a name="line.71"></a> <span class="sourceLineNo">072</span> * while parsing the command line tokens.<a name="line.72"></a> <span class="sourceLineNo">073</span> */<a name="line.73"></a> -<span class="sourceLineNo">074</span> public CommandLine parse(Options options, String[] arguments, Properties properties) throws ParseException<a name="line.74"></a> +<span class="sourceLineNo">074</span> public CommandLine parse(final Options options, final String[] arguments, final Properties properties) throws ParseException<a name="line.74"></a> <span class="sourceLineNo">075</span> {<a name="line.75"></a> <span class="sourceLineNo">076</span> return parse(options, arguments, properties, false);<a name="line.76"></a> <span class="sourceLineNo">077</span> }<a name="line.77"></a> <span class="sourceLineNo">078</span><a name="line.78"></a> -<span class="sourceLineNo">079</span> public CommandLine parse(Options options, String[] arguments, boolean stopAtNonOption) throws ParseException<a name="line.79"></a> +<span class="sourceLineNo">079</span> public CommandLine parse(final Options options, final String[] arguments, final boolean stopAtNonOption) throws ParseException<a name="line.79"></a> <span class="sourceLineNo">080</span> {<a name="line.80"></a> <span class="sourceLineNo">081</span> return parse(options, arguments, null, stopAtNonOption);<a name="line.81"></a> <span class="sourceLineNo">082</span> }<a name="line.82"></a> @@ -104,7 +104,7 @@ <span class="sourceLineNo">096</span> * @throws ParseException if there are any problems encountered<a name="line.96"></a> <span class="sourceLineNo">097</span> * while parsing the command line tokens.<a name="line.97"></a> <span class="sourceLineNo">098</span> */<a name="line.98"></a> -<span class="sourceLineNo">099</span> public CommandLine parse(Options options, String[] arguments, Properties properties, boolean stopAtNonOption)<a name="line.99"></a> +<span class="sourceLineNo">099</span> public CommandLine parse(final Options options, final String[] arguments, final Properties properties, final boolean stopAtNonOption)<a name="line.99"></a> <span class="sourceLineNo">100</span> throws ParseException<a name="line.100"></a> <span class="sourceLineNo">101</span> {<a name="line.101"></a> <span class="sourceLineNo">102</span> this.options = options;<a name="line.102"></a> @@ -114,7 +114,7 @@ <span class="sourceLineNo">106</span> expectedOpts = new ArrayList(options.getRequiredOptions());<a name="line.106"></a> <span class="sourceLineNo">107</span><a name="line.107"></a> <span class="sourceLineNo">108</span> // clear the data from the groups<a name="line.108"></a> -<span class="sourceLineNo">109</span> for (OptionGroup group : options.getOptionGroups())<a name="line.109"></a> +<span class="sourceLineNo">109</span> for (final OptionGroup group : options.getOptionGroups())<a name="line.109"></a> <span class="sourceLineNo">110</span> {<a name="line.110"></a> <span class="sourceLineNo">111</span> group.setSelected(null);<a name="line.111"></a> <span class="sourceLineNo">112</span> }<a name="line.112"></a> @@ -123,7 +123,7 @@ <span class="sourceLineNo">115</span><a name="line.115"></a> <span class="sourceLineNo">116</span> if (arguments != null)<a name="line.116"></a> <span class="sourceLineNo">117</span> {<a name="line.117"></a> -<span class="sourceLineNo">118</span> for (String argument : arguments)<a name="line.118"></a> +<span class="sourceLineNo">118</span> for (final String argument : arguments)<a name="line.118"></a> <span class="sourceLineNo">119</span> {<a name="line.119"></a> <span class="sourceLineNo">120</span> handleToken(argument);<a name="line.120"></a> <span class="sourceLineNo">121</span> }<a name="line.121"></a> @@ -145,31 +145,31 @@ <span class="sourceLineNo">137</span> *<a name="line.137"></a> <span class="sourceLineNo">138</span> * @param properties The value properties to be processed.<a name="line.138"></a> <span class="sourceLineNo">139</span> */<a name="line.139"></a> -<span class="sourceLineNo">140</span> private void handleProperties(Properties properties) throws ParseException<a name="line.140"></a> +<span class="sourceLineNo">140</span> private void handleProperties(final Properties properties) throws ParseException<a name="line.140"></a> <span class="sourceLineNo">141</span> {<a name="line.141"></a> <span class="sourceLineNo">142</span> if (properties == null)<a name="line.142"></a> <span class="sourceLineNo">143</span> {<a name="line.143"></a> <span class="sourceLineNo">144</span> return;<a name="line.144"></a> <span class="sourceLineNo">145</span> }<a name="line.145"></a> <span class="sourceLineNo">146</span><a name="line.146"></a> -<span class="sourceLineNo">147</span> for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();)<a name="line.147"></a> +<span class="sourceLineNo">147</span> for (final Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();)<a name="line.147"></a> <span class="sourceLineNo">148</span> {<a name="line.148"></a> -<span class="sourceLineNo">149</span> String option = e.nextElement().toString();<a name="line.149"></a> +<span class="sourceLineNo">149</span> final String option = e.nextElement().toString();<a name="line.149"></a> <span class="sourceLineNo">150</span><a name="line.150"></a> -<span class="sourceLineNo">151</span> Option opt = options.getOption(option);<a name="line.151"></a> +<span class="sourceLineNo">151</span> final Option opt = options.getOption(option);<a name="line.151"></a> <span class="sourceLineNo">152</span> if (opt == null)<a name="line.152"></a> <span class="sourceLineNo">153</span> {<a name="line.153"></a> <span class="sourceLineNo">154</span> throw new UnrecognizedOptionException("Default option wasn't defined", option);<a name="line.154"></a> <span class="sourceLineNo">155</span> }<a name="line.155"></a> <span class="sourceLineNo">156</span><a name="line.156"></a> <span class="sourceLineNo">157</span> // if the option is part of a group, check if another option of the group has been selected<a name="line.157"></a> -<span class="sourceLineNo">158</span> OptionGroup group = options.getOptionGroup(opt);<a name="line.158"></a> -<span class="sourceLineNo">159</span> boolean selected = group != null && group.getSelected() != null;<a name="line.159"></a> +<span class="sourceLineNo">158</span> final OptionGroup group = options.getOptionGroup(opt);<a name="line.158"></a> +<span class="sourceLineNo">159</span> final boolean selected = group != null && group.getSelected() != null;<a name="line.159"></a> <span class="sourceLineNo">160</span><a name="line.160"></a> <span class="sourceLineNo">161</span> if (!cmd.hasOption(option) && !selected)<a name="line.161"></a> <span class="sourceLineNo">162</span> {<a name="line.162"></a> <span class="sourceLineNo">163</span> // get the value from the properties<a name="line.163"></a> -<span class="sourceLineNo">164</span> String value = properties.getProperty(option);<a name="line.164"></a> +<span class="sourceLineNo">164</span> final String value = properties.getProperty(option);<a name="line.164"></a> <span class="sourceLineNo">165</span><a name="line.165"></a> <span class="sourceLineNo">166</span> if (opt.hasArg())<a name="line.166"></a> <span class="sourceLineNo">167</span> {<a name="line.167"></a> @@ -199,7 +199,7 @@ <span class="sourceLineNo">191</span> * @throws MissingOptionException if any of the required Options<a name="line.191"></a> <span class="sourceLineNo">192</span> * are not present.<a name="line.192"></a> <span class="sourceLineNo">193</span> */<a name="line.193"></a> -<span class="sourceLineNo">194</span> private void checkRequiredOptions() throws MissingOptionException<a name="line.194"></a> +<span class="sourceLineNo">194</span> protected void checkRequiredOptions() throws MissingOptionException<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> <span class="sourceLineNo">196</span> // if there are required options that have not been processed<a name="line.196"></a> <span class="sourceLineNo">197</span> if (!expectedOpts.isEmpty())<a name="line.197"></a> @@ -226,7 +226,7 @@ <span class="sourceLineNo">218</span> * @param token the command line token to handle<a name="line.218"></a> <span class="sourceLineNo">219</span> * @throws ParseException<a name="line.219"></a> <span class="sourceLineNo">220</span> */<a name="line.220"></a> -<span class="sourceLineNo">221</span> private void handleToken(String token) throws ParseException<a name="line.221"></a> +<span class="sourceLineNo">221</span> private void handleToken(final String token) throws ParseException<a name="line.221"></a> <span class="sourceLineNo">222</span> {<a name="line.222"></a> <span class="sourceLineNo">223</span> currentToken = token;<a name="line.223"></a> <span class="sourceLineNo">224</span><a name="line.224"></a> @@ -266,7 +266,7 @@ <span class="sourceLineNo">258</span> *<a name="line.258"></a> <span class="sourceLineNo">259</span> * @param token<a name="line.259"></a> <span class="sourceLineNo">260</span> */<a name="line.260"></a> -<span class="sourceLineNo">261</span> private boolean isArgument(String token)<a name="line.261"></a> +<span class="sourceLineNo">261</span> private boolean isArgument(final String token)<a name="line.261"></a> <span class="sourceLineNo">262</span> {<a name="line.262"></a> <span class="sourceLineNo">263</span> return !isOption(token) || isNegativeNumber(token);<a name="line.263"></a> <span class="sourceLineNo">264</span> }<a name="line.264"></a> @@ -276,14 +276,14 @@ <span class="sourceLineNo">268</span> *<a name="line.268"></a> <span class="sourceLineNo">269</span> * @param token<a name="line.269"></a> <span class="sourceLineNo">270</span> */<a name="line.270"></a> -<span class="sourceLineNo">271</span> private boolean isNegativeNumber(String token)<a name="line.271"></a> +<span class="sourceLineNo">271</span> private boolean isNegativeNumber(final String token)<a name="line.271"></a> <span class="sourceLineNo">272</span> {<a name="line.272"></a> <span class="sourceLineNo">273</span> try<a name="line.273"></a> <span class="sourceLineNo">274</span> {<a name="line.274"></a> <span class="sourceLineNo">275</span> Double.parseDouble(token);<a name="line.275"></a> <span class="sourceLineNo">276</span> return true;<a name="line.276"></a> <span class="sourceLineNo">277</span> }<a name="line.277"></a> -<span class="sourceLineNo">278</span> catch (NumberFormatException e)<a name="line.278"></a> +<span class="sourceLineNo">278</span> catch (final NumberFormatException e)<a name="line.278"></a> <span class="sourceLineNo">279</span> {<a name="line.279"></a> <span class="sourceLineNo">280</span> return false;<a name="line.280"></a> <span class="sourceLineNo">281</span> }<a name="line.281"></a> @@ -294,7 +294,7 @@ <span class="sourceLineNo">286</span> *<a name="line.286"></a> <span class="sourceLineNo">287</span> * @param token<a name="line.287"></a> <span class="sourceLineNo">288</span> */<a name="line.288"></a> -<span class="sourceLineNo">289</span> private boolean isOption(String token)<a name="line.289"></a> +<span class="sourceLineNo">289</span> private boolean isOption(final String token)<a name="line.289"></a> <span class="sourceLineNo">290</span> {<a name="line.290"></a> <span class="sourceLineNo">291</span> return isLongOption(token) || isShortOption(token);<a name="line.291"></a> <span class="sourceLineNo">292</span> }<a name="line.292"></a> @@ -304,7 +304,7 @@ <span class="sourceLineNo">296</span> * <a name="line.296"></a> <span class="sourceLineNo">297</span> * @param token<a name="line.297"></a> <span class="sourceLineNo">298</span> */<a name="line.298"></a> -<span class="sourceLineNo">299</span> private boolean isShortOption(String token)<a name="line.299"></a> +<span class="sourceLineNo">299</span> private boolean isShortOption(final String token)<a name="line.299"></a> <span class="sourceLineNo">300</span> {<a name="line.300"></a> <span class="sourceLineNo">301</span> // short options (-S, -SV, -S=V, -SV1=V2, -S1S2)<a name="line.301"></a> <span class="sourceLineNo">302</span> if (!token.startsWith("-") || token.length() == 1)<a name="line.302"></a> @@ -313,8 +313,8 @@ <span class="sourceLineNo">305</span> }<a name="line.305"></a> <span class="sourceLineNo">306</span><a name="line.306"></a> <span class="sourceLineNo">307</span> // remove leading "-" and "=value"<a name="line.307"></a> -<span class="sourceLineNo">308</span> int pos = token.indexOf("=");<a name="line.308"></a> -<span class="sourceLineNo">309</span> String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);<a name="line.309"></a> +<span class="sourceLineNo">308</span> final int pos = token.indexOf("=");<a name="line.308"></a> +<span class="sourceLineNo">309</span> final String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);<a name="line.309"></a> <span class="sourceLineNo">310</span> if (options.hasShortOption(optName))<a name="line.310"></a> <span class="sourceLineNo">311</span> {<a name="line.311"></a> <span class="sourceLineNo">312</span> return true;<a name="line.312"></a> @@ -328,15 +328,15 @@ <span class="sourceLineNo">320</span> *<a name="line.320"></a> <span class="sourceLineNo">321</span> * @param token<a name="line.321"></a> <span class="sourceLineNo">322</span> */<a name="line.322"></a> -<span class="sourceLineNo">323</span> private boolean isLongOption(String token)<a name="line.323"></a> +<span class="sourceLineNo">323</span> private boolean isLongOption(final String token)<a name="line.323"></a> <span class="sourceLineNo">324</span> {<a name="line.324"></a> <span class="sourceLineNo">325</span> if (!token.startsWith("-") || token.length() == 1)<a name="line.325"></a> <span class="sourceLineNo">326</span> {<a name="line.326"></a> <span class="sourceLineNo">327</span> return false;<a name="line.327"></a> <span class="sourceLineNo">328</span> }<a name="line.328"></a> <span class="sourceLineNo">329</span><a name="line.329"></a> -<span class="sourceLineNo">330</span> int pos = token.indexOf("=");<a name="line.330"></a> -<span class="sourceLineNo">331</span> String t = pos == -1 ? token : token.substring(0, pos);<a name="line.331"></a> +<span class="sourceLineNo">330</span> final int pos = token.indexOf("=");<a name="line.330"></a> +<span class="sourceLineNo">331</span> final String t = pos == -1 ? token : token.substring(0, pos);<a name="line.331"></a> <span class="sourceLineNo">332</span><a name="line.332"></a> <span class="sourceLineNo">333</span> if (!options.getMatchingOptions(t).isEmpty())<a name="line.333"></a> <span class="sourceLineNo">334</span> {<a name="line.334"></a> @@ -361,7 +361,7 @@ <span class="sourceLineNo">353</span> *<a name="line.353"></a> <span class="sourceLineNo">354</span> * @param token the command line token to handle<a name="line.354"></a> <span class="sourceLineNo">355</span> */<a name="line.355"></a> -<span class="sourceLineNo">356</span> private void handleUnknownToken(String token) throws ParseException<a name="line.356"></a> +<span class="sourceLineNo">356</span> private void handleUnknownToken(final String token) throws ParseException<a name="line.356"></a> <span class="sourceLineNo">357</span> {<a name="line.357"></a> <span class="sourceLineNo">358</span> if (token.startsWith("-") && token.length() > 1 && !stopAtNonOption)<a name="line.358"></a> <span class="sourceLineNo">359</span> {<a name="line.359"></a> @@ -385,7 +385,7 @@ <span class="sourceLineNo">377</span> *<a name="line.377"></a> <span class="sourceLineNo">378</span> * @param token the command line token to handle<a name="line.378"></a> <span class="sourceLineNo">379</span> */<a name="line.379"></a> -<span class="sourceLineNo">380</span> private void handleLongOption(String token) throws ParseException<a name="line.380"></a> +<span class="sourceLineNo">380</span> private void handleLongOption(final String token) throws ParseException<a name="line.380"></a> <span class="sourceLineNo">381</span> {<a name="line.381"></a> <span class="sourceLineNo">382</span> if (token.indexOf('=') == -1)<a name="line.382"></a> <span class="sourceLineNo">383</span> {<a name="line.383"></a> @@ -407,9 +407,9 @@ <span class="sourceLineNo">399</span> * <a name="line.399"></a> <span class="sourceLineNo">400</span> * @param token the command line token to handle<a name="line.400"></a> <span class="sourceLineNo">401</span> */<a name="line.401"></a> -<span class="sourceLineNo">402</span> private void handleLongOptionWithoutEqual(String token) throws ParseException<a name="line.402"></a> +<span class="sourceLineNo">402</span> private void handleLongOptionWithoutEqual(final String token) throws ParseException<a name="line.402"></a> <span class="sourceLineNo">403</span> {<a name="line.403"></a> -<span class="sourceLineNo">404</span> List<String> matchingOpts = options.getMatchingOptions(token);<a name="line.404"></a> +<span class="sourceLineNo">404</span> final List<String> matchingOpts = options.getMatchingOptions(token);<a name="line.404"></a> <span class="sourceLineNo">405</span> if (matchingOpts.isEmpty())<a name="line.405"></a> <span class="sourceLineNo">406</span> {<a name="line.406"></a> <span class="sourceLineNo">407</span> handleUnknownToken(currentToken);<a name="line.407"></a> @@ -434,15 +434,15 @@ <span class="sourceLineNo">426</span> *<a name="line.426"></a> <span class="sourceLineNo">427</span> * @param token the command line token to handle<a name="line.427"></a> <span class="sourceLineNo">428</span> */<a name="line.428"></a> -<span class="sourceLineNo">429</span> private void handleLongOptionWithEqual(String token) throws ParseException<a name="line.429"></a> +<span class="sourceLineNo">429</span> private void handleLongOptionWithEqual(final String token) throws ParseException<a name="line.429"></a> <span class="sourceLineNo">430</span> {<a name="line.430"></a> -<span class="sourceLineNo">431</span> int pos = token.indexOf('=');<a name="line.431"></a> +<span class="sourceLineNo">431</span> final int pos = token.indexOf('=');<a name="line.431"></a> <span class="sourceLineNo">432</span><a name="line.432"></a> -<span class="sourceLineNo">433</span> String value = token.substring(pos + 1);<a name="line.433"></a> +<span class="sourceLineNo">433</span> final String value = token.substring(pos + 1);<a name="line.433"></a> <span class="sourceLineNo">434</span><a name="line.434"></a> -<span class="sourceLineNo">435</span> String opt = token.substring(0, pos);<a name="line.435"></a> +<span class="sourceLineNo">435</span> final String opt = token.substring(0, pos);<a name="line.435"></a> <span class="sourceLineNo">436</span><a name="line.436"></a> -<span class="sourceLineNo">437</span> List<String> matchingOpts = options.getMatchingOptions(opt);<a name="line.437"></a> +<span class="sourceLineNo">437</span> final List<String> matchingOpts = options.getMatchingOptions(opt);<a name="line.437"></a> <span class="sourceLineNo">438</span> if (matchingOpts.isEmpty())<a name="line.438"></a> <span class="sourceLineNo">439</span> {<a name="line.439"></a> <span class="sourceLineNo">440</span> handleUnknownToken(currentToken);<a name="line.440"></a> @@ -453,7 +453,7 @@ <span class="sourceLineNo">445</span> }<a name="line.445"></a> <span class="sourceLineNo">446</span> else<a name="line.446"></a> <span class="sourceLineNo">447</span> {<a name="line.447"></a> -<span class="sourceLineNo">448</span> Option option = options.getOption(matchingOpts.get(0));<a name="line.448"></a> +<span class="sourceLineNo">448</span> final Option option = options.getOption(matchingOpts.get(0));<a name="line.448"></a> <span class="sourceLineNo">449</span><a name="line.449"></a> <span class="sourceLineNo">450</span> if (option.acceptsArg())<a name="line.450"></a> <span class="sourceLineNo">451</span> {<a name="line.451"></a> @@ -487,11 +487,11 @@ <span class="sourceLineNo">479</span> *<a name="line.479"></a> <span class="sourceLineNo">480</span> * @param token the command line token to handle<a name="line.480"></a> <span class="sourceLineNo">481</span> */<a name="line.481"></a> -<span class="sourceLineNo">482</span> private void handleShortAndLongOption(String token) throws ParseException<a name="line.482"></a> +<span class="sourceLineNo">482</span> private void handleShortAndLongOption(final String token) throws ParseException<a name="line.482"></a> <span class="sourceLineNo">483</span> {<a name="line.483"></a> -<span class="sourceLineNo">484</span> String t = Util.stripLeadingHyphens(token);<a name="line.484"></a> +<span class="sourceLineNo">484</span> final String t = Util.stripLeadingHyphens(token);<a name="line.484"></a> <span class="sourceLineNo">485</span><a name="line.485"></a> -<span class="sourceLineNo">486</span> int pos = t.indexOf('=');<a name="line.486"></a> +<span class="sourceLineNo">486</span> final int pos = t.indexOf('=');<a name="line.486"></a> <span class="sourceLineNo">487</span><a name="line.487"></a> <span class="sourceLineNo">488</span> if (t.length() == 1)<a name="line.488"></a> <span class="sourceLineNo">489</span> {<a name="line.489"></a> @@ -520,7 +520,7 @@ <span class="sourceLineNo">512</span> else<a name="line.512"></a> <span class="sourceLineNo">513</span> {<a name="line.513"></a> <span class="sourceLineNo">514</span> // look for a long prefix (-Xmx512m)<a name="line.514"></a> -<span class="sourceLineNo">515</span> String opt = getLongPrefix(t);<a name="line.515"></a> +<span class="sourceLineNo">515</span> final String opt = getLongPrefix(t);<a name="line.515"></a> <span class="sourceLineNo">516</span><a name="line.516"></a> <span class="sourceLineNo">517</span> if (opt != null && options.getOption(opt).acceptsArg())<a name="line.517"></a> <span class="sourceLineNo">518</span> {<a name="line.518"></a> @@ -545,13 +545,13 @@ <span class="sourceLineNo">537</span> else<a name="line.537"></a> <span class="sourceLineNo">538</span> {<a name="line.538"></a> <span class="sourceLineNo">539</span> // equal sign found (-xxx=yyy)<a name="line.539"></a> -<span class="sourceLineNo">540</span> String opt = t.substring(0, pos);<a name="line.540"></a> -<span class="sourceLineNo">541</span> String value = t.substring(pos + 1);<a name="line.541"></a> +<span class="sourceLineNo">540</span> final String opt = t.substring(0, pos);<a name="line.540"></a> +<span class="sourceLineNo">541</span> final String value = t.substring(pos + 1);<a name="line.541"></a> <span class="sourceLineNo">542</span><a name="line.542"></a> <span class="sourceLineNo">543</span> if (opt.length() == 1)<a name="line.543"></a> <span class="sourceLineNo">544</span> {<a name="line.544"></a> <span class="sourceLineNo">545</span> // -S=V<a name="line.545"></a> -<span class="sourceLineNo">546</span> Option option = options.getOption(opt);<a name="line.546"></a> +<span class="sourceLineNo">546</span> final Option option = options.getOption(opt);<a name="line.546"></a> <span class="sourceLineNo">547</span> if (option != null && option.acceptsArg())<a name="line.547"></a> <span class="sourceLineNo">548</span> {<a name="line.548"></a> <span class="sourceLineNo">549</span> handleOption(option);<a name="line.549"></a> @@ -584,15 +584,15 @@ <span class="sourceLineNo">576</span> *<a name="line.576"></a> <span class="sourceLineNo">577</span> * @param token<a name="line.577"></a> <span class="sourceLineNo">578</span> */<a name="line.578"></a> -<span class="sourceLineNo">579</span> private String getLongPrefix(String token)<a name="line.579"></a> +<span class="sourceLineNo">579</span> private String getLongPrefix(final String token)<a name="line.579"></a> <span class="sourceLineNo">580</span> {<a name="line.580"></a> -<span class="sourceLineNo">581</span> String t = Util.stripLeadingHyphens(token);<a name="line.581"></a> +<span class="sourceLineNo">581</span> final String t = Util.stripLeadingHyphens(token);<a name="line.581"></a> <span class="sourceLineNo">582</span><a name="line.582"></a> <span class="sourceLineNo">583</span> int i;<a name="line.583"></a> <span class="sourceLineNo">584</span> String opt = null;<a name="line.584"></a> <span class="sourceLineNo">585</span> for (i = t.length() - 2; i > 1; i--)<a name="line.585"></a> <span class="sourceLineNo">586</span> {<a name="line.586"></a> -<span class="sourceLineNo">587</span> String prefix = t.substring(0, i);<a name="line.587"></a> +<span class="sourceLineNo">587</span> final String prefix = t.substring(0, i);<a name="line.587"></a> <span class="sourceLineNo">588</span> if (options.hasLongOption(prefix))<a name="line.588"></a> <span class="sourceLineNo">589</span> {<a name="line.589"></a> <span class="sourceLineNo">590</span> opt = prefix;<a name="line.590"></a> @@ -606,10 +606,10 @@ <span class="sourceLineNo">598</span> /**<a name="line.598"></a> <span class="sourceLineNo">599</span> * Check if the specified token is a Java-like property (-Dkey=value).<a name="line.599"></a> <span class="sourceLineNo">600</span> */<a name="line.600"></a> -<span class="sourceLineNo">601</span> private boolean isJavaProperty(String token)<a name="line.601"></a> +<span class="sourceLineNo">601</span> private boolean isJavaProperty(final String token)<a name="line.601"></a> <span class="sourceLineNo">602</span> {<a name="line.602"></a> -<span class="sourceLineNo">603</span> String opt = token.substring(0, 1);<a name="line.603"></a> -<span class="sourceLineNo">604</span> Option option = options.getOption(opt);<a name="line.604"></a> +<span class="sourceLineNo">603</span> final String opt = token.substring(0, 1);<a name="line.603"></a> +<span class="sourceLineNo">604</span> final Option option = options.getOption(opt);<a name="line.604"></a> <span class="sourceLineNo">605</span><a name="line.605"></a> <span class="sourceLineNo">606</span> return option != null && (option.getArgs() >= 2 || option.getArgs() == Option.UNLIMITED_VALUES);<a name="line.606"></a> <span class="sourceLineNo">607</span> }<a name="line.607"></a> @@ -640,7 +640,7 @@ <span class="sourceLineNo">632</span> *<a name="line.632"></a> <span class="sourceLineNo">633</span> * @param option<a name="line.633"></a> <span class="sourceLineNo">634</span> */<a name="line.634"></a> -<span class="sourceLineNo">635</span> private void updateRequiredOptions(Option option) throws AlreadySelectedException<a name="line.635"></a> +<span class="sourceLineNo">635</span> private void updateRequiredOptions(final Option option) throws AlreadySelectedException<a name="line.635"></a> <span class="sourceLineNo">636</span> {<a name="line.636"></a> <span class="sourceLineNo">637</span> if (option.isRequired())<a name="line.637"></a> <span class="sourceLineNo">638</span> {<a name="line.638"></a> @@ -650,7 +650,7 @@ <span class="sourceLineNo">642</span> // if the option is in an OptionGroup make that option the selected option of the group<a name="line.642"></a> <span class="sourceLineNo">643</span> if (options.getOptionGroup(option) != null)<a name="line.643"></a> <span class="sourceLineNo">644</span> {<a name="line.644"></a> -<span class="sourceLineNo">645</span> OptionGroup group = options.getOptionGroup(option);<a name="line.645"></a> +<span class="sourceLineNo">645</span> final OptionGroup group = options.getOptionGroup(option);<a name="line.645"></a> <span class="sourceLineNo">646</span><a name="line.646"></a> <span class="sourceLineNo">647</span> if (group.isRequired())<a name="line.647"></a> <span class="sourceLineNo">648</span> {<a name="line.648"></a> @@ -688,11 +688,11 @@ <span class="sourceLineNo">680</span> * @throws ParseException if there are any problems encountered<a name="line.680"></a> <span class="sourceLineNo">681</span> * while parsing the command line token.<a name="line.681"></a> <span class="sourceLineNo">682</span> */<a name="line.682"></a> -<span class="sourceLineNo">683</span> protected void handleConcatenatedOptions(String token) throws ParseException<a name="line.683"></a> +<span class="sourceLineNo">683</span> protected void handleConcatenatedOptions(final String token) throws ParseException<a name="line.683"></a> <span class="sourceLineNo">684</span> {<a name="line.684"></a> <span class="sourceLineNo">685</span> for (int i = 1; i < token.length(); i++)<a name="line.685"></a> <span class="sourceLineNo">686</span> {<a name="line.686"></a> -<span class="sourceLineNo">687</span> String ch = String.valueOf(token.charAt(i));<a name="line.687"></a> +<span class="sourceLineNo">687</span> final String ch = String.valueOf(token.charAt(i));<a name="line.687"></a> <span class="sourceLineNo">688</span><a name="line.688"></a> <span class="sourceLineNo">689</span> if (options.hasOption(ch))<a name="line.689"></a> <span class="sourceLineNo">690</span> {<a name="line.690"></a> Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/GnuParser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/GnuParser.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/GnuParser.html Thu Jun 8 17:47:18 2017 @@ -32,7 +32,7 @@ <span class="sourceLineNo">024</span> * The class GnuParser provides an implementation of the<a name="line.24"></a> <span class="sourceLineNo">025</span> * {@link Parser#flatten(Options, String[], boolean) flatten} method.<a name="line.25"></a> <span class="sourceLineNo">026</span> *<a name="line.26"></a> -<span class="sourceLineNo">027</span> * @version $Id: GnuParser.java 1445352 2013-02-12 20:48:19Z tn $<a name="line.27"></a> +<span class="sourceLineNo">027</span> * @version $Id$<a name="line.27"></a> <span class="sourceLineNo">028</span> * @deprecated since 1.3, use the {@link DefaultParser} instead<a name="line.28"></a> <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>@Deprecated<a name="line.30"></a> @@ -56,15 +56,15 @@ <span class="sourceLineNo">048</span> * @return a String array of the flattened arguments<a name="line.48"></a> <span class="sourceLineNo">049</span> */<a name="line.49"></a> <span class="sourceLineNo">050</span> @Override<a name="line.50"></a> -<span class="sourceLineNo">051</span> protected String[] flatten(Options options, String[] arguments, boolean stopAtNonOption)<a name="line.51"></a> +<span class="sourceLineNo">051</span> protected String[] flatten(final Options options, final String[] arguments, final boolean stopAtNonOption)<a name="line.51"></a> <span class="sourceLineNo">052</span> {<a name="line.52"></a> -<span class="sourceLineNo">053</span> List<String> tokens = new ArrayList<String>();<a name="line.53"></a> +<span class="sourceLineNo">053</span> final List<String> tokens = new ArrayList<String>();<a name="line.53"></a> <span class="sourceLineNo">054</span><a name="line.54"></a> <span class="sourceLineNo">055</span> boolean eatTheRest = false;<a name="line.55"></a> <span class="sourceLineNo">056</span><a name="line.56"></a> <span class="sourceLineNo">057</span> for (int i = 0; i < arguments.length; i++)<a name="line.57"></a> <span class="sourceLineNo">058</span> {<a name="line.58"></a> -<span class="sourceLineNo">059</span> String arg = arguments[i];<a name="line.59"></a> +<span class="sourceLineNo">059</span> final String arg = arguments[i];<a name="line.59"></a> <span class="sourceLineNo">060</span><a name="line.60"></a> <span class="sourceLineNo">061</span> if ("--".equals(arg))<a name="line.61"></a> <span class="sourceLineNo">062</span> {<a name="line.62"></a> @@ -77,7 +77,7 @@ <span class="sourceLineNo">069</span> }<a name="line.69"></a> <span class="sourceLineNo">070</span> else if (arg.startsWith("-"))<a name="line.70"></a> <span class="sourceLineNo">071</span> {<a name="line.71"></a> -<span class="sourceLineNo">072</span> String opt = Util.stripLeadingHyphens(arg);<a name="line.72"></a> +<span class="sourceLineNo">072</span> final String opt = Util.stripLeadingHyphens(arg);<a name="line.72"></a> <span class="sourceLineNo">073</span><a name="line.73"></a> <span class="sourceLineNo">074</span> if (options.hasOption(opt))<a name="line.74"></a> <span class="sourceLineNo">075</span> {<a name="line.75"></a>