Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reversed logic in the help template. #190

Merged
merged 2 commits into from
Apr 10, 2023
Merged

Fix reversed logic in the help template. #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1874b
Fix reversed logic in the help template.
cmnbroad Jan 5, 2023
f91b3c6
Rebase and update results from new test added during Java 17 port.
cmnbroad Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/resources/org/broadinstitute/barclay/helpTemplates/generic.html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<#if arg.options?has_content>
<p>
<#if arg.collection>
The ${arg.name} argument is an enumerated type (${arg.type}), which can accept the following values:
<#else>
The ${arg.name} argument is a list of an enumerated type (${arg.type}), which can accept one or more of the following values:
<#else>
The ${arg.name} argument is an enumerated type (${arg.type}), which can accept the following values:
</#if>
<dl class="enum">
<#list arg.options as option>
Expand Down
10 changes: 5 additions & 5 deletions ...expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ <h3><a name="--enumCollection">--enumCollection </a>

</p>
<p>
The --enumCollection argument is an enumerated type (List[TestEnum]), which can accept the following values:
The --enumCollection argument is a list of an enumerated type (List[TestEnum]), which can accept one or more of the following values:
<dl class="enum">
<dt class="enum">ENUM_VALUE_1</dt>
<dd class="enum">This is enum value 1.</dd>
Expand All @@ -425,7 +425,7 @@ <h3><a name="--enumSetLong">--enumSetLong </a>

</p>
<p>
The --enumSetLong argument is an enumerated type (EnumSet[TestEnum]), which can accept the following values:
The --enumSetLong argument is a list of an enumerated type (EnumSet[TestEnum]), which can accept one or more of the following values:
<dl class="enum">
<dt class="enum">ENUM_VALUE_1</dt>
<dd class="enum">This is enum value 1.</dd>
Expand Down Expand Up @@ -502,7 +502,7 @@ <h3><a name="--nonCLPEnumCollection">--nonCLPEnumCollection </a>

</p>
<p>
The --nonCLPEnumCollection argument is an enumerated type (List[TestNonCLPEnum]), which can accept the following values:
The --nonCLPEnumCollection argument is a list of an enumerated type (List[TestNonCLPEnum]), which can accept one or more of the following values:
<dl class="enum">
<dt class="enum">NON_CLP_ENUM_VALUE_1</dt>
<dd class="enum">This is the NON_CLP_ENUM_VALUE_1 comment</dd>
Expand All @@ -525,7 +525,7 @@ <h3><a name="--optionalClpEnum">--optionalClpEnum </a>

</p>
<p>
The --optionalClpEnum argument is a list of an enumerated type (TestEnum), which can accept one or more of the following values:
The --optionalClpEnum argument is an enumerated type (TestEnum), which can accept the following values:
<dl class="enum">
<dt class="enum">ENUM_VALUE_1</dt>
<dd class="enum">This is enum value 1.</dd>
Expand Down Expand Up @@ -640,7 +640,7 @@ <h3><a name="--requiredClpEnum">--requiredClpEnum </a>

</p>
<p>
The --requiredClpEnum argument is a list of an enumerated type (TestEnum), which can accept one or more of the following values:
The --requiredClpEnum argument is an enumerated type (TestEnum), which can accept the following values:
<dl class="enum">
<dt class="enum">ENUM_VALUE_1</dt>
<dd class="enum">This is enum value 1.</dd>
Expand Down