Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionBuilder.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionBuilder.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionBuilder.html Mon Mar 13 09:49:52 2017 @@ -465,4 +465,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file
Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionGroup.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionGroup.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/OptionGroup.html Mon Mar 13 09:49:52 2017 @@ -27,14 +27,14 @@ <span class="sourceLineNo">019</span><a name="line.19"></a> <span class="sourceLineNo">020</span>import java.io.Serializable;<a name="line.20"></a> <span class="sourceLineNo">021</span>import java.util.Collection;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.util.HashMap;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.util.Iterator;<a name="line.23"></a> +<span class="sourceLineNo">022</span>import java.util.Iterator;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import java.util.LinkedHashMap;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.util.Map;<a name="line.24"></a> <span class="sourceLineNo">025</span><a name="line.25"></a> <span class="sourceLineNo">026</span>/**<a name="line.26"></a> <span class="sourceLineNo">027</span> * A group of mutually exclusive options.<a name="line.27"></a> <span class="sourceLineNo">028</span> *<a name="line.28"></a> -<span class="sourceLineNo">029</span> * @version $Id: OptionGroup.java 1669814 2015-03-28 18:09:26Z britter $<a name="line.29"></a> +<span class="sourceLineNo">029</span> * @version $Id: OptionGroup.java 1749596 2016-06-21 20:27:06Z britter $<a name="line.29"></a> <span class="sourceLineNo">030</span> */<a name="line.30"></a> <span class="sourceLineNo">031</span>public class OptionGroup implements Serializable<a name="line.31"></a> <span class="sourceLineNo">032</span>{<a name="line.32"></a> @@ -42,7 +42,7 @@ <span class="sourceLineNo">034</span> private static final long serialVersionUID = 1L;<a name="line.34"></a> <span class="sourceLineNo">035</span> <a name="line.35"></a> <span class="sourceLineNo">036</span> /** hold the options */<a name="line.36"></a> -<span class="sourceLineNo">037</span> private final Map<String, Option> optionMap = new HashMap<String, Option>();<a name="line.37"></a> +<span class="sourceLineNo">037</span> private final Map<String, Option> optionMap = new LinkedHashMap<String, Option>();<a name="line.37"></a> <span class="sourceLineNo">038</span><a name="line.38"></a> <span class="sourceLineNo">039</span> /** the name of the selected option */<a name="line.39"></a> <span class="sourceLineNo">040</span> private String selected;<a name="line.40"></a> @@ -248,4 +248,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Options.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Options.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Options.html Mon Mar 13 09:49:52 2017 @@ -29,310 +29,350 @@ <span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a> <span class="sourceLineNo">022</span>import java.util.Collection;<a name="line.22"></a> <span class="sourceLineNo">023</span>import java.util.Collections;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.util.HashMap;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import java.util.HashSet;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.LinkedHashMap;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.List;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import java.util.Map;<a name="line.28"></a> -<span class="sourceLineNo">029</span><a name="line.29"></a> -<span class="sourceLineNo">030</span>/**<a name="line.30"></a> -<span class="sourceLineNo">031</span> * Main entry-point into the library.<a name="line.31"></a> -<span class="sourceLineNo">032</span> * <p><a name="line.32"></a> -<span class="sourceLineNo">033</span> * Options represents a collection of {@link Option} objects, which<a name="line.33"></a> -<span class="sourceLineNo">034</span> * describe the possible options for a command-line.<a name="line.34"></a> -<span class="sourceLineNo">035</span> * <p><a name="line.35"></a> -<span class="sourceLineNo">036</span> * It may flexibly parse long and short options, with or without<a name="line.36"></a> -<span class="sourceLineNo">037</span> * values. Additionally, it may parse only a portion of a commandline,<a name="line.37"></a> -<span class="sourceLineNo">038</span> * allowing for flexible multi-stage parsing.<a name="line.38"></a> -<span class="sourceLineNo">039</span> *<a name="line.39"></a> -<span class="sourceLineNo">040</span> * @see org.apache.commons.cli.CommandLine<a name="line.40"></a> -<span class="sourceLineNo">041</span> *<a name="line.41"></a> -<span class="sourceLineNo">042</span> * @version $Id: Options.java 1685376 2015-06-14 09:51:59Z britter $<a name="line.42"></a> -<span class="sourceLineNo">043</span> */<a name="line.43"></a> -<span class="sourceLineNo">044</span>public class Options implements Serializable<a name="line.44"></a> -<span class="sourceLineNo">045</span>{<a name="line.45"></a> -<span class="sourceLineNo">046</span> /** The serial version UID. */<a name="line.46"></a> -<span class="sourceLineNo">047</span> private static final long serialVersionUID = 1L;<a name="line.47"></a> -<span class="sourceLineNo">048</span><a name="line.48"></a> -<span class="sourceLineNo">049</span> /** a map of the options with the character key */<a name="line.49"></a> -<span class="sourceLineNo">050</span> private final Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();<a name="line.50"></a> -<span class="sourceLineNo">051</span><a name="line.51"></a> -<span class="sourceLineNo">052</span> /** a map of the options with the long key */<a name="line.52"></a> -<span class="sourceLineNo">053</span> private final Map<String, Option> longOpts = new LinkedHashMap<String, Option>();<a name="line.53"></a> -<span class="sourceLineNo">054</span><a name="line.54"></a> -<span class="sourceLineNo">055</span> /** a map of the required options */<a name="line.55"></a> -<span class="sourceLineNo">056</span> // N.B. This can contain either a String (addOption) or an OptionGroup (addOptionGroup)<a name="line.56"></a> -<span class="sourceLineNo">057</span> // TODO this seems wrong<a name="line.57"></a> -<span class="sourceLineNo">058</span> private final List<Object> requiredOpts = new ArrayList<Object>();<a name="line.58"></a> -<span class="sourceLineNo">059</span><a name="line.59"></a> -<span class="sourceLineNo">060</span> /** a map of the option groups */<a name="line.60"></a> -<span class="sourceLineNo">061</span> private final Map<String, OptionGroup> optionGroups = new HashMap<String, OptionGroup>();<a name="line.61"></a> -<span class="sourceLineNo">062</span><a name="line.62"></a> -<span class="sourceLineNo">063</span> /**<a name="line.63"></a> -<span class="sourceLineNo">064</span> * Add the specified option group.<a name="line.64"></a> -<span class="sourceLineNo">065</span> *<a name="line.65"></a> -<span class="sourceLineNo">066</span> * @param group the OptionGroup that is to be added<a name="line.66"></a> -<span class="sourceLineNo">067</span> * @return the resulting Options instance<a name="line.67"></a> -<span class="sourceLineNo">068</span> */<a name="line.68"></a> -<span class="sourceLineNo">069</span> public Options addOptionGroup(OptionGroup group)<a name="line.69"></a> -<span class="sourceLineNo">070</span> {<a name="line.70"></a> -<span class="sourceLineNo">071</span> if (group.isRequired())<a name="line.71"></a> -<span class="sourceLineNo">072</span> {<a name="line.72"></a> -<span class="sourceLineNo">073</span> requiredOpts.add(group);<a name="line.73"></a> -<span class="sourceLineNo">074</span> }<a name="line.74"></a> -<span class="sourceLineNo">075</span><a name="line.75"></a> -<span class="sourceLineNo">076</span> for (Option option : group.getOptions())<a name="line.76"></a> -<span class="sourceLineNo">077</span> {<a name="line.77"></a> -<span class="sourceLineNo">078</span> // an Option cannot be required if it is in an<a name="line.78"></a> -<span class="sourceLineNo">079</span> // OptionGroup, either the group is required or<a name="line.79"></a> -<span class="sourceLineNo">080</span> // nothing is required<a name="line.80"></a> -<span class="sourceLineNo">081</span> option.setRequired(false);<a name="line.81"></a> -<span class="sourceLineNo">082</span> addOption(option);<a name="line.82"></a> -<span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> optionGroups.put(option.getKey(), group);<a name="line.84"></a> -<span class="sourceLineNo">085</span> }<a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> return this;<a name="line.87"></a> -<span class="sourceLineNo">088</span> }<a name="line.88"></a> -<span class="sourceLineNo">089</span><a name="line.89"></a> -<span class="sourceLineNo">090</span> /**<a name="line.90"></a> -<span class="sourceLineNo">091</span> * Lists the OptionGroups that are members of this Options instance.<a name="line.91"></a> -<span class="sourceLineNo">092</span> *<a name="line.92"></a> -<span class="sourceLineNo">093</span> * @return a Collection of OptionGroup instances.<a name="line.93"></a> -<span class="sourceLineNo">094</span> */<a name="line.94"></a> -<span class="sourceLineNo">095</span> Collection<OptionGroup> getOptionGroups()<a name="line.95"></a> -<span class="sourceLineNo">096</span> {<a name="line.96"></a> -<span class="sourceLineNo">097</span> return new HashSet<OptionGroup>(optionGroups.values());<a name="line.97"></a> -<span class="sourceLineNo">098</span> }<a name="line.98"></a> -<span class="sourceLineNo">099</span><a name="line.99"></a> -<span class="sourceLineNo">100</span> /**<a name="line.100"></a> -<span class="sourceLineNo">101</span> * Add an option that only contains a short name.<a name="line.101"></a> -<span class="sourceLineNo">102</span> * The option does not take an argument.<a name="line.102"></a> -<span class="sourceLineNo">103</span> *<a name="line.103"></a> -<span class="sourceLineNo">104</span> * @param opt Short single-character name of the option.<a name="line.104"></a> -<span class="sourceLineNo">105</span> * @param description Self-documenting description<a name="line.105"></a> -<span class="sourceLineNo">106</span> * @return the resulting Options instance<a name="line.106"></a> -<span class="sourceLineNo">107</span> * @since 1.3<a name="line.107"></a> -<span class="sourceLineNo">108</span> */<a name="line.108"></a> -<span class="sourceLineNo">109</span> public Options addOption(String opt, String description)<a name="line.109"></a> -<span class="sourceLineNo">110</span> {<a name="line.110"></a> -<span class="sourceLineNo">111</span> addOption(opt, null, false, description);<a name="line.111"></a> -<span class="sourceLineNo">112</span> return this;<a name="line.112"></a> -<span class="sourceLineNo">113</span> }<a name="line.113"></a> -<span class="sourceLineNo">114</span><a name="line.114"></a> -<span class="sourceLineNo">115</span> /**<a name="line.115"></a> -<span class="sourceLineNo">116</span> * Add an option that only contains a short-name.<a name="line.116"></a> -<span class="sourceLineNo">117</span> * It may be specified as requiring an argument.<a name="line.117"></a> -<span class="sourceLineNo">118</span> *<a name="line.118"></a> -<span class="sourceLineNo">119</span> * @param opt Short single-character name of the option.<a name="line.119"></a> -<span class="sourceLineNo">120</span> * @param hasArg flag signally if an argument is required after this option<a name="line.120"></a> -<span class="sourceLineNo">121</span> * @param description Self-documenting description<a name="line.121"></a> -<span class="sourceLineNo">122</span> * @return the resulting Options instance<a name="line.122"></a> -<span class="sourceLineNo">123</span> */<a name="line.123"></a> -<span class="sourceLineNo">124</span> public Options addOption(String opt, boolean hasArg, String description)<a name="line.124"></a> -<span class="sourceLineNo">125</span> {<a name="line.125"></a> -<span class="sourceLineNo">126</span> addOption(opt, null, hasArg, description);<a name="line.126"></a> -<span class="sourceLineNo">127</span> return this;<a name="line.127"></a> -<span class="sourceLineNo">128</span> }<a name="line.128"></a> -<span class="sourceLineNo">129</span><a name="line.129"></a> -<span class="sourceLineNo">130</span> /**<a name="line.130"></a> -<span class="sourceLineNo">131</span> * Add an option that contains a short-name and a long-name.<a name="line.131"></a> -<span class="sourceLineNo">132</span> * It may be specified as requiring an argument.<a name="line.132"></a> -<span class="sourceLineNo">133</span> *<a name="line.133"></a> -<span class="sourceLineNo">134</span> * @param opt Short single-character name of the option.<a name="line.134"></a> -<span class="sourceLineNo">135</span> * @param longOpt Long multi-character name of the option.<a name="line.135"></a> -<span class="sourceLineNo">136</span> * @param hasArg flag signally if an argument is required after this option<a name="line.136"></a> -<span class="sourceLineNo">137</span> * @param description Self-documenting description<a name="line.137"></a> -<span class="sourceLineNo">138</span> * @return the resulting Options instance<a name="line.138"></a> -<span class="sourceLineNo">139</span> */<a name="line.139"></a> -<span class="sourceLineNo">140</span> public Options addOption(String opt, String longOpt, boolean hasArg, String description)<a name="line.140"></a> -<span class="sourceLineNo">141</span> {<a name="line.141"></a> -<span class="sourceLineNo">142</span> addOption(new Option(opt, longOpt, hasArg, description));<a name="line.142"></a> -<span class="sourceLineNo">143</span> return this;<a name="line.143"></a> -<span class="sourceLineNo">144</span> }<a name="line.144"></a> -<span class="sourceLineNo">145</span><a name="line.145"></a> -<span class="sourceLineNo">146</span> /**<a name="line.146"></a> -<span class="sourceLineNo">147</span> * Adds an option instance<a name="line.147"></a> -<span class="sourceLineNo">148</span> *<a name="line.148"></a> -<span class="sourceLineNo">149</span> * @param opt the option that is to be added<a name="line.149"></a> -<span class="sourceLineNo">150</span> * @return the resulting Options instance<a name="line.150"></a> -<span class="sourceLineNo">151</span> */<a name="line.151"></a> -<span class="sourceLineNo">152</span> public Options addOption(Option opt)<a name="line.152"></a> -<span class="sourceLineNo">153</span> {<a name="line.153"></a> -<span class="sourceLineNo">154</span> String key = opt.getKey();<a name="line.154"></a> -<span class="sourceLineNo">155</span><a name="line.155"></a> -<span class="sourceLineNo">156</span> // add it to the long option list<a name="line.156"></a> -<span class="sourceLineNo">157</span> if (opt.hasLongOpt())<a name="line.157"></a> -<span class="sourceLineNo">158</span> {<a name="line.158"></a> -<span class="sourceLineNo">159</span> longOpts.put(opt.getLongOpt(), opt);<a name="line.159"></a> -<span class="sourceLineNo">160</span> }<a name="line.160"></a> -<span class="sourceLineNo">161</span><a name="line.161"></a> -<span class="sourceLineNo">162</span> // if the option is required add it to the required list<a name="line.162"></a> -<span class="sourceLineNo">163</span> if (opt.isRequired())<a name="line.163"></a> -<span class="sourceLineNo">164</span> {<a name="line.164"></a> -<span class="sourceLineNo">165</span> if (requiredOpts.contains(key))<a name="line.165"></a> -<span class="sourceLineNo">166</span> {<a name="line.166"></a> -<span class="sourceLineNo">167</span> requiredOpts.remove(requiredOpts.indexOf(key));<a name="line.167"></a> -<span class="sourceLineNo">168</span> }<a name="line.168"></a> -<span class="sourceLineNo">169</span> requiredOpts.add(key);<a name="line.169"></a> -<span class="sourceLineNo">170</span> }<a name="line.170"></a> -<span class="sourceLineNo">171</span><a name="line.171"></a> -<span class="sourceLineNo">172</span> shortOpts.put(key, opt);<a name="line.172"></a> -<span class="sourceLineNo">173</span><a name="line.173"></a> -<span class="sourceLineNo">174</span> return this;<a name="line.174"></a> -<span class="sourceLineNo">175</span> }<a name="line.175"></a> -<span class="sourceLineNo">176</span><a name="line.176"></a> -<span class="sourceLineNo">177</span> /**<a name="line.177"></a> -<span class="sourceLineNo">178</span> * Retrieve a read-only list of options in this set<a name="line.178"></a> -<span class="sourceLineNo">179</span> *<a name="line.179"></a> -<span class="sourceLineNo">180</span> * @return read-only Collection of {@link Option} objects in this descriptor<a name="line.180"></a> -<span class="sourceLineNo">181</span> */<a name="line.181"></a> -<span class="sourceLineNo">182</span> public Collection<Option> getOptions()<a name="line.182"></a> -<span class="sourceLineNo">183</span> {<a name="line.183"></a> -<span class="sourceLineNo">184</span> return Collections.unmodifiableCollection(helpOptions());<a name="line.184"></a> -<span class="sourceLineNo">185</span> }<a name="line.185"></a> -<span class="sourceLineNo">186</span><a name="line.186"></a> -<span class="sourceLineNo">187</span> /**<a name="line.187"></a> -<span class="sourceLineNo">188</span> * Returns the Options for use by the HelpFormatter.<a name="line.188"></a> -<span class="sourceLineNo">189</span> *<a name="line.189"></a> -<span class="sourceLineNo">190</span> * @return the List of Options<a name="line.190"></a> -<span class="sourceLineNo">191</span> */<a name="line.191"></a> -<span class="sourceLineNo">192</span> List<Option> helpOptions()<a name="line.192"></a> -<span class="sourceLineNo">193</span> {<a name="line.193"></a> -<span class="sourceLineNo">194</span> return new ArrayList<Option>(shortOpts.values());<a name="line.194"></a> -<span class="sourceLineNo">195</span> }<a name="line.195"></a> -<span class="sourceLineNo">196</span><a name="line.196"></a> -<span class="sourceLineNo">197</span> /**<a name="line.197"></a> -<span class="sourceLineNo">198</span> * Returns the required options.<a name="line.198"></a> -<span class="sourceLineNo">199</span> *<a name="line.199"></a> -<span class="sourceLineNo">200</span> * @return read-only List of required options<a name="line.200"></a> -<span class="sourceLineNo">201</span> */<a name="line.201"></a> -<span class="sourceLineNo">202</span> public List getRequiredOptions()<a name="line.202"></a> -<span class="sourceLineNo">203</span> {<a name="line.203"></a> -<span class="sourceLineNo">204</span> return Collections.unmodifiableList(requiredOpts);<a name="line.204"></a> -<span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span> /**<a name="line.207"></a> -<span class="sourceLineNo">208</span> * Retrieve the {@link Option} matching the long or short name specified.<a name="line.208"></a> -<span class="sourceLineNo">209</span> * The leading hyphens in the name are ignored (up to 2).<a name="line.209"></a> -<span class="sourceLineNo">210</span> *<a name="line.210"></a> -<span class="sourceLineNo">211</span> * @param opt short or long name of the {@link Option}<a name="line.211"></a> -<span class="sourceLineNo">212</span> * @return the option represented by opt<a name="line.212"></a> -<span class="sourceLineNo">213</span> */<a name="line.213"></a> -<span class="sourceLineNo">214</span> public Option getOption(String opt)<a name="line.214"></a> -<span class="sourceLineNo">215</span> {<a name="line.215"></a> -<span class="sourceLineNo">216</span> opt = Util.stripLeadingHyphens(opt);<a name="line.216"></a> -<span class="sourceLineNo">217</span><a name="line.217"></a> -<span class="sourceLineNo">218</span> if (shortOpts.containsKey(opt))<a name="line.218"></a> -<span class="sourceLineNo">219</span> {<a name="line.219"></a> -<span class="sourceLineNo">220</span> return shortOpts.get(opt);<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span><a name="line.222"></a> -<span class="sourceLineNo">223</span> return longOpts.get(opt);<a name="line.223"></a> -<span class="sourceLineNo">224</span> }<a name="line.224"></a> -<span class="sourceLineNo">225</span><a name="line.225"></a> -<span class="sourceLineNo">226</span> /**<a name="line.226"></a> -<span class="sourceLineNo">227</span> * Returns the options with a long name starting with the name specified.<a name="line.227"></a> -<span class="sourceLineNo">228</span> * <a name="line.228"></a> -<span class="sourceLineNo">229</span> * @param opt the partial name of the option<a name="line.229"></a> -<span class="sourceLineNo">230</span> * @return the options matching the partial name specified, or an empty list if none matches<a name="line.230"></a> -<span class="sourceLineNo">231</span> * @since 1.3<a name="line.231"></a> -<span class="sourceLineNo">232</span> */<a name="line.232"></a> -<span class="sourceLineNo">233</span> public List<String> getMatchingOptions(String opt)<a name="line.233"></a> -<span class="sourceLineNo">234</span> {<a name="line.234"></a> -<span class="sourceLineNo">235</span> opt = Util.stripLeadingHyphens(opt);<a name="line.235"></a> -<span class="sourceLineNo">236</span> <a name="line.236"></a> -<span class="sourceLineNo">237</span> List<String> matchingOpts = new ArrayList<String>();<a name="line.237"></a> -<span class="sourceLineNo">238</span><a name="line.238"></a> -<span class="sourceLineNo">239</span> // for a perfect match return the single option only<a name="line.239"></a> -<span class="sourceLineNo">240</span> if (longOpts.keySet().contains(opt))<a name="line.240"></a> -<span class="sourceLineNo">241</span> {<a name="line.241"></a> -<span class="sourceLineNo">242</span> return Collections.singletonList(opt);<a name="line.242"></a> -<span class="sourceLineNo">243</span> }<a name="line.243"></a> +<span class="sourceLineNo">024</span>import java.util.HashSet;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import java.util.LinkedHashMap;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.Map;<a name="line.27"></a> +<span class="sourceLineNo">028</span><a name="line.28"></a> +<span class="sourceLineNo">029</span>/**<a name="line.29"></a> +<span class="sourceLineNo">030</span> * Main entry-point into the library.<a name="line.30"></a> +<span class="sourceLineNo">031</span> * <p><a name="line.31"></a> +<span class="sourceLineNo">032</span> * Options represents a collection of {@link Option} objects, which<a name="line.32"></a> +<span class="sourceLineNo">033</span> * describe the possible options for a command-line.<a name="line.33"></a> +<span class="sourceLineNo">034</span> * <p><a name="line.34"></a> +<span class="sourceLineNo">035</span> * It may flexibly parse long and short options, with or without<a name="line.35"></a> +<span class="sourceLineNo">036</span> * values. Additionally, it may parse only a portion of a commandline,<a name="line.36"></a> +<span class="sourceLineNo">037</span> * allowing for flexible multi-stage parsing.<a name="line.37"></a> +<span class="sourceLineNo">038</span> *<a name="line.38"></a> +<span class="sourceLineNo">039</span> * @see org.apache.commons.cli.CommandLine<a name="line.39"></a> +<span class="sourceLineNo">040</span> *<a name="line.40"></a> +<span class="sourceLineNo">041</span> * @version $Id: Options.java 1754332 2016-07-27 18:47:57Z britter $<a name="line.41"></a> +<span class="sourceLineNo">042</span> */<a name="line.42"></a> +<span class="sourceLineNo">043</span>public class Options implements Serializable<a name="line.43"></a> +<span class="sourceLineNo">044</span>{<a name="line.44"></a> +<span class="sourceLineNo">045</span> /** The serial version UID. */<a name="line.45"></a> +<span class="sourceLineNo">046</span> private static final long serialVersionUID = 1L;<a name="line.46"></a> +<span class="sourceLineNo">047</span><a name="line.47"></a> +<span class="sourceLineNo">048</span> /** a map of the options with the character key */<a name="line.48"></a> +<span class="sourceLineNo">049</span> private final Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();<a name="line.49"></a> +<span class="sourceLineNo">050</span><a name="line.50"></a> +<span class="sourceLineNo">051</span> /** a map of the options with the long key */<a name="line.51"></a> +<span class="sourceLineNo">052</span> private final Map<String, Option> longOpts = new LinkedHashMap<String, Option>();<a name="line.52"></a> +<span class="sourceLineNo">053</span><a name="line.53"></a> +<span class="sourceLineNo">054</span> /** a map of the required options */<a name="line.54"></a> +<span class="sourceLineNo">055</span> // N.B. This can contain either a String (addOption) or an OptionGroup (addOptionGroup)<a name="line.55"></a> +<span class="sourceLineNo">056</span> // TODO this seems wrong<a name="line.56"></a> +<span class="sourceLineNo">057</span> private final List<Object> requiredOpts = new ArrayList<Object>();<a name="line.57"></a> +<span class="sourceLineNo">058</span><a name="line.58"></a> +<span class="sourceLineNo">059</span> /** a map of the option groups */<a name="line.59"></a> +<span class="sourceLineNo">060</span> private final Map<String, OptionGroup> optionGroups = new LinkedHashMap<String, OptionGroup>();<a name="line.60"></a> +<span class="sourceLineNo">061</span><a name="line.61"></a> +<span class="sourceLineNo">062</span> /**<a name="line.62"></a> +<span class="sourceLineNo">063</span> * Add the specified option group.<a name="line.63"></a> +<span class="sourceLineNo">064</span> *<a name="line.64"></a> +<span class="sourceLineNo">065</span> * @param group the OptionGroup that is to be added<a name="line.65"></a> +<span class="sourceLineNo">066</span> * @return the resulting Options instance<a name="line.66"></a> +<span class="sourceLineNo">067</span> */<a name="line.67"></a> +<span class="sourceLineNo">068</span> public Options addOptionGroup(OptionGroup group)<a name="line.68"></a> +<span class="sourceLineNo">069</span> {<a name="line.69"></a> +<span class="sourceLineNo">070</span> if (group.isRequired())<a name="line.70"></a> +<span class="sourceLineNo">071</span> {<a name="line.71"></a> +<span class="sourceLineNo">072</span> requiredOpts.add(group);<a name="line.72"></a> +<span class="sourceLineNo">073</span> }<a name="line.73"></a> +<span class="sourceLineNo">074</span><a name="line.74"></a> +<span class="sourceLineNo">075</span> for (Option option : group.getOptions())<a name="line.75"></a> +<span class="sourceLineNo">076</span> {<a name="line.76"></a> +<span class="sourceLineNo">077</span> // an Option cannot be required if it is in an<a name="line.77"></a> +<span class="sourceLineNo">078</span> // OptionGroup, either the group is required or<a name="line.78"></a> +<span class="sourceLineNo">079</span> // nothing is required<a name="line.79"></a> +<span class="sourceLineNo">080</span> option.setRequired(false);<a name="line.80"></a> +<span class="sourceLineNo">081</span> addOption(option);<a name="line.81"></a> +<span class="sourceLineNo">082</span><a name="line.82"></a> +<span class="sourceLineNo">083</span> optionGroups.put(option.getKey(), group);<a name="line.83"></a> +<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">085</span><a name="line.85"></a> +<span class="sourceLineNo">086</span> return this;<a name="line.86"></a> +<span class="sourceLineNo">087</span> }<a name="line.87"></a> +<span class="sourceLineNo">088</span><a name="line.88"></a> +<span class="sourceLineNo">089</span> /**<a name="line.89"></a> +<span class="sourceLineNo">090</span> * Lists the OptionGroups that are members of this Options instance.<a name="line.90"></a> +<span class="sourceLineNo">091</span> *<a name="line.91"></a> +<span class="sourceLineNo">092</span> * @return a Collection of OptionGroup instances.<a name="line.92"></a> +<span class="sourceLineNo">093</span> */<a name="line.93"></a> +<span class="sourceLineNo">094</span> Collection<OptionGroup> getOptionGroups()<a name="line.94"></a> +<span class="sourceLineNo">095</span> {<a name="line.95"></a> +<span class="sourceLineNo">096</span> return new HashSet<OptionGroup>(optionGroups.values());<a name="line.96"></a> +<span class="sourceLineNo">097</span> }<a name="line.97"></a> +<span class="sourceLineNo">098</span><a name="line.98"></a> +<span class="sourceLineNo">099</span> /**<a name="line.99"></a> +<span class="sourceLineNo">100</span> * Add an option that only contains a short name.<a name="line.100"></a> +<span class="sourceLineNo">101</span> * <a name="line.101"></a> +<span class="sourceLineNo">102</span> * <p><a name="line.102"></a> +<span class="sourceLineNo">103</span> * The option does not take an argument.<a name="line.103"></a> +<span class="sourceLineNo">104</span> * </p><a name="line.104"></a> +<span class="sourceLineNo">105</span> *<a name="line.105"></a> +<span class="sourceLineNo">106</span> * @param opt Short single-character name of the option.<a name="line.106"></a> +<span class="sourceLineNo">107</span> * @param description Self-documenting description<a name="line.107"></a> +<span class="sourceLineNo">108</span> * @return the resulting Options instance<a name="line.108"></a> +<span class="sourceLineNo">109</span> * @since 1.3<a name="line.109"></a> +<span class="sourceLineNo">110</span> */<a name="line.110"></a> +<span class="sourceLineNo">111</span> public Options addOption(String opt, String description)<a name="line.111"></a> +<span class="sourceLineNo">112</span> {<a name="line.112"></a> +<span class="sourceLineNo">113</span> addOption(opt, null, false, description);<a name="line.113"></a> +<span class="sourceLineNo">114</span> return this;<a name="line.114"></a> +<span class="sourceLineNo">115</span> }<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> /**<a name="line.117"></a> +<span class="sourceLineNo">118</span> * Add an option that only contains a short-name.<a name="line.118"></a> +<span class="sourceLineNo">119</span> *<a name="line.119"></a> +<span class="sourceLineNo">120</span> * <p><a name="line.120"></a> +<span class="sourceLineNo">121</span> * It may be specified as requiring an argument.<a name="line.121"></a> +<span class="sourceLineNo">122</span> * </p><a name="line.122"></a> +<span class="sourceLineNo">123</span> *<a name="line.123"></a> +<span class="sourceLineNo">124</span> * @param opt Short single-character name of the option.<a name="line.124"></a> +<span class="sourceLineNo">125</span> * @param hasArg flag signally if an argument is required after this option<a name="line.125"></a> +<span class="sourceLineNo">126</span> * @param description Self-documenting description<a name="line.126"></a> +<span class="sourceLineNo">127</span> * @return the resulting Options instance<a name="line.127"></a> +<span class="sourceLineNo">128</span> */<a name="line.128"></a> +<span class="sourceLineNo">129</span> public Options addOption(String opt, boolean hasArg, String description)<a name="line.129"></a> +<span class="sourceLineNo">130</span> {<a name="line.130"></a> +<span class="sourceLineNo">131</span> addOption(opt, null, hasArg, description);<a name="line.131"></a> +<span class="sourceLineNo">132</span> return this;<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span><a name="line.134"></a> +<span class="sourceLineNo">135</span> /**<a name="line.135"></a> +<span class="sourceLineNo">136</span> * Add an option that contains a short-name and a long-name.<a name="line.136"></a> +<span class="sourceLineNo">137</span> *<a name="line.137"></a> +<span class="sourceLineNo">138</span> * <p><a name="line.138"></a> +<span class="sourceLineNo">139</span> * It may be specified as requiring an argument.<a name="line.139"></a> +<span class="sourceLineNo">140</span> * </p><a name="line.140"></a> +<span class="sourceLineNo">141</span> *<a name="line.141"></a> +<span class="sourceLineNo">142</span> * @param opt Short single-character name of the option.<a name="line.142"></a> +<span class="sourceLineNo">143</span> * @param longOpt Long multi-character name of the option.<a name="line.143"></a> +<span class="sourceLineNo">144</span> * @param hasArg flag signally if an argument is required after this option<a name="line.144"></a> +<span class="sourceLineNo">145</span> * @param description Self-documenting description<a name="line.145"></a> +<span class="sourceLineNo">146</span> * @return the resulting Options instance<a name="line.146"></a> +<span class="sourceLineNo">147</span> */<a name="line.147"></a> +<span class="sourceLineNo">148</span> public Options addOption(String opt, String longOpt, boolean hasArg, String description)<a name="line.148"></a> +<span class="sourceLineNo">149</span> {<a name="line.149"></a> +<span class="sourceLineNo">150</span> addOption(new Option(opt, longOpt, hasArg, description));<a name="line.150"></a> +<span class="sourceLineNo">151</span> return this;<a name="line.151"></a> +<span class="sourceLineNo">152</span> }<a name="line.152"></a> +<span class="sourceLineNo">153</span><a name="line.153"></a> +<span class="sourceLineNo">154</span> /**<a name="line.154"></a> +<span class="sourceLineNo">155</span> * Add an option that contains a short-name and a long-name.<a name="line.155"></a> +<span class="sourceLineNo">156</span> * <a name="line.156"></a> +<span class="sourceLineNo">157</span> * <p><a name="line.157"></a> +<span class="sourceLineNo">158</span> * The added option is set as required. It may be specified as requiring an argument. This method is a shortcut for:<a name="line.158"></a> +<span class="sourceLineNo">159</span> * </p><a name="line.159"></a> +<span class="sourceLineNo">160</span> *<a name="line.160"></a> +<span class="sourceLineNo">161</span> * <pre><a name="line.161"></a> +<span class="sourceLineNo">162</span> * <code><a name="line.162"></a> +<span class="sourceLineNo">163</span> * Options option = new Option(opt, longOpt, hasArg, description);<a name="line.163"></a> +<span class="sourceLineNo">164</span> * option.setRequired(true);<a name="line.164"></a> +<span class="sourceLineNo">165</span> * options.add(option);<a name="line.165"></a> +<span class="sourceLineNo">166</span> * </code><a name="line.166"></a> +<span class="sourceLineNo">167</span> * </pre><a name="line.167"></a> +<span class="sourceLineNo">168</span> *<a name="line.168"></a> +<span class="sourceLineNo">169</span> * @param opt Short single-character name of the option.<a name="line.169"></a> +<span class="sourceLineNo">170</span> * @param longOpt Long multi-character name of the option.<a name="line.170"></a> +<span class="sourceLineNo">171</span> * @param hasArg flag signally if an argument is required after this option<a name="line.171"></a> +<span class="sourceLineNo">172</span> * @param description Self-documenting description<a name="line.172"></a> +<span class="sourceLineNo">173</span> * @return the resulting Options instance<a name="line.173"></a> +<span class="sourceLineNo">174</span> * @since 1.4<a name="line.174"></a> +<span class="sourceLineNo">175</span> */<a name="line.175"></a> +<span class="sourceLineNo">176</span> public Options addRequiredOption(String opt, String longOpt, boolean hasArg, String description)<a name="line.176"></a> +<span class="sourceLineNo">177</span> {<a name="line.177"></a> +<span class="sourceLineNo">178</span> Option option = new Option(opt, longOpt, hasArg, description);<a name="line.178"></a> +<span class="sourceLineNo">179</span> option.setRequired(true);<a name="line.179"></a> +<span class="sourceLineNo">180</span> addOption(option);<a name="line.180"></a> +<span class="sourceLineNo">181</span> return this;<a name="line.181"></a> +<span class="sourceLineNo">182</span> }<a name="line.182"></a> +<span class="sourceLineNo">183</span><a name="line.183"></a> +<span class="sourceLineNo">184</span> /**<a name="line.184"></a> +<span class="sourceLineNo">185</span> * Adds an option instance<a name="line.185"></a> +<span class="sourceLineNo">186</span> *<a name="line.186"></a> +<span class="sourceLineNo">187</span> * @param opt the option that is to be added<a name="line.187"></a> +<span class="sourceLineNo">188</span> * @return the resulting Options instance<a name="line.188"></a> +<span class="sourceLineNo">189</span> */<a name="line.189"></a> +<span class="sourceLineNo">190</span> public Options addOption(Option opt)<a name="line.190"></a> +<span class="sourceLineNo">191</span> {<a name="line.191"></a> +<span class="sourceLineNo">192</span> String key = opt.getKey();<a name="line.192"></a> +<span class="sourceLineNo">193</span><a name="line.193"></a> +<span class="sourceLineNo">194</span> // add it to the long option list<a name="line.194"></a> +<span class="sourceLineNo">195</span> if (opt.hasLongOpt())<a name="line.195"></a> +<span class="sourceLineNo">196</span> {<a name="line.196"></a> +<span class="sourceLineNo">197</span> longOpts.put(opt.getLongOpt(), opt);<a name="line.197"></a> +<span class="sourceLineNo">198</span> }<a name="line.198"></a> +<span class="sourceLineNo">199</span><a name="line.199"></a> +<span class="sourceLineNo">200</span> // if the option is required add it to the required list<a name="line.200"></a> +<span class="sourceLineNo">201</span> if (opt.isRequired())<a name="line.201"></a> +<span class="sourceLineNo">202</span> {<a name="line.202"></a> +<span class="sourceLineNo">203</span> if (requiredOpts.contains(key))<a name="line.203"></a> +<span class="sourceLineNo">204</span> {<a name="line.204"></a> +<span class="sourceLineNo">205</span> requiredOpts.remove(requiredOpts.indexOf(key));<a name="line.205"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> +<span class="sourceLineNo">207</span> requiredOpts.add(key);<a name="line.207"></a> +<span class="sourceLineNo">208</span> }<a name="line.208"></a> +<span class="sourceLineNo">209</span><a name="line.209"></a> +<span class="sourceLineNo">210</span> shortOpts.put(key, opt);<a name="line.210"></a> +<span class="sourceLineNo">211</span><a name="line.211"></a> +<span class="sourceLineNo">212</span> return this;<a name="line.212"></a> +<span class="sourceLineNo">213</span> }<a name="line.213"></a> +<span class="sourceLineNo">214</span><a name="line.214"></a> +<span class="sourceLineNo">215</span> /**<a name="line.215"></a> +<span class="sourceLineNo">216</span> * Retrieve a read-only list of options in this set<a name="line.216"></a> +<span class="sourceLineNo">217</span> *<a name="line.217"></a> +<span class="sourceLineNo">218</span> * @return read-only Collection of {@link Option} objects in this descriptor<a name="line.218"></a> +<span class="sourceLineNo">219</span> */<a name="line.219"></a> +<span class="sourceLineNo">220</span> public Collection<Option> getOptions()<a name="line.220"></a> +<span class="sourceLineNo">221</span> {<a name="line.221"></a> +<span class="sourceLineNo">222</span> return Collections.unmodifiableCollection(helpOptions());<a name="line.222"></a> +<span class="sourceLineNo">223</span> }<a name="line.223"></a> +<span class="sourceLineNo">224</span><a name="line.224"></a> +<span class="sourceLineNo">225</span> /**<a name="line.225"></a> +<span class="sourceLineNo">226</span> * Returns the Options for use by the HelpFormatter.<a name="line.226"></a> +<span class="sourceLineNo">227</span> *<a name="line.227"></a> +<span class="sourceLineNo">228</span> * @return the List of Options<a name="line.228"></a> +<span class="sourceLineNo">229</span> */<a name="line.229"></a> +<span class="sourceLineNo">230</span> List<Option> helpOptions()<a name="line.230"></a> +<span class="sourceLineNo">231</span> {<a name="line.231"></a> +<span class="sourceLineNo">232</span> return new ArrayList<Option>(shortOpts.values());<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span><a name="line.234"></a> +<span class="sourceLineNo">235</span> /**<a name="line.235"></a> +<span class="sourceLineNo">236</span> * Returns the required options.<a name="line.236"></a> +<span class="sourceLineNo">237</span> *<a name="line.237"></a> +<span class="sourceLineNo">238</span> * @return read-only List of required options<a name="line.238"></a> +<span class="sourceLineNo">239</span> */<a name="line.239"></a> +<span class="sourceLineNo">240</span> public List getRequiredOptions()<a name="line.240"></a> +<span class="sourceLineNo">241</span> {<a name="line.241"></a> +<span class="sourceLineNo">242</span> return Collections.unmodifiableList(requiredOpts);<a name="line.242"></a> +<span class="sourceLineNo">243</span> }<a name="line.243"></a> <span class="sourceLineNo">244</span><a name="line.244"></a> -<span class="sourceLineNo">245</span> for (String longOpt : longOpts.keySet())<a name="line.245"></a> -<span class="sourceLineNo">246</span> {<a name="line.246"></a> -<span class="sourceLineNo">247</span> if (longOpt.startsWith(opt))<a name="line.247"></a> -<span class="sourceLineNo">248</span> {<a name="line.248"></a> -<span class="sourceLineNo">249</span> matchingOpts.add(longOpt);<a name="line.249"></a> -<span class="sourceLineNo">250</span> }<a name="line.250"></a> -<span class="sourceLineNo">251</span> }<a name="line.251"></a> -<span class="sourceLineNo">252</span> <a name="line.252"></a> -<span class="sourceLineNo">253</span> return matchingOpts;<a name="line.253"></a> -<span class="sourceLineNo">254</span> }<a name="line.254"></a> -<span class="sourceLineNo">255</span><a name="line.255"></a> -<span class="sourceLineNo">256</span> /**<a name="line.256"></a> -<span class="sourceLineNo">257</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.257"></a> -<span class="sourceLineNo">258</span> *<a name="line.258"></a> -<span class="sourceLineNo">259</span> * @param opt short or long name of the {@link Option}<a name="line.259"></a> -<span class="sourceLineNo">260</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.260"></a> -<span class="sourceLineNo">261</span> */<a name="line.261"></a> -<span class="sourceLineNo">262</span> public boolean hasOption(String opt)<a name="line.262"></a> -<span class="sourceLineNo">263</span> {<a name="line.263"></a> -<span class="sourceLineNo">264</span> opt = Util.stripLeadingHyphens(opt);<a name="line.264"></a> -<span class="sourceLineNo">265</span><a name="line.265"></a> -<span class="sourceLineNo">266</span> return shortOpts.containsKey(opt) || longOpts.containsKey(opt);<a name="line.266"></a> -<span class="sourceLineNo">267</span> }<a name="line.267"></a> -<span class="sourceLineNo">268</span><a name="line.268"></a> -<span class="sourceLineNo">269</span> /**<a name="line.269"></a> -<span class="sourceLineNo">270</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.270"></a> -<span class="sourceLineNo">271</span> *<a name="line.271"></a> -<span class="sourceLineNo">272</span> * @param opt long name of the {@link Option}<a name="line.272"></a> -<span class="sourceLineNo">273</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.273"></a> -<span class="sourceLineNo">274</span> * @since 1.3<a name="line.274"></a> -<span class="sourceLineNo">275</span> */<a name="line.275"></a> -<span class="sourceLineNo">276</span> public boolean hasLongOption(String opt)<a name="line.276"></a> -<span class="sourceLineNo">277</span> {<a name="line.277"></a> -<span class="sourceLineNo">278</span> opt = Util.stripLeadingHyphens(opt);<a name="line.278"></a> +<span class="sourceLineNo">245</span> /**<a name="line.245"></a> +<span class="sourceLineNo">246</span> * Retrieve the {@link Option} matching the long or short name specified.<a name="line.246"></a> +<span class="sourceLineNo">247</span> *<a name="line.247"></a> +<span class="sourceLineNo">248</span> * <p><a name="line.248"></a> +<span class="sourceLineNo">249</span> * The leading hyphens in the name are ignored (up to 2).<a name="line.249"></a> +<span class="sourceLineNo">250</span> * </p><a name="line.250"></a> +<span class="sourceLineNo">251</span> *<a name="line.251"></a> +<span class="sourceLineNo">252</span> * @param opt short or long name of the {@link Option}<a name="line.252"></a> +<span class="sourceLineNo">253</span> * @return the option represented by opt<a name="line.253"></a> +<span class="sourceLineNo">254</span> */<a name="line.254"></a> +<span class="sourceLineNo">255</span> public Option getOption(String opt)<a name="line.255"></a> +<span class="sourceLineNo">256</span> {<a name="line.256"></a> +<span class="sourceLineNo">257</span> opt = Util.stripLeadingHyphens(opt);<a name="line.257"></a> +<span class="sourceLineNo">258</span><a name="line.258"></a> +<span class="sourceLineNo">259</span> if (shortOpts.containsKey(opt))<a name="line.259"></a> +<span class="sourceLineNo">260</span> {<a name="line.260"></a> +<span class="sourceLineNo">261</span> return shortOpts.get(opt);<a name="line.261"></a> +<span class="sourceLineNo">262</span> }<a name="line.262"></a> +<span class="sourceLineNo">263</span><a name="line.263"></a> +<span class="sourceLineNo">264</span> return longOpts.get(opt);<a name="line.264"></a> +<span class="sourceLineNo">265</span> }<a name="line.265"></a> +<span class="sourceLineNo">266</span><a name="line.266"></a> +<span class="sourceLineNo">267</span> /**<a name="line.267"></a> +<span class="sourceLineNo">268</span> * Returns the options with a long name starting with the name specified.<a name="line.268"></a> +<span class="sourceLineNo">269</span> * <a name="line.269"></a> +<span class="sourceLineNo">270</span> * @param opt the partial name of the option<a name="line.270"></a> +<span class="sourceLineNo">271</span> * @return the options matching the partial name specified, or an empty list if none matches<a name="line.271"></a> +<span class="sourceLineNo">272</span> * @since 1.3<a name="line.272"></a> +<span class="sourceLineNo">273</span> */<a name="line.273"></a> +<span class="sourceLineNo">274</span> public List<String> getMatchingOptions(String opt)<a name="line.274"></a> +<span class="sourceLineNo">275</span> {<a name="line.275"></a> +<span class="sourceLineNo">276</span> opt = Util.stripLeadingHyphens(opt);<a name="line.276"></a> +<span class="sourceLineNo">277</span> <a name="line.277"></a> +<span class="sourceLineNo">278</span> List<String> matchingOpts = new ArrayList<String>();<a name="line.278"></a> <span class="sourceLineNo">279</span><a name="line.279"></a> -<span class="sourceLineNo">280</span> return longOpts.containsKey(opt);<a name="line.280"></a> -<span class="sourceLineNo">281</span> }<a name="line.281"></a> -<span class="sourceLineNo">282</span><a name="line.282"></a> -<span class="sourceLineNo">283</span> /**<a name="line.283"></a> -<span class="sourceLineNo">284</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.284"></a> -<span class="sourceLineNo">285</span> *<a name="line.285"></a> -<span class="sourceLineNo">286</span> * @param opt short name of the {@link Option}<a name="line.286"></a> -<span class="sourceLineNo">287</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.287"></a> -<span class="sourceLineNo">288</span> * @since 1.3<a name="line.288"></a> -<span class="sourceLineNo">289</span> */<a name="line.289"></a> -<span class="sourceLineNo">290</span> public boolean hasShortOption(String opt)<a name="line.290"></a> -<span class="sourceLineNo">291</span> {<a name="line.291"></a> -<span class="sourceLineNo">292</span> opt = Util.stripLeadingHyphens(opt);<a name="line.292"></a> -<span class="sourceLineNo">293</span><a name="line.293"></a> -<span class="sourceLineNo">294</span> return shortOpts.containsKey(opt);<a name="line.294"></a> +<span class="sourceLineNo">280</span> // for a perfect match return the single option only<a name="line.280"></a> +<span class="sourceLineNo">281</span> if (longOpts.keySet().contains(opt))<a name="line.281"></a> +<span class="sourceLineNo">282</span> {<a name="line.282"></a> +<span class="sourceLineNo">283</span> return Collections.singletonList(opt);<a name="line.283"></a> +<span class="sourceLineNo">284</span> }<a name="line.284"></a> +<span class="sourceLineNo">285</span><a name="line.285"></a> +<span class="sourceLineNo">286</span> for (String longOpt : longOpts.keySet())<a name="line.286"></a> +<span class="sourceLineNo">287</span> {<a name="line.287"></a> +<span class="sourceLineNo">288</span> if (longOpt.startsWith(opt))<a name="line.288"></a> +<span class="sourceLineNo">289</span> {<a name="line.289"></a> +<span class="sourceLineNo">290</span> matchingOpts.add(longOpt);<a name="line.290"></a> +<span class="sourceLineNo">291</span> }<a name="line.291"></a> +<span class="sourceLineNo">292</span> }<a name="line.292"></a> +<span class="sourceLineNo">293</span> <a name="line.293"></a> +<span class="sourceLineNo">294</span> return matchingOpts;<a name="line.294"></a> <span class="sourceLineNo">295</span> }<a name="line.295"></a> <span class="sourceLineNo">296</span><a name="line.296"></a> <span class="sourceLineNo">297</span> /**<a name="line.297"></a> -<span class="sourceLineNo">298</span> * Returns the OptionGroup the <code>opt</code> belongs to.<a name="line.298"></a> -<span class="sourceLineNo">299</span> * @param opt the option whose OptionGroup is being queried.<a name="line.299"></a> -<span class="sourceLineNo">300</span> *<a name="line.300"></a> -<span class="sourceLineNo">301</span> * @return the OptionGroup if <code>opt</code> is part<a name="line.301"></a> -<span class="sourceLineNo">302</span> * of an OptionGroup, otherwise return null<a name="line.302"></a> -<span class="sourceLineNo">303</span> */<a name="line.303"></a> -<span class="sourceLineNo">304</span> public OptionGroup getOptionGroup(Option opt)<a name="line.304"></a> -<span class="sourceLineNo">305</span> {<a name="line.305"></a> -<span class="sourceLineNo">306</span> return optionGroups.get(opt.getKey());<a name="line.306"></a> -<span class="sourceLineNo">307</span> }<a name="line.307"></a> -<span class="sourceLineNo">308</span><a name="line.308"></a> -<span class="sourceLineNo">309</span> /**<a name="line.309"></a> -<span class="sourceLineNo">310</span> * Dump state, suitable for debugging.<a name="line.310"></a> -<span class="sourceLineNo">311</span> *<a name="line.311"></a> -<span class="sourceLineNo">312</span> * @return Stringified form of this object<a name="line.312"></a> -<span class="sourceLineNo">313</span> */<a name="line.313"></a> -<span class="sourceLineNo">314</span> @Override<a name="line.314"></a> -<span class="sourceLineNo">315</span> public String toString()<a name="line.315"></a> -<span class="sourceLineNo">316</span> {<a name="line.316"></a> -<span class="sourceLineNo">317</span> StringBuilder buf = new StringBuilder();<a name="line.317"></a> -<span class="sourceLineNo">318</span><a name="line.318"></a> -<span class="sourceLineNo">319</span> buf.append("[ Options: [ short ");<a name="line.319"></a> -<span class="sourceLineNo">320</span> buf.append(shortOpts.toString());<a name="line.320"></a> -<span class="sourceLineNo">321</span> buf.append(" ] [ long ");<a name="line.321"></a> -<span class="sourceLineNo">322</span> buf.append(longOpts);<a name="line.322"></a> -<span class="sourceLineNo">323</span> buf.append(" ]");<a name="line.323"></a> -<span class="sourceLineNo">324</span><a name="line.324"></a> -<span class="sourceLineNo">325</span> return buf.toString();<a name="line.325"></a> -<span class="sourceLineNo">326</span> }<a name="line.326"></a> -<span class="sourceLineNo">327</span>}<a name="line.327"></a> +<span class="sourceLineNo">298</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.298"></a> +<span class="sourceLineNo">299</span> *<a name="line.299"></a> +<span class="sourceLineNo">300</span> * @param opt short or long name of the {@link Option}<a name="line.300"></a> +<span class="sourceLineNo">301</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.301"></a> +<span class="sourceLineNo">302</span> */<a name="line.302"></a> +<span class="sourceLineNo">303</span> public boolean hasOption(String opt)<a name="line.303"></a> +<span class="sourceLineNo">304</span> {<a name="line.304"></a> +<span class="sourceLineNo">305</span> opt = Util.stripLeadingHyphens(opt);<a name="line.305"></a> +<span class="sourceLineNo">306</span><a name="line.306"></a> +<span class="sourceLineNo">307</span> return shortOpts.containsKey(opt) || longOpts.containsKey(opt);<a name="line.307"></a> +<span class="sourceLineNo">308</span> }<a name="line.308"></a> +<span class="sourceLineNo">309</span><a name="line.309"></a> +<span class="sourceLineNo">310</span> /**<a name="line.310"></a> +<span class="sourceLineNo">311</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.311"></a> +<span class="sourceLineNo">312</span> *<a name="line.312"></a> +<span class="sourceLineNo">313</span> * @param opt long name of the {@link Option}<a name="line.313"></a> +<span class="sourceLineNo">314</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.314"></a> +<span class="sourceLineNo">315</span> * @since 1.3<a name="line.315"></a> +<span class="sourceLineNo">316</span> */<a name="line.316"></a> +<span class="sourceLineNo">317</span> public boolean hasLongOption(String opt)<a name="line.317"></a> +<span class="sourceLineNo">318</span> {<a name="line.318"></a> +<span class="sourceLineNo">319</span> opt = Util.stripLeadingHyphens(opt);<a name="line.319"></a> +<span class="sourceLineNo">320</span><a name="line.320"></a> +<span class="sourceLineNo">321</span> return longOpts.containsKey(opt);<a name="line.321"></a> +<span class="sourceLineNo">322</span> }<a name="line.322"></a> +<span class="sourceLineNo">323</span><a name="line.323"></a> +<span class="sourceLineNo">324</span> /**<a name="line.324"></a> +<span class="sourceLineNo">325</span> * Returns whether the named {@link Option} is a member of this {@link Options}.<a name="line.325"></a> +<span class="sourceLineNo">326</span> *<a name="line.326"></a> +<span class="sourceLineNo">327</span> * @param opt short name of the {@link Option}<a name="line.327"></a> +<span class="sourceLineNo">328</span> * @return true if the named {@link Option} is a member of this {@link Options}<a name="line.328"></a> +<span class="sourceLineNo">329</span> * @since 1.3<a name="line.329"></a> +<span class="sourceLineNo">330</span> */<a name="line.330"></a> +<span class="sourceLineNo">331</span> public boolean hasShortOption(String opt)<a name="line.331"></a> +<span class="sourceLineNo">332</span> {<a name="line.332"></a> +<span class="sourceLineNo">333</span> opt = Util.stripLeadingHyphens(opt);<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span> return shortOpts.containsKey(opt);<a name="line.335"></a> +<span class="sourceLineNo">336</span> }<a name="line.336"></a> +<span class="sourceLineNo">337</span><a name="line.337"></a> +<span class="sourceLineNo">338</span> /**<a name="line.338"></a> +<span class="sourceLineNo">339</span> * Returns the OptionGroup the <code>opt</code> belongs to.<a name="line.339"></a> +<span class="sourceLineNo">340</span> *<a name="line.340"></a> +<span class="sourceLineNo">341</span> * @param opt the option whose OptionGroup is being queried.<a name="line.341"></a> +<span class="sourceLineNo">342</span> * @return the OptionGroup if <code>opt</code> is part of an OptionGroup, otherwise return null<a name="line.342"></a> +<span class="sourceLineNo">343</span> */<a name="line.343"></a> +<span class="sourceLineNo">344</span> public OptionGroup getOptionGroup(Option opt)<a name="line.344"></a> +<span class="sourceLineNo">345</span> {<a name="line.345"></a> +<span class="sourceLineNo">346</span> return optionGroups.get(opt.getKey());<a name="line.346"></a> +<span class="sourceLineNo">347</span> }<a name="line.347"></a> +<span class="sourceLineNo">348</span><a name="line.348"></a> +<span class="sourceLineNo">349</span> /**<a name="line.349"></a> +<span class="sourceLineNo">350</span> * Dump state, suitable for debugging.<a name="line.350"></a> +<span class="sourceLineNo">351</span> *<a name="line.351"></a> +<span class="sourceLineNo">352</span> * @return Stringified form of this object<a name="line.352"></a> +<span class="sourceLineNo">353</span> */<a name="line.353"></a> +<span class="sourceLineNo">354</span> @Override<a name="line.354"></a> +<span class="sourceLineNo">355</span> public String toString()<a name="line.355"></a> +<span class="sourceLineNo">356</span> {<a name="line.356"></a> +<span class="sourceLineNo">357</span> StringBuilder buf = new StringBuilder();<a name="line.357"></a> +<span class="sourceLineNo">358</span><a name="line.358"></a> +<span class="sourceLineNo">359</span> buf.append("[ Options: [ short ");<a name="line.359"></a> +<span class="sourceLineNo">360</span> buf.append(shortOpts.toString());<a name="line.360"></a> +<span class="sourceLineNo">361</span> buf.append(" ] [ long ");<a name="line.361"></a> +<span class="sourceLineNo">362</span> buf.append(longOpts);<a name="line.362"></a> +<span class="sourceLineNo">363</span> buf.append(" ]");<a name="line.363"></a> +<span class="sourceLineNo">364</span><a name="line.364"></a> +<span class="sourceLineNo">365</span> return buf.toString();<a name="line.365"></a> +<span class="sourceLineNo">366</span> }<a name="line.366"></a> +<span class="sourceLineNo">367</span>}<a name="line.367"></a> @@ -396,4 +436,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/ParseException.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/ParseException.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/ParseException.html Mon Mar 13 09:49:52 2017 @@ -111,4 +111,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Parser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Parser.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/Parser.html Mon Mar 13 09:49:52 2017 @@ -35,7 +35,7 @@ <span class="sourceLineNo">027</span>/**<a name="line.27"></a> <span class="sourceLineNo">028</span> * <code>Parser</code> creates {@link CommandLine}s.<a name="line.28"></a> <span class="sourceLineNo">029</span> *<a name="line.29"></a> -<span class="sourceLineNo">030</span> * @version $Id: Parser.java 1677406 2015-05-03 14:27:31Z britter $<a name="line.30"></a> +<span class="sourceLineNo">030</span> * @version $Id: Parser.java 1744812 2016-05-20 23:36:20Z ggregory $<a name="line.30"></a> <span class="sourceLineNo">031</span> * @deprecated since 1.3, the two-pass parsing with the flatten method is not enough flexible to handle complex cases<a name="line.31"></a> <span class="sourceLineNo">032</span> */<a name="line.32"></a> <span class="sourceLineNo">033</span>@Deprecated<a name="line.33"></a> @@ -385,7 +385,7 @@ <span class="sourceLineNo">377</span> {<a name="line.377"></a> <span class="sourceLineNo">378</span> boolean hasOption = getOptions().hasOption(arg);<a name="line.378"></a> <span class="sourceLineNo">379</span><a name="line.379"></a> -<span class="sourceLineNo">380</span> // if there is no option throw an UnrecognisedOptionException<a name="line.380"></a> +<span class="sourceLineNo">380</span> // if there is no option throw an UnrecognizedOptionException<a name="line.380"></a> <span class="sourceLineNo">381</span> if (!hasOption)<a name="line.381"></a> <span class="sourceLineNo">382</span> {<a name="line.382"></a> <span class="sourceLineNo">383</span> throw new UnrecognizedOptionException("Unrecognized option: " + arg, arg);<a name="line.383"></a> @@ -499,4 +499,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PatternOptionBuilder.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PatternOptionBuilder.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PatternOptionBuilder.html Mon Mar 13 09:49:52 2017 @@ -276,4 +276,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PosixParser.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PosixParser.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/PosixParser.html Mon Mar 13 09:49:52 2017 @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> * The class PosixParser provides an implementation of the<a name="line.26"></a> <span class="sourceLineNo">027</span> * {@link Parser#flatten(Options,String[],boolean) flatten} method.<a name="line.27"></a> <span class="sourceLineNo">028</span> *<a name="line.28"></a> -<span class="sourceLineNo">029</span> * @version $Id: PosixParser.java 1677451 2015-05-03 17:09:29Z ggregory $<a name="line.29"></a> +<span class="sourceLineNo">029</span> * @version $Id: PosixParser.java 1783175 2017-02-16 07:52:05Z britter $<a name="line.29"></a> <span class="sourceLineNo">030</span> * @deprecated since 1.3, use the {@link DefaultParser} instead<a name="line.30"></a> <span class="sourceLineNo">031</span> */<a name="line.31"></a> <span class="sourceLineNo">032</span>@Deprecated<a name="line.32"></a> @@ -249,7 +249,7 @@ <span class="sourceLineNo">241</span> *<a name="line.241"></a> <span class="sourceLineNo">242</span> * <ul><a name="line.242"></a> <span class="sourceLineNo">243</span> * <li>ignore the first character ("<b>-</b>")</li><a name="line.243"></a> -<span class="sourceLineNo">244</span> * <li>foreach remaining character check if an {@link Option}<a name="line.244"></a> +<span class="sourceLineNo">244</span> * <li>for each remaining character check if an {@link Option}<a name="line.244"></a> <span class="sourceLineNo">245</span> * exists with that id.</li><a name="line.245"></a> <span class="sourceLineNo">246</span> * <li>if an {@link Option} does exist then add that character<a name="line.246"></a> <span class="sourceLineNo">247</span> * prepended with "<b>-</b>" to the list of processed tokens.</li><a name="line.247"></a> @@ -363,4 +363,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/TypeHandler.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/TypeHandler.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/TypeHandler.html Mon Mar 13 09:49:52 2017 @@ -310,4 +310,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/UnrecognizedOptionException.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/UnrecognizedOptionException.html (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/src-html/org/apache/commons/cli/UnrecognizedOptionException.html Mon Mar 13 09:49:52 2017 @@ -140,4 +140,4 @@ </pre> </div> </body> -</html> +</html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-cli/apidocs/stylesheet.css ============================================================================== --- websites/production/commons/content/proper/commons-cli/apidocs/stylesheet.css (original) +++ websites/production/commons/content/proper/commons-cli/apidocs/stylesheet.css Mon Mar 13 09:49:52 2017 @@ -463,7 +463,6 @@ Table styles .useSummary td, .constantsSummary td, .deprecatedSummary td { text-align:left; padding:0px 0px 12px 10px; - width:100%; } th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ @@ -488,6 +487,7 @@ td.colOne, th.colOne { font-size:13px; } .overviewSummary td.colFirst, .overviewSummary th.colFirst, +.useSummary td.colFirst, .useSummary th.colFirst, .overviewSummary td.colOne, .overviewSummary th.colOne, .memberSummary td.colFirst, .memberSummary th.colFirst, .memberSummary td.colOne, .memberSummary th.colOne, @@ -571,4 +571,4 @@ div.block div.block span.interfaceName { div.contentContainer ul.blockList li.blockList h2{ padding-bottom:0px; -} +} \ No newline at end of file