From 7f26eabb948c50e59810769354a88aff933b20c7 Mon Sep 17 00:00:00 2001 From: Neil Wilson Date: Wed, 22 May 2024 11:36:46 -0500 Subject: [PATCH] Change --helpDebug to --help-debug Changed the default identifier used to obtain debug help information from --helpDebug to --help-debug to be more consistent with the name of the corresponding argument in the Ping Identity Directory Server. Either identifier can be used to obtain the help text, but only --help-debug will be displayed in the tool usage information. --- src/com/unboundid/util/CommandLineTool.java | 10 +++++----- .../ldap/sdk/examples/Base64ToolTestCase.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/unboundid/util/CommandLineTool.java b/src/com/unboundid/util/CommandLineTool.java index 2d66d4134..3b2def157 100644 --- a/src/com/unboundid/util/CommandLineTool.java +++ b/src/com/unboundid/util/CommandLineTool.java @@ -1297,20 +1297,20 @@ public final ArgumentParser createArgumentParser() if (! parser.getSubCommands().isEmpty()) { - helpSubcommandsArgument = new BooleanArgument(null, "helpSubcommands", 1, + helpSubcommandsArgument = new BooleanArgument(null, "help-subcommands", 1, INFO_CL_TOOL_DESCRIPTION_HELP_SUBCOMMANDS.get()); - helpSubcommandsArgument.addLongIdentifier("helpSubcommand", true); - helpSubcommandsArgument.addLongIdentifier("help-subcommands", true); + helpSubcommandsArgument.addLongIdentifier("helpSubcommands", true); helpSubcommandsArgument.addLongIdentifier("help-subcommand", true); + helpSubcommandsArgument.addLongIdentifier("helpSubcommand", true); helpSubcommandsArgument.setUsageArgument(true); parser.addArgument(helpSubcommandsArgument); } if (supportsDebugLogging()) { - helpDebugArgument = new BooleanArgument(null, "helpDebug", 1, + helpDebugArgument = new BooleanArgument(null, "help-debug", 1, INFO_CL_TOOL_DESCRIPTION_HELP_DEBUG.get()); - helpDebugArgument.addLongIdentifier("help-debug", true); + helpDebugArgument.addLongIdentifier("helpDebug", true); helpDebugArgument.setUsageArgument(true); parser.addArgument(helpDebugArgument); diff --git a/tests/unit/src/com/unboundid/ldap/sdk/examples/Base64ToolTestCase.java b/tests/unit/src/com/unboundid/ldap/sdk/examples/Base64ToolTestCase.java index 41ef00ee9..0402a277a 100644 --- a/tests/unit/src/com/unboundid/ldap/sdk/examples/Base64ToolTestCase.java +++ b/tests/unit/src/com/unboundid/ldap/sdk/examples/Base64ToolTestCase.java @@ -395,9 +395,9 @@ public void testInteractiveMode() final File outputFile = createTempFile(); final InputStream in = getInputStream( "1", // Choose the decode subcommand - "8", // Choose to edit the data to decode, + "9", // Choose to edit the data to decode, Base64.encode("interactive"), // The data to decode - "10", // Choose the output file to create + "11", // Choose the output file to create outputFile.getAbsolutePath(), // The path to the output file "d", // Display the arguments "", // Done displaying the arguments