Modified: websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/HelpFormatterTest.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/HelpFormatterTest.html (original) +++ websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/HelpFormatterTest.html Thu Jun 8 17:47:18 2017 @@ -45,7 +45,7 @@ <a class="jxr_linenumber" name="L37" href="#L37">37</a> @Test <a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFindWrapPos() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L39" href="#L39">39</a> { -<a class="jxr_linenumber" name="L40" href="#L40">40</a> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">final</strong> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L41" href="#L41">41</a> <a class="jxr_linenumber" name="L42" href="#L42">42</a> String text = <span class="jxr_string">"This is a test."</span>; <a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_comment">// text width should be max 8; the wrap position is 7</em> @@ -73,13 +73,13 @@ <a class="jxr_linenumber" name="L65" href="#L65">65</a> @Test <a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextWordCut() <a class="jxr_linenumber" name="L67" href="#L67">67</a> { -<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">int</strong> width = 7; -<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">int</strong> padding = 0; -<a class="jxr_linenumber" name="L70" href="#L70">70</a> String text = <span class="jxr_string">"Thisisatest."</span>; -<a class="jxr_linenumber" name="L71" href="#L71">71</a> String expected = <span class="jxr_string">"Thisisa"</span> + EOL + +<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 7; +<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 0; +<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">final</strong> String text = <span class="jxr_string">"Thisisatest."</span>; +<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">"Thisisa"</span> + EOL + <a class="jxr_linenumber" name="L72" href="#L72">72</a> <span class="jxr_string">"test."</span>; <a class="jxr_linenumber" name="L73" href="#L73">73</a> -<a class="jxr_linenumber" name="L74" href="#L74">74</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, text); <a class="jxr_linenumber" name="L76" href="#L76">76</a> assertEquals(<span class="jxr_string">"cut and wrap"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L77" href="#L77">77</a> } @@ -88,13 +88,13 @@ <a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextSingleLine() <a class="jxr_linenumber" name="L81" href="#L81">81</a> { <a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_comment">// single line text</em> -<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">int</strong> width = 12; -<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">int</strong> padding = 0; -<a class="jxr_linenumber" name="L85" href="#L85">85</a> String text = <span class="jxr_string">"This is a test."</span>; -<a class="jxr_linenumber" name="L86" href="#L86">86</a> String expected = <span class="jxr_string">"This is a"</span> + EOL + +<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 12; +<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 0; +<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">final</strong> String text = <span class="jxr_string">"This is a test."</span>; +<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">"This is a"</span> + EOL + <a class="jxr_linenumber" name="L87" href="#L87">87</a> <span class="jxr_string">"test."</span>; <a class="jxr_linenumber" name="L88" href="#L88">88</a> -<a class="jxr_linenumber" name="L89" href="#L89">89</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, text); <a class="jxr_linenumber" name="L91" href="#L91">91</a> assertEquals(<span class="jxr_string">"single line text"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L92" href="#L92">92</a> } @@ -103,13 +103,13 @@ <a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextSingleLinePadded() <a class="jxr_linenumber" name="L96" href="#L96">96</a> { <a class="jxr_linenumber" name="L97" href="#L97">97</a> <em class="jxr_comment">// single line padded text</em> -<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">int</strong> width = 12; -<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">int</strong> padding = 4; -<a class="jxr_linenumber" name="L100" href="#L100">100</a> String text = <span class="jxr_string">"This is a test."</span>; -<a class="jxr_linenumber" name="L101" href="#L101">101</a> String expected = <span class="jxr_string">"This is a"</span> + EOL + +<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 12; +<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 4; +<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">final</strong> String text = <span class="jxr_string">"This is a test."</span>; +<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">"This is a"</span> + EOL + <a class="jxr_linenumber" name="L102" href="#L102">102</a> <span class="jxr_string">" test."</span>; <a class="jxr_linenumber" name="L103" href="#L103">103</a> -<a class="jxr_linenumber" name="L104" href="#L104">104</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, text); <a class="jxr_linenumber" name="L106" href="#L106">106</a> assertEquals(<span class="jxr_string">"single line padded text"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L107" href="#L107">107</a> } @@ -118,15 +118,15 @@ <a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextSingleLinePadded2() <a class="jxr_linenumber" name="L111" href="#L111">111</a> { <a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_comment">// single line padded text 2</em> -<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">int</strong> width = 53; -<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">int</strong> padding = 24; -<a class="jxr_linenumber" name="L115" href="#L115">115</a> String text = <span class="jxr_string">" -p,--period <PERIOD> PERIOD is time duration of form "</span> + +<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 53; +<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 24; +<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">final</strong> String text = <span class="jxr_string">" -p,--period <PERIOD> PERIOD is time duration of form "</span> + <a class="jxr_linenumber" name="L116" href="#L116">116</a> <span class="jxr_string">"DATE[-DATE] where DATE has form YYYY[MM[DD]]"</span>; -<a class="jxr_linenumber" name="L117" href="#L117">117</a> String expected = <span class="jxr_string">" -p,--period <PERIOD> PERIOD is time duration of"</span> + EOL + +<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">" -p,--period <PERIOD> PERIOD is time duration of"</span> + EOL + <a class="jxr_linenumber" name="L118" href="#L118">118</a> <span class="jxr_string">" form DATE[-DATE] where DATE"</span> + EOL + <a class="jxr_linenumber" name="L119" href="#L119">119</a> <span class="jxr_string">" has form YYYY[MM[DD]]"</span>; <a class="jxr_linenumber" name="L120" href="#L120">120</a> -<a class="jxr_linenumber" name="L121" href="#L121">121</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, text); <a class="jxr_linenumber" name="L123" href="#L123">123</a> assertEquals(<span class="jxr_string">"single line padded text 2"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L124" href="#L124">124</a> } @@ -135,13 +135,13 @@ <a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextMultiLine() <a class="jxr_linenumber" name="L128" href="#L128">128</a> { <a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_comment">// multi line text</em> -<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">int</strong> width = 16; -<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">int</strong> padding = 0; -<a class="jxr_linenumber" name="L132" href="#L132">132</a> String expected = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + +<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 16; +<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 0; +<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + <a class="jxr_linenumber" name="L133" href="#L133">133</a> <span class="jxr_string">"aaaaaa"</span> + EOL + <a class="jxr_linenumber" name="L134" href="#L134">134</a> <span class="jxr_string">"aaaaa"</span>; <a class="jxr_linenumber" name="L135" href="#L135">135</a> -<a class="jxr_linenumber" name="L136" href="#L136">136</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, expected); <a class="jxr_linenumber" name="L138" href="#L138">138</a> assertEquals(<span class="jxr_string">"multi line text"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L139" href="#L139">139</a> } @@ -150,16 +150,16 @@ <a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRenderWrappedTextMultiLinePadded() <a class="jxr_linenumber" name="L143" href="#L143">143</a> { <a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_comment">// multi-line padded text</em> -<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">int</strong> width = 16; -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">int</strong> padding = 4; -<a class="jxr_linenumber" name="L147" href="#L147">147</a> String text = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + +<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = 16; +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> padding = 4; +<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">final</strong> String text = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + <a class="jxr_linenumber" name="L148" href="#L148">148</a> <span class="jxr_string">"aaaaaa"</span> + EOL + <a class="jxr_linenumber" name="L149" href="#L149">149</a> <span class="jxr_string">"aaaaa"</span>; -<a class="jxr_linenumber" name="L150" href="#L150">150</a> String expected = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + +<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">final</strong> String expected = <span class="jxr_string">"aaaa aaaa aaaa"</span> + EOL + <a class="jxr_linenumber" name="L151" href="#L151">151</a> <span class="jxr_string">" aaaaaa"</span> + EOL + <a class="jxr_linenumber" name="L152" href="#L152">152</a> <span class="jxr_string">" aaaaa"</span>; <a class="jxr_linenumber" name="L153" href="#L153">153</a> -<a class="jxr_linenumber" name="L154" href="#L154">154</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); <a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">new</strong> HelpFormatter().renderWrappedText(sb, width, padding, text); <a class="jxr_linenumber" name="L156" href="#L156">156</a> assertEquals(<span class="jxr_string">"multi-line padded text"</span>, expected, sb.toString()); <a class="jxr_linenumber" name="L157" href="#L157">157</a> } @@ -167,8 +167,8 @@ <a class="jxr_linenumber" name="L159" href="#L159">159</a> @Test <a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintOptions() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L161" href="#L161">161</a> { -<a class="jxr_linenumber" name="L162" href="#L162">162</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); -<a class="jxr_linenumber" name="L163" href="#L163">163</a> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">final</strong> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">final</strong> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> leftPad = 1; <a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> descPad = 3; <a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">final</strong> String lpad = hf.createPadding(leftPad); @@ -217,13 +217,13 @@ <a class="jxr_linenumber" name="L209" href="#L209">209</a> @Test <a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintHelpWithEmptySyntax() <a class="jxr_linenumber" name="L211" href="#L211">211</a> { -<a class="jxr_linenumber" name="L212" href="#L212">212</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L212" href="#L212">212</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">try</strong> <a class="jxr_linenumber" name="L214" href="#L214">214</a> { <a class="jxr_linenumber" name="L215" href="#L215">215</a> formatter.printHelp(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> Options()); <a class="jxr_linenumber" name="L216" href="#L216">216</a> fail(<span class="jxr_string">"null command line syntax should be rejected"</span>); <a class="jxr_linenumber" name="L217" href="#L217">217</a> } -<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) +<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) <a class="jxr_linenumber" name="L219" href="#L219">219</a> { <a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_comment">// expected</em> <a class="jxr_linenumber" name="L221" href="#L221">221</a> } @@ -233,7 +233,7 @@ <a class="jxr_linenumber" name="L225" href="#L225">225</a> formatter.printHelp(<span class="jxr_string">""</span>, <strong class="jxr_keyword">new</strong> Options()); <a class="jxr_linenumber" name="L226" href="#L226">226</a> fail(<span class="jxr_string">"empty command line syntax should be rejected"</span>); <a class="jxr_linenumber" name="L227" href="#L227">227</a> } -<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) +<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) <a class="jxr_linenumber" name="L229" href="#L229">229</a> { <a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_comment">// expected</em> <a class="jxr_linenumber" name="L231" href="#L231">231</a> } @@ -242,11 +242,11 @@ <a class="jxr_linenumber" name="L234" href="#L234">234</a> @Test <a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAutomaticUsage() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L236" href="#L236">236</a> { -<a class="jxr_linenumber" name="L237" href="#L237">237</a> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">final</strong> HelpFormatter hf = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L238" href="#L238">238</a> Options options = <strong class="jxr_keyword">null</strong>; <a class="jxr_linenumber" name="L239" href="#L239">239</a> String expected = <span class="jxr_string">"usage: app [-a]"</span>; -<a class="jxr_linenumber" name="L240" href="#L240">240</a> ByteArrayOutputStream out = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); -<a class="jxr_linenumber" name="L241" href="#L241">241</a> PrintWriter pw = <strong class="jxr_keyword">new</strong> PrintWriter(out); +<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream out = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); +<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">final</strong> PrintWriter pw = <strong class="jxr_keyword">new</strong> PrintWriter(out); <a class="jxr_linenumber" name="L242" href="#L242">242</a> <a class="jxr_linenumber" name="L243" href="#L243">243</a> options = <strong class="jxr_keyword">new</strong> Options().addOption(<span class="jxr_string">"a"</span>, false, <span class="jxr_string">"aaaa aaaa aaaa aaaa aaaa"</span>); <a class="jxr_linenumber" name="L244" href="#L244">244</a> hf.printUsage(pw, 60, <span class="jxr_string">"app"</span>, options); @@ -268,16 +268,16 @@ <a class="jxr_linenumber" name="L260" href="#L260">260</a> @Test <a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintUsage() <a class="jxr_linenumber" name="L262" href="#L262">262</a> { -<a class="jxr_linenumber" name="L263" href="#L263">263</a> Option optionA = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"a"</span>, <span class="jxr_string">"first"</span>); -<a class="jxr_linenumber" name="L264" href="#L264">264</a> Option optionB = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"b"</span>, <span class="jxr_string">"second"</span>); -<a class="jxr_linenumber" name="L265" href="#L265">265</a> Option optionC = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"c"</span>, <span class="jxr_string">"third"</span>); -<a class="jxr_linenumber" name="L266" href="#L266">266</a> Options opts = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">final</strong> Option optionA = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"a"</span>, <span class="jxr_string">"first"</span>); +<a class="jxr_linenumber" name="L264" href="#L264">264</a> <strong class="jxr_keyword">final</strong> Option optionB = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"b"</span>, <span class="jxr_string">"second"</span>); +<a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">final</strong> Option optionC = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"c"</span>, <span class="jxr_string">"third"</span>); +<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong class="jxr_keyword">final</strong> Options opts = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L267" href="#L267">267</a> opts.addOption(optionA); <a class="jxr_linenumber" name="L268" href="#L268">268</a> opts.addOption(optionB); <a class="jxr_linenumber" name="L269" href="#L269">269</a> opts.addOption(optionC); -<a class="jxr_linenumber" name="L270" href="#L270">270</a> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); -<a class="jxr_linenumber" name="L271" href="#L271">271</a> ByteArrayOutputStream bytesOut = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); -<a class="jxr_linenumber" name="L272" href="#L272">272</a> PrintWriter printWriter = <strong class="jxr_keyword">new</strong> PrintWriter(bytesOut); +<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">final</strong> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream bytesOut = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); +<a class="jxr_linenumber" name="L272" href="#L272">272</a> <strong class="jxr_keyword">final</strong> PrintWriter printWriter = <strong class="jxr_keyword">new</strong> PrintWriter(bytesOut); <a class="jxr_linenumber" name="L273" href="#L273">273</a> helpFormatter.printUsage(printWriter, 80, <span class="jxr_string">"app"</span>, opts); <a class="jxr_linenumber" name="L274" href="#L274">274</a> printWriter.close(); <a class="jxr_linenumber" name="L275" href="#L275">275</a> assertEquals(<span class="jxr_string">"usage: app [-a] [-b] [-c]"</span> + EOL, bytesOut.toString()); @@ -287,22 +287,22 @@ <a class="jxr_linenumber" name="L279" href="#L279">279</a> @Test <a class="jxr_linenumber" name="L280" href="#L280">280</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintSortedUsage() <a class="jxr_linenumber" name="L281" href="#L281">281</a> { -<a class="jxr_linenumber" name="L282" href="#L282">282</a> Options opts = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong class="jxr_keyword">final</strong> Options opts = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L283" href="#L283">283</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"a"</span>, <span class="jxr_string">"first"</span>)); <a class="jxr_linenumber" name="L284" href="#L284">284</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"b"</span>, <span class="jxr_string">"second"</span>)); <a class="jxr_linenumber" name="L285" href="#L285">285</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"c"</span>, <span class="jxr_string">"third"</span>)); <a class="jxr_linenumber" name="L286" href="#L286">286</a> -<a class="jxr_linenumber" name="L287" href="#L287">287</a> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong class="jxr_keyword">final</strong> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L288" href="#L288">288</a> helpFormatter.setOptionComparator(<strong class="jxr_keyword">new</strong> Comparator<Option>() <a class="jxr_linenumber" name="L289" href="#L289">289</a> { -<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compare(Option opt1, Option opt2) +<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compare(<strong class="jxr_keyword">final</strong> Option opt1, <strong class="jxr_keyword">final</strong> Option opt2) <a class="jxr_linenumber" name="L291" href="#L291">291</a> { <a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_comment">// reverses the functionality of the default comparator</em> <a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong class="jxr_keyword">return</strong> opt2.getKey().compareToIgnoreCase(opt1.getKey()); <a class="jxr_linenumber" name="L294" href="#L294">294</a> } <a class="jxr_linenumber" name="L295" href="#L295">295</a> }); <a class="jxr_linenumber" name="L296" href="#L296">296</a> -<a class="jxr_linenumber" name="L297" href="#L297">297</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L298" href="#L298">298</a> helpFormatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, opts); <a class="jxr_linenumber" name="L299" href="#L299">299</a> <a class="jxr_linenumber" name="L300" href="#L300">300</a> assertEquals(<span class="jxr_string">"usage: app [-c] [-b] [-a]"</span> + EOL, out.toString()); @@ -311,15 +311,15 @@ <a class="jxr_linenumber" name="L303" href="#L303">303</a> @Test <a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintSortedUsageWithNullComparator() <a class="jxr_linenumber" name="L305" href="#L305">305</a> { -<a class="jxr_linenumber" name="L306" href="#L306">306</a> Options opts = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L306" href="#L306">306</a> <strong class="jxr_keyword">final</strong> Options opts = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L307" href="#L307">307</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"c"</span>, <span class="jxr_string">"first"</span>)); <a class="jxr_linenumber" name="L308" href="#L308">308</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"b"</span>, <span class="jxr_string">"second"</span>)); <a class="jxr_linenumber" name="L309" href="#L309">309</a> opts.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"a"</span>, <span class="jxr_string">"third"</span>)); <a class="jxr_linenumber" name="L310" href="#L310">310</a> -<a class="jxr_linenumber" name="L311" href="#L311">311</a> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong class="jxr_keyword">final</strong> HelpFormatter helpFormatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L312" href="#L312">312</a> helpFormatter.setOptionComparator(<strong class="jxr_keyword">null</strong>); <a class="jxr_linenumber" name="L313" href="#L313">313</a> -<a class="jxr_linenumber" name="L314" href="#L314">314</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L314" href="#L314">314</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L315" href="#L315">315</a> helpFormatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, opts); <a class="jxr_linenumber" name="L316" href="#L316">316</a> <a class="jxr_linenumber" name="L317" href="#L317">317</a> assertEquals(<span class="jxr_string">"usage: app [-c] [-b] [-a]"</span> + EOL, out.toString()); @@ -328,17 +328,17 @@ <a class="jxr_linenumber" name="L320" href="#L320">320</a> @Test <a class="jxr_linenumber" name="L321" href="#L321">321</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintOptionGroupUsage() <a class="jxr_linenumber" name="L322" href="#L322">322</a> { -<a class="jxr_linenumber" name="L323" href="#L323">323</a> OptionGroup group = <strong class="jxr_keyword">new</strong> OptionGroup(); +<a class="jxr_linenumber" name="L323" href="#L323">323</a> <strong class="jxr_keyword">final</strong> OptionGroup group = <strong class="jxr_keyword">new</strong> OptionGroup(); <a class="jxr_linenumber" name="L324" href="#L324">324</a> group.addOption(Option.builder(<span class="jxr_string">"a"</span>).build()); <a class="jxr_linenumber" name="L325" href="#L325">325</a> group.addOption(Option.builder(<span class="jxr_string">"b"</span>).build()); <a class="jxr_linenumber" name="L326" href="#L326">326</a> group.addOption(Option.builder(<span class="jxr_string">"c"</span>).build()); <a class="jxr_linenumber" name="L327" href="#L327">327</a> -<a class="jxr_linenumber" name="L328" href="#L328">328</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L328" href="#L328">328</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L329" href="#L329">329</a> options.addOptionGroup(group); <a class="jxr_linenumber" name="L330" href="#L330">330</a> -<a class="jxr_linenumber" name="L331" href="#L331">331</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L332" href="#L332">332</a> -<a class="jxr_linenumber" name="L333" href="#L333">333</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L334" href="#L334">334</a> formatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, options); <a class="jxr_linenumber" name="L335" href="#L335">335</a> <a class="jxr_linenumber" name="L336" href="#L336">336</a> assertEquals(<span class="jxr_string">"usage: app [-a | -b | -c]"</span> + EOL, out.toString()); @@ -347,18 +347,18 @@ <a class="jxr_linenumber" name="L339" href="#L339">339</a> @Test <a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintRequiredOptionGroupUsage() <a class="jxr_linenumber" name="L341" href="#L341">341</a> { -<a class="jxr_linenumber" name="L342" href="#L342">342</a> OptionGroup group = <strong class="jxr_keyword">new</strong> OptionGroup(); +<a class="jxr_linenumber" name="L342" href="#L342">342</a> <strong class="jxr_keyword">final</strong> OptionGroup group = <strong class="jxr_keyword">new</strong> OptionGroup(); <a class="jxr_linenumber" name="L343" href="#L343">343</a> group.addOption(Option.builder(<span class="jxr_string">"a"</span>).build()); <a class="jxr_linenumber" name="L344" href="#L344">344</a> group.addOption(Option.builder(<span class="jxr_string">"b"</span>).build()); <a class="jxr_linenumber" name="L345" href="#L345">345</a> group.addOption(Option.builder(<span class="jxr_string">"c"</span>).build()); <a class="jxr_linenumber" name="L346" href="#L346">346</a> group.setRequired(<strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L347" href="#L347">347</a> -<a class="jxr_linenumber" name="L348" href="#L348">348</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L348" href="#L348">348</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L349" href="#L349">349</a> options.addOptionGroup(group); <a class="jxr_linenumber" name="L350" href="#L350">350</a> -<a class="jxr_linenumber" name="L351" href="#L351">351</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L351" href="#L351">351</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L352" href="#L352">352</a> -<a class="jxr_linenumber" name="L353" href="#L353">353</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L353" href="#L353">353</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L354" href="#L354">354</a> formatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, options); <a class="jxr_linenumber" name="L355" href="#L355">355</a> <a class="jxr_linenumber" name="L356" href="#L356">356</a> assertEquals(<span class="jxr_string">"usage: app -a | -b | -c"</span> + EOL, out.toString()); @@ -367,16 +367,16 @@ <a class="jxr_linenumber" name="L359" href="#L359">359</a> @Test <a class="jxr_linenumber" name="L360" href="#L360">360</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPrintOptionWithEmptyArgNameUsage() <a class="jxr_linenumber" name="L361" href="#L361">361</a> { -<a class="jxr_linenumber" name="L362" href="#L362">362</a> Option option = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"f"</span>, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>); +<a class="jxr_linenumber" name="L362" href="#L362">362</a> <strong class="jxr_keyword">final</strong> Option option = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"f"</span>, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>); <a class="jxr_linenumber" name="L363" href="#L363">363</a> option.setArgName(<span class="jxr_string">""</span>); <a class="jxr_linenumber" name="L364" href="#L364">364</a> option.setRequired(<strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L365" href="#L365">365</a> -<a class="jxr_linenumber" name="L366" href="#L366">366</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L366" href="#L366">366</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L367" href="#L367">367</a> options.addOption(option); <a class="jxr_linenumber" name="L368" href="#L368">368</a> -<a class="jxr_linenumber" name="L369" href="#L369">369</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L369" href="#L369">369</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L370" href="#L370">370</a> -<a class="jxr_linenumber" name="L371" href="#L371">371</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L371" href="#L371">371</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L372" href="#L372">372</a> formatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, options); <a class="jxr_linenumber" name="L373" href="#L373">373</a> <a class="jxr_linenumber" name="L374" href="#L374">374</a> assertEquals(<span class="jxr_string">"usage: app -f"</span> + EOL, out.toString()); @@ -385,14 +385,14 @@ <a class="jxr_linenumber" name="L377" href="#L377">377</a> @Test <a class="jxr_linenumber" name="L378" href="#L378">378</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDefaultArgName() <a class="jxr_linenumber" name="L379" href="#L379">379</a> { -<a class="jxr_linenumber" name="L380" href="#L380">380</a> Option option = Option.builder(<span class="jxr_string">"f"</span>).hasArg().required(<strong class="jxr_keyword">true</strong>).build(); +<a class="jxr_linenumber" name="L380" href="#L380">380</a> <strong class="jxr_keyword">final</strong> Option option = Option.builder(<span class="jxr_string">"f"</span>).hasArg().required(<strong class="jxr_keyword">true</strong>).build(); <a class="jxr_linenumber" name="L381" href="#L381">381</a> -<a class="jxr_linenumber" name="L382" href="#L382">382</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L382" href="#L382">382</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L383" href="#L383">383</a> options.addOption(option); <a class="jxr_linenumber" name="L384" href="#L384">384</a> -<a class="jxr_linenumber" name="L385" href="#L385">385</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L385" href="#L385">385</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L386" href="#L386">386</a> -<a class="jxr_linenumber" name="L387" href="#L387">387</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L387" href="#L387">387</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L388" href="#L388">388</a> formatter.setArgName(<span class="jxr_string">"argument"</span>); <a class="jxr_linenumber" name="L389" href="#L389">389</a> formatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"app"</span>, options); <a class="jxr_linenumber" name="L390" href="#L390">390</a> @@ -402,7 +402,7 @@ <a class="jxr_linenumber" name="L394" href="#L394">394</a> @Test <a class="jxr_linenumber" name="L395" href="#L395">395</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRtrim() <a class="jxr_linenumber" name="L396" href="#L396">396</a> { -<a class="jxr_linenumber" name="L397" href="#L397">397</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L397" href="#L397">397</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L398" href="#L398">398</a> <a class="jxr_linenumber" name="L399" href="#L399">399</a> assertEquals(<strong class="jxr_keyword">null</strong>, formatter.rtrim(<strong class="jxr_keyword">null</strong>)); <a class="jxr_linenumber" name="L400" href="#L400">400</a> assertEquals(<span class="jxr_string">""</span>, formatter.rtrim(<span class="jxr_string">""</span>)); @@ -412,7 +412,7 @@ <a class="jxr_linenumber" name="L404" href="#L404">404</a> @Test <a class="jxr_linenumber" name="L405" href="#L405">405</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAccessors() <a class="jxr_linenumber" name="L406" href="#L406">406</a> { -<a class="jxr_linenumber" name="L407" href="#L407">407</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L408" href="#L408">408</a> <a class="jxr_linenumber" name="L409" href="#L409">409</a> formatter.setArgName(<span class="jxr_string">"argname"</span>); <a class="jxr_linenumber" name="L410" href="#L410">410</a> assertEquals(<span class="jxr_string">"arg name"</span>, <span class="jxr_string">"argname"</span>, formatter.getArgName()); @@ -443,11 +443,11 @@ <a class="jxr_linenumber" name="L435" href="#L435">435</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHeaderStartingWithLineSeparator() <a class="jxr_linenumber" name="L436" href="#L436">436</a> { <a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_comment">// related to Bugzilla #21215</em> -<a class="jxr_linenumber" name="L438" href="#L438">438</a> Options options = <strong class="jxr_keyword">new</strong> Options(); -<a class="jxr_linenumber" name="L439" href="#L439">439</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); -<a class="jxr_linenumber" name="L440" href="#L440">440</a> String header = EOL + <span class="jxr_string">"Header"</span>; -<a class="jxr_linenumber" name="L441" href="#L441">441</a> String footer = <span class="jxr_string">"Footer"</span>; -<a class="jxr_linenumber" name="L442" href="#L442">442</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L438" href="#L438">438</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L439" href="#L439">439</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L440" href="#L440">440</a> <strong class="jxr_keyword">final</strong> String header = EOL + <span class="jxr_string">"Header"</span>; +<a class="jxr_linenumber" name="L441" href="#L441">441</a> <strong class="jxr_keyword">final</strong> String footer = <span class="jxr_string">"Footer"</span>; +<a class="jxr_linenumber" name="L442" href="#L442">442</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L443" href="#L443">443</a> formatter.printHelp(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"foobar"</span>, header, options, 2, 2, footer, <strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L444" href="#L444">444</a> assertEquals( <a class="jxr_linenumber" name="L445" href="#L445">445</a> <span class="jxr_string">"usage: foobar"</span> + EOL + @@ -462,11 +462,11 @@ <a class="jxr_linenumber" name="L454" href="#L454">454</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIndentedHeaderAndFooter() <a class="jxr_linenumber" name="L455" href="#L455">455</a> { <a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_comment">// related to CLI-207</em> -<a class="jxr_linenumber" name="L457" href="#L457">457</a> Options options = <strong class="jxr_keyword">new</strong> Options(); -<a class="jxr_linenumber" name="L458" href="#L458">458</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); -<a class="jxr_linenumber" name="L459" href="#L459">459</a> String header = <span class="jxr_string">" Header1\n Header2"</span>; -<a class="jxr_linenumber" name="L460" href="#L460">460</a> String footer = <span class="jxr_string">" Footer1\n Footer2"</span>; -<a class="jxr_linenumber" name="L461" href="#L461">461</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L457" href="#L457">457</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L458" href="#L458">458</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong class="jxr_keyword">final</strong> String header = <span class="jxr_string">" Header1\n Header2"</span>; +<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong class="jxr_keyword">final</strong> String footer = <span class="jxr_string">" Footer1\n Footer2"</span>; +<a class="jxr_linenumber" name="L461" href="#L461">461</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L462" href="#L462">462</a> formatter.printHelp(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"foobar"</span>, header, options, 2, 2, footer, <strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L463" href="#L463">463</a> <a class="jxr_linenumber" name="L464" href="#L464">464</a> assertEquals( @@ -483,13 +483,13 @@ <a class="jxr_linenumber" name="L475" href="#L475">475</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOptionWithoutShortFormat() <a class="jxr_linenumber" name="L476" href="#L476">476</a> { <a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_comment">// related to Bugzilla #19383 (CLI-67)</em> -<a class="jxr_linenumber" name="L478" href="#L478">478</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L479" href="#L479">479</a> options.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"a"</span>, <span class="jxr_string">"aaa"</span>, false, <span class="jxr_string">"aaaaaaa"</span>)); <a class="jxr_linenumber" name="L480" href="#L480">480</a> options.addOption(<strong class="jxr_keyword">new</strong> Option(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"bbb"</span>, false, <span class="jxr_string">"bbbbbbb"</span>)); <a class="jxr_linenumber" name="L481" href="#L481">481</a> options.addOption(<strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"c"</span>, <strong class="jxr_keyword">null</strong>, false, <span class="jxr_string">"ccccccc"</span>)); <a class="jxr_linenumber" name="L482" href="#L482">482</a> -<a class="jxr_linenumber" name="L483" href="#L483">483</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); -<a class="jxr_linenumber" name="L484" href="#L484">484</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L484" href="#L484">484</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L485" href="#L485">485</a> formatter.printHelp(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"foobar"</span>, <span class="jxr_string">""</span>, options, 2, 2, <span class="jxr_string">""</span>, <strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L486" href="#L486">486</a> assertEquals( <a class="jxr_linenumber" name="L487" href="#L487">487</a> <span class="jxr_string">"usage: foobar [-a] [--bbb] [-c]"</span> + EOL + @@ -503,43 +503,43 @@ <a class="jxr_linenumber" name="L495" href="#L495">495</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOptionWithoutShortFormat2() <a class="jxr_linenumber" name="L496" href="#L496">496</a> { <a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_comment">// related to Bugzilla #27635 (CLI-26)</em> -<a class="jxr_linenumber" name="L498" href="#L498">498</a> Option help = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"h"</span>, <span class="jxr_string">"help"</span>, false, <span class="jxr_string">"print this message"</span>); -<a class="jxr_linenumber" name="L499" href="#L499">499</a> Option version = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"v"</span>, <span class="jxr_string">"version"</span>, false, <span class="jxr_string">"print version information"</span>); -<a class="jxr_linenumber" name="L500" href="#L500">500</a> Option newRun = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"n"</span>, <span class="jxr_string">"new"</span>, false, <span class="jxr_string">"Create NLT cache entries only for new items"</span>); -<a class="jxr_linenumber" name="L501" href="#L501">501</a> Option trackerRun = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"t"</span>, <span class="jxr_string">"tracker"</span>, false, <span class="jxr_string">"Create NLT cache entries only for tracker items"</span>); +<a class="jxr_linenumber" name="L498" href="#L498">498</a> <strong class="jxr_keyword">final</strong> Option help = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"h"</span>, <span class="jxr_string">"help"</span>, false, <span class="jxr_string">"print this message"</span>); +<a class="jxr_linenumber" name="L499" href="#L499">499</a> <strong class="jxr_keyword">final</strong> Option version = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"v"</span>, <span class="jxr_string">"version"</span>, false, <span class="jxr_string">"print version information"</span>); +<a class="jxr_linenumber" name="L500" href="#L500">500</a> <strong class="jxr_keyword">final</strong> Option newRun = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"n"</span>, <span class="jxr_string">"new"</span>, false, <span class="jxr_string">"Create NLT cache entries only for new items"</span>); +<a class="jxr_linenumber" name="L501" href="#L501">501</a> <strong class="jxr_keyword">final</strong> Option trackerRun = <strong class="jxr_keyword">new</strong> Option(<span class="jxr_string">"t"</span>, <span class="jxr_string">"tracker"</span>, false, <span class="jxr_string">"Create NLT cache entries only for tracker items"</span>); <a class="jxr_linenumber" name="L502" href="#L502">502</a> -<a class="jxr_linenumber" name="L503" href="#L503">503</a> Option timeLimit = Option.builder(<span class="jxr_string">"l"</span>) +<a class="jxr_linenumber" name="L503" href="#L503">503</a> <strong class="jxr_keyword">final</strong> Option timeLimit = Option.builder(<span class="jxr_string">"l"</span>) <a class="jxr_linenumber" name="L504" href="#L504">504</a> .longOpt(<span class="jxr_string">"limit"</span>) <a class="jxr_linenumber" name="L505" href="#L505">505</a> .hasArg() <a class="jxr_linenumber" name="L506" href="#L506">506</a> .valueSeparator() <a class="jxr_linenumber" name="L507" href="#L507">507</a> .desc(<span class="jxr_string">"Set time limit for execution, in mintues"</span>) <a class="jxr_linenumber" name="L508" href="#L508">508</a> .build(); <a class="jxr_linenumber" name="L509" href="#L509">509</a> -<a class="jxr_linenumber" name="L510" href="#L510">510</a> Option age = Option.builder(<span class="jxr_string">"a"</span>).longOpt(<span class="jxr_string">"age"</span>) +<a class="jxr_linenumber" name="L510" href="#L510">510</a> <strong class="jxr_keyword">final</strong> Option age = Option.builder(<span class="jxr_string">"a"</span>).longOpt(<span class="jxr_string">"age"</span>) <a class="jxr_linenumber" name="L511" href="#L511">511</a> .hasArg() <a class="jxr_linenumber" name="L512" href="#L512">512</a> .valueSeparator() <a class="jxr_linenumber" name="L513" href="#L513">513</a> .desc(<span class="jxr_string">"Age (in days) of cache item before being recomputed"</span>) <a class="jxr_linenumber" name="L514" href="#L514">514</a> .build(); <a class="jxr_linenumber" name="L515" href="#L515">515</a> -<a class="jxr_linenumber" name="L516" href="#L516">516</a> Option server = Option.builder(<span class="jxr_string">"s"</span>).longOpt(<span class="jxr_string">"server"</span>) +<a class="jxr_linenumber" name="L516" href="#L516">516</a> <strong class="jxr_keyword">final</strong> Option server = Option.builder(<span class="jxr_string">"s"</span>).longOpt(<span class="jxr_string">"server"</span>) <a class="jxr_linenumber" name="L517" href="#L517">517</a> .hasArg() <a class="jxr_linenumber" name="L518" href="#L518">518</a> .valueSeparator() <a class="jxr_linenumber" name="L519" href="#L519">519</a> .desc(<span class="jxr_string">"The NLT server address"</span>) <a class="jxr_linenumber" name="L520" href="#L520">520</a> .build(); <a class="jxr_linenumber" name="L521" href="#L521">521</a> -<a class="jxr_linenumber" name="L522" href="#L522">522</a> Option numResults = Option.builder(<span class="jxr_string">"r"</span>).longOpt(<span class="jxr_string">"results"</span>) +<a class="jxr_linenumber" name="L522" href="#L522">522</a> <strong class="jxr_keyword">final</strong> Option numResults = Option.builder(<span class="jxr_string">"r"</span>).longOpt(<span class="jxr_string">"results"</span>) <a class="jxr_linenumber" name="L523" href="#L523">523</a> .hasArg() <a class="jxr_linenumber" name="L524" href="#L524">524</a> .valueSeparator() <a class="jxr_linenumber" name="L525" href="#L525">525</a> .desc(<span class="jxr_string">"Number of results per item"</span>) <a class="jxr_linenumber" name="L526" href="#L526">526</a> .build(); <a class="jxr_linenumber" name="L527" href="#L527">527</a> -<a class="jxr_linenumber" name="L528" href="#L528">528</a> Option configFile = Option.builder().longOpt(<span class="jxr_string">"config"</span>) +<a class="jxr_linenumber" name="L528" href="#L528">528</a> <strong class="jxr_keyword">final</strong> Option configFile = Option.builder().longOpt(<span class="jxr_string">"config"</span>) <a class="jxr_linenumber" name="L529" href="#L529">529</a> .hasArg() <a class="jxr_linenumber" name="L530" href="#L530">530</a> .valueSeparator() <a class="jxr_linenumber" name="L531" href="#L531">531</a> .desc(<span class="jxr_string">"Use the specified configuration file"</span>) <a class="jxr_linenumber" name="L532" href="#L532">532</a> .build(); <a class="jxr_linenumber" name="L533" href="#L533">533</a> -<a class="jxr_linenumber" name="L534" href="#L534">534</a> Options mOptions = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L534" href="#L534">534</a> <strong class="jxr_keyword">final</strong> Options mOptions = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L535" href="#L535">535</a> mOptions.addOption(help); <a class="jxr_linenumber" name="L536" href="#L536">536</a> mOptions.addOption(version); <a class="jxr_linenumber" name="L537" href="#L537">537</a> mOptions.addOption(newRun); @@ -550,9 +550,9 @@ <a class="jxr_linenumber" name="L542" href="#L542">542</a> mOptions.addOption(numResults); <a class="jxr_linenumber" name="L543" href="#L543">543</a> mOptions.addOption(configFile); <a class="jxr_linenumber" name="L544" href="#L544">544</a> -<a class="jxr_linenumber" name="L545" href="#L545">545</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L545" href="#L545">545</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L546" href="#L546">546</a> <strong class="jxr_keyword">final</strong> String EOL = System.getProperty(<span class="jxr_string">"line.separator"</span>); -<a class="jxr_linenumber" name="L547" href="#L547">547</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L547" href="#L547">547</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L548" href="#L548">548</a> formatter.printHelp(<strong class="jxr_keyword">new</strong> PrintWriter(out),80,<span class="jxr_string">"commandline"</span>,<span class="jxr_string">"header"</span>,mOptions,2,2,<span class="jxr_string">"footer"</span>,<strong class="jxr_keyword">true</strong>); <a class="jxr_linenumber" name="L549" href="#L549">549</a> assertEquals( <a class="jxr_linenumber" name="L550" href="#L550">550</a> <span class="jxr_string">"usage: commandline [-a <arg>] [--config <arg>] [-h] [-l <arg>] [-n] [-r <arg>]"</span> + EOL + @@ -574,17 +574,17 @@ <a class="jxr_linenumber" name="L566" href="#L566">566</a> @Test <a class="jxr_linenumber" name="L567" href="#L567">567</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHelpWithLongOptSeparator() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L568" href="#L568">568</a> { -<a class="jxr_linenumber" name="L569" href="#L569">569</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L569" href="#L569">569</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L570" href="#L570">570</a> options.addOption( <span class="jxr_string">"f"</span>, <strong class="jxr_keyword">true</strong>, <span class="jxr_string">"the file"</span> ); <a class="jxr_linenumber" name="L571" href="#L571">571</a> options.addOption(Option.builder(<span class="jxr_string">"s"</span>).longOpt(<span class="jxr_string">"size"</span>).desc(<span class="jxr_string">"the size"</span>).hasArg().argName(<span class="jxr_string">"SIZE"</span>).build()); <a class="jxr_linenumber" name="L572" href="#L572">572</a> options.addOption(Option.builder().longOpt(<span class="jxr_string">"age"</span>).desc(<span class="jxr_string">"the age"</span>).hasArg().build()); <a class="jxr_linenumber" name="L573" href="#L573">573</a> -<a class="jxr_linenumber" name="L574" href="#L574">574</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L574" href="#L574">574</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L575" href="#L575">575</a> assertEquals(HelpFormatter.DEFAULT_LONG_OPT_SEPARATOR, formatter.getLongOptSeparator()); <a class="jxr_linenumber" name="L576" href="#L576">576</a> formatter.setLongOptSeparator(<span class="jxr_string">"="</span>); <a class="jxr_linenumber" name="L577" href="#L577">577</a> assertEquals(<span class="jxr_string">"="</span>, formatter.getLongOptSeparator()); <a class="jxr_linenumber" name="L578" href="#L578">578</a> -<a class="jxr_linenumber" name="L579" href="#L579">579</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L579" href="#L579">579</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L580" href="#L580">580</a> <a class="jxr_linenumber" name="L581" href="#L581">581</a> formatter.printHelp(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"create"</span>, <span class="jxr_string">"header"</span>, options, 2, 2, <span class="jxr_string">"footer"</span>); <a class="jxr_linenumber" name="L582" href="#L582">582</a> @@ -601,15 +601,15 @@ <a class="jxr_linenumber" name="L593" href="#L593">593</a> @Test <a class="jxr_linenumber" name="L594" href="#L594">594</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsageWithLongOptSeparator() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L595" href="#L595">595</a> { -<a class="jxr_linenumber" name="L596" href="#L596">596</a> Options options = <strong class="jxr_keyword">new</strong> Options(); +<a class="jxr_linenumber" name="L596" href="#L596">596</a> <strong class="jxr_keyword">final</strong> Options options = <strong class="jxr_keyword">new</strong> Options(); <a class="jxr_linenumber" name="L597" href="#L597">597</a> options.addOption( <span class="jxr_string">"f"</span>, <strong class="jxr_keyword">true</strong>, <span class="jxr_string">"the file"</span> ); <a class="jxr_linenumber" name="L598" href="#L598">598</a> options.addOption(Option.builder(<span class="jxr_string">"s"</span>).longOpt(<span class="jxr_string">"size"</span>).desc(<span class="jxr_string">"the size"</span>).hasArg().argName(<span class="jxr_string">"SIZE"</span>).build()); <a class="jxr_linenumber" name="L599" href="#L599">599</a> options.addOption(Option.builder().longOpt(<span class="jxr_string">"age"</span>).desc(<span class="jxr_string">"the age"</span>).hasArg().build()); <a class="jxr_linenumber" name="L600" href="#L600">600</a> -<a class="jxr_linenumber" name="L601" href="#L601">601</a> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); +<a class="jxr_linenumber" name="L601" href="#L601">601</a> <strong class="jxr_keyword">final</strong> HelpFormatter formatter = <strong class="jxr_keyword">new</strong> HelpFormatter(); <a class="jxr_linenumber" name="L602" href="#L602">602</a> formatter.setLongOptSeparator(<span class="jxr_string">"="</span>); <a class="jxr_linenumber" name="L603" href="#L603">603</a> -<a class="jxr_linenumber" name="L604" href="#L604">604</a> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); +<a class="jxr_linenumber" name="L604" href="#L604">604</a> <strong class="jxr_keyword">final</strong> StringWriter out = <strong class="jxr_keyword">new</strong> StringWriter(); <a class="jxr_linenumber" name="L605" href="#L605">605</a> <a class="jxr_linenumber" name="L606" href="#L606">606</a> formatter.printUsage(<strong class="jxr_keyword">new</strong> PrintWriter(out), 80, <span class="jxr_string">"create"</span>, options); <a class="jxr_linenumber" name="L607" href="#L607">607</a>
Modified: websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/OptionBuilderTest.html ============================================================================== --- websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/OptionBuilderTest.html (original) +++ websites/production/commons/content/proper/commons-cli/xref-test/org/apache/commons/cli/OptionBuilderTest.html Thu Jun 8 17:47:18 2017 @@ -37,7 +37,7 @@ <a class="jxr_linenumber" name="L29" href="#L29">29</a> { <a class="jxr_linenumber" name="L30" href="#L30">30</a> @Test <a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCompleteOption( ) { -<a class="jxr_linenumber" name="L32" href="#L32">32</a> Option simple = OptionBuilder.withLongOpt( <span class="jxr_string">"simple option"</span>) +<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">final</strong> Option simple = OptionBuilder.withLongOpt( <span class="jxr_string">"simple option"</span>) <a class="jxr_linenumber" name="L33" href="#L33">33</a> .hasArg( ) <a class="jxr_linenumber" name="L34" href="#L34">34</a> .isRequired( ) <a class="jxr_linenumber" name="L35" href="#L35">35</a> .hasArgs( ) @@ -88,7 +88,7 @@ <a class="jxr_linenumber" name="L80" href="#L80">80</a> <a class="jxr_linenumber" name="L81" href="#L81">81</a> @Test <a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBaseOptionCharOpt() { -<a class="jxr_linenumber" name="L83" href="#L83">83</a> Option base = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span>) +<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">final</strong> Option base = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span>) <a class="jxr_linenumber" name="L84" href="#L84">84</a> .create( 'o' ); <a class="jxr_linenumber" name="L85" href="#L85">85</a> <a class="jxr_linenumber" name="L86" href="#L86">86</a> assertEquals( <span class="jxr_string">"o"</span>, base.getOpt() ); @@ -98,7 +98,7 @@ <a class="jxr_linenumber" name="L90" href="#L90">90</a> <a class="jxr_linenumber" name="L91" href="#L91">91</a> @Test <a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBaseOptionStringOpt() { -<a class="jxr_linenumber" name="L93" href="#L93">93</a> Option base = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span>) +<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">final</strong> Option base = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span>) <a class="jxr_linenumber" name="L94" href="#L94">94</a> .create( <span class="jxr_string">"o"</span> ); <a class="jxr_linenumber" name="L95" href="#L95">95</a> <a class="jxr_linenumber" name="L96" href="#L96">96</a> assertEquals( <span class="jxr_string">"o"</span>, base.getOpt() ); @@ -110,18 +110,18 @@ <a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSpecialOptChars() <strong class="jxr_keyword">throws</strong> Exception <a class="jxr_linenumber" name="L103" href="#L103">103</a> { <a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_comment">// '?'</em> -<a class="jxr_linenumber" name="L105" href="#L105">105</a> Option opt1 = OptionBuilder.withDescription(<span class="jxr_string">"help options"</span>).create('?'); +<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">final</strong> Option opt1 = OptionBuilder.withDescription(<span class="jxr_string">"help options"</span>).create('?'); <a class="jxr_linenumber" name="L106" href="#L106">106</a> assertEquals(<span class="jxr_string">"?"</span>, opt1.getOpt()); <a class="jxr_linenumber" name="L107" href="#L107">107</a> <a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_comment">// '@'</em> -<a class="jxr_linenumber" name="L109" href="#L109">109</a> Option opt2 = OptionBuilder.withDescription(<span class="jxr_string">"read from stdin"</span>).create('@'); +<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">final</strong> Option opt2 = OptionBuilder.withDescription(<span class="jxr_string">"read from stdin"</span>).create('@'); <a class="jxr_linenumber" name="L110" href="#L110">110</a> assertEquals(<span class="jxr_string">"@"</span>, opt2.getOpt()); <a class="jxr_linenumber" name="L111" href="#L111">111</a> <a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_comment">// ' '</em> <a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">try</strong> { <a class="jxr_linenumber" name="L114" href="#L114">114</a> OptionBuilder.create(' '); <a class="jxr_linenumber" name="L115" href="#L115">115</a> fail( <span class="jxr_string">"IllegalArgumentException not caught"</span> ); -<a class="jxr_linenumber" name="L116" href="#L116">116</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) { +<a class="jxr_linenumber" name="L116" href="#L116">116</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) { <a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_comment">// success</em> <a class="jxr_linenumber" name="L118" href="#L118">118</a> } <a class="jxr_linenumber" name="L119" href="#L119">119</a> } @@ -129,7 +129,7 @@ <a class="jxr_linenumber" name="L121" href="#L121">121</a> @Test <a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOptionArgNumbers() <a class="jxr_linenumber" name="L123" href="#L123">123</a> { -<a class="jxr_linenumber" name="L124" href="#L124">124</a> Option opt = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span> ) +<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">final</strong> Option opt = OptionBuilder.withDescription( <span class="jxr_string">"option description"</span> ) <a class="jxr_linenumber" name="L125" href="#L125">125</a> .hasArgs( 2 ) <a class="jxr_linenumber" name="L126" href="#L126">126</a> .create( 'o' ); <a class="jxr_linenumber" name="L127" href="#L127">127</a> assertEquals( 2, opt.getArgs() ); @@ -142,7 +142,7 @@ <a class="jxr_linenumber" name="L134" href="#L134">134</a> OptionBuilder.withDescription( <span class="jxr_string">"option description"</span> ).create( '"' ); <a class="jxr_linenumber" name="L135" href="#L135">135</a> fail( <span class="jxr_string">"IllegalArgumentException not caught"</span> ); <a class="jxr_linenumber" name="L136" href="#L136">136</a> } -<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">catch</strong>( IllegalArgumentException exp ) { +<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">catch</strong>( <strong class="jxr_keyword">final</strong> IllegalArgumentException exp ) { <a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_comment">// success</em> <a class="jxr_linenumber" name="L139" href="#L139">139</a> } <a class="jxr_linenumber" name="L140" href="#L140">140</a> @@ -151,7 +151,7 @@ <a class="jxr_linenumber" name="L143" href="#L143">143</a> OptionBuilder.create( <span class="jxr_string">"opt`"</span> ); <a class="jxr_linenumber" name="L144" href="#L144">144</a> fail( <span class="jxr_string">"IllegalArgumentException not caught"</span> ); <a class="jxr_linenumber" name="L145" href="#L145">145</a> } -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">catch</strong>( IllegalArgumentException exp ) { +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">catch</strong>( <strong class="jxr_keyword">final</strong> IllegalArgumentException exp ) { <a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_comment">// success</em> <a class="jxr_linenumber" name="L148" href="#L148">148</a> } <a class="jxr_linenumber" name="L149" href="#L149">149</a> @@ -160,7 +160,7 @@ <a class="jxr_linenumber" name="L152" href="#L152">152</a> OptionBuilder.create( <span class="jxr_string">"opt"</span> ); <a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_comment">// success</em> <a class="jxr_linenumber" name="L154" href="#L154">154</a> } -<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">catch</strong>( IllegalArgumentException exp ) { +<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">catch</strong>( <strong class="jxr_keyword">final</strong> IllegalArgumentException exp ) { <a class="jxr_linenumber" name="L156" href="#L156">156</a> fail( <span class="jxr_string">"IllegalArgumentException caught"</span> ); <a class="jxr_linenumber" name="L157" href="#L157">157</a> } <a class="jxr_linenumber" name="L158" href="#L158">158</a> } @@ -172,7 +172,7 @@ <a class="jxr_linenumber" name="L164" href="#L164">164</a> OptionBuilder.hasArg().create(); <a class="jxr_linenumber" name="L165" href="#L165">165</a> fail(<span class="jxr_string">"Incomplete option should be rejected"</span>); <a class="jxr_linenumber" name="L166" href="#L166">166</a> } -<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) +<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) <a class="jxr_linenumber" name="L168" href="#L168">168</a> { <a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_comment">// expected</em> <a class="jxr_linenumber" name="L170" href="#L170">170</a> @@ -188,7 +188,7 @@ <a class="jxr_linenumber" name="L180" href="#L180">180</a> OptionBuilder.withDescription(<span class="jxr_string">"JUnit"</span>).create('"'); <a class="jxr_linenumber" name="L181" href="#L181">181</a> fail(<span class="jxr_string">"IllegalArgumentException expected"</span>); <a class="jxr_linenumber" name="L182" href="#L182">182</a> } -<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) +<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) <a class="jxr_linenumber" name="L184" href="#L184">184</a> { <a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_comment">// expected</em> <a class="jxr_linenumber" name="L186" href="#L186">186</a> } @@ -199,7 +199,7 @@ <a class="jxr_linenumber" name="L191" href="#L191">191</a> OptionBuilder.withDescription(<span class="jxr_string">"JUnit"</span>).create(); <a class="jxr_linenumber" name="L192" href="#L192">192</a> fail(<span class="jxr_string">"IllegalArgumentException expected"</span>); <a class="jxr_linenumber" name="L193" href="#L193">193</a> } -<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) +<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IllegalArgumentException e) <a class="jxr_linenumber" name="L195" href="#L195">195</a> { <a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_comment">// expected</em> <a class="jxr_linenumber" name="L197" href="#L197">197</a> }