From 1f1874b485ffa78a4ea5f540cc85fca2505514bd Mon Sep 17 00:00:00 2001 From: Chris Norman Date: Thu, 5 Jan 2023 13:59:56 -0500 Subject: [PATCH] Fix reversed logic in the help template. --- .../broadinstitute/barclay/helpTemplates/generic.html.ftl | 4 ++-- ...ute_barclay_help_testinputs_TestArgumentContainer.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/org/broadinstitute/barclay/helpTemplates/generic.html.ftl b/src/main/resources/org/broadinstitute/barclay/helpTemplates/generic.html.ftl index c7a65d40..54409df2 100644 --- a/src/main/resources/org/broadinstitute/barclay/helpTemplates/generic.html.ftl +++ b/src/main/resources/org/broadinstitute/barclay/helpTemplates/generic.html.ftl @@ -60,9 +60,9 @@ <#if arg.options?has_content>

<#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:

<#list arg.options as option> diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html index 5d26c001..3945b85e 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html @@ -402,7 +402,7 @@

--enumCollection

- 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:

ENUM_VALUE_1
This is enum value 1.
@@ -425,7 +425,7 @@

--enumSetLong

- 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:

ENUM_VALUE_1
This is enum value 1.
@@ -525,7 +525,7 @@

--optionalClpEnum

- 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:

ENUM_VALUE_1
This is enum value 1.
@@ -640,7 +640,7 @@

--requiredClpEnum

- 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:

ENUM_VALUE_1
This is enum value 1.