Skip to content

Commit

Permalink
[#1155][#1157] update user manual rendered HTML for various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
remkop committed Aug 26, 2020
1 parent 8c99ed9 commit 086c1a2
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2296,7 +2296,7 @@ <h3 id="_field_values"><a class="anchor" href="#_field_values"></a>5.2. Field Va
<div class="ulist">
<ul>
<li>
<p>when the option is used in a argument group, the usage help <a href="#_default_values_in_argument_groups">cannot show the default value</a></p>
<p>when the option is used in an argument group, the usage help <a href="#_default_values_in_argument_groups">cannot show the default value</a></p>
</li>
<li>
<p>picocli&#8217;s annotation processors can only detect default values in annotations, not in the field declaration. Your application may not work correctly with future features like documentation generated from the annotations.</p>
Expand Down Expand Up @@ -4244,9 +4244,10 @@ <h4 id="_single_value_validation"><a class="anchor" href="#_single_value_validat
}
<span class="keyword">if</span> (invalid) {
<span class="keyword">throw</span> <span class="keyword">new</span> ParameterException(spec.commandLine(),
<span class="predefined-type">String</span>.format(<span class="string"><span class="delimiter">&quot;</span><span class="content">Invalid value '%s' for option '--p': </span><span class="delimiter">&quot;</span></span> +
<span class="predefined-type">String</span>.format(<span class="string"><span class="delimiter">&quot;</span><span class="content">Invalid value '%s' for option '--prime': </span><span class="delimiter">&quot;</span></span> +
<span class="string"><span class="delimiter">&quot;</span><span class="content">value is not a prime number.</span><span class="delimiter">&quot;</span></span>, value));
}
prime = value;
}
<span class="comment">// ...</span>
}</code></pre>
Expand All @@ -4266,9 +4267,9 @@ <h4 id="_validating_option_combinations"><a class="anchor" href="#_validating_op
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Command</span>(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">myapp</span><span class="delimiter">&quot;</span></span>, mixinStandardHelpOptions = <span class="predefined-constant">true</span>, version = <span class="string"><span class="delimiter">&quot;</span><span class="content">myapp 0.1</span><span class="delimiter">&quot;</span></span>)
<span class="type">class</span> <span class="class">MultiOptionValidationExample</span> <span class="directive">implements</span> <span class="predefined-type">Runnable</span> {
<span class="annotation">@Option</span>(name=<span class="string"><span class="delimiter">&quot;</span><span class="content">--xml</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; xmlFiles;
<span class="annotation">@Option</span>(name=<span class="string"><span class="delimiter">&quot;</span><span class="content">--csv</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; csvFiles;
<span class="annotation">@Option</span>(name=<span class="string"><span class="delimiter">&quot;</span><span class="content">--json</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; jsonFiles;
<span class="annotation">@Option</span>(names=<span class="string"><span class="delimiter">&quot;</span><span class="content">--xml</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; xmlFiles;
<span class="annotation">@Option</span>(names=<span class="string"><span class="delimiter">&quot;</span><span class="content">--csv</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; csvFiles;
<span class="annotation">@Option</span>(names=<span class="string"><span class="delimiter">&quot;</span><span class="content">--json</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">File</span>&gt; jsonFiles;

<span class="annotation">@Spec</span> CommandSpec spec; <span class="comment">// injected by picocli</span>

Expand All @@ -4290,7 +4291,7 @@ <h4 id="_validating_option_combinations"><a class="anchor" href="#_validating_op
}
}

<span class="directive">private</span> <span class="type">void</span> missing(<span class="predefined-type">List</span>&lt;?&gt; list) {
<span class="directive">private</span> <span class="type">boolean</span> missing(<span class="predefined-type">List</span>&lt;?&gt; list) {
<span class="keyword">return</span> list == <span class="predefined-constant">null</span> || list.isEmpty();
}
}</code></pre>
Expand Down

0 comments on commit 086c1a2

Please sign in to comment.