From 0c950f58fb55560af9fb5435b89040e0e28e09a6 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 26 Sep 2007 15:56:11 +0000
Subject: [PATCH] Addresses issue 2143 which is intended to help with the readability of the usage statements by allowing options to be grouped logically by type. Many of the utilities arguments have grown to such an extent that it is difficult to sort through the various types of arguments to find what you are looking for. For instance the usage statement for the task schedulable arguments are mixed with the LDAP connection arguments which makes them difficult to ignore if they want to use the tool in offline mode.
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index f9b0935..b03d4b6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -66,6 +66,7 @@
import org.opends.server.util.args.StringArgument;
import org.opends.server.util.args.SubCommand;
import org.opends.server.util.args.SubCommandArgumentParser;
+import org.opends.server.util.args.ArgumentGroup;
import org.opends.server.util.cli.CLIException;
import org.opends.server.util.cli.ConsoleApplication;
import org.opends.server.util.cli.Menu;
@@ -504,8 +505,9 @@
OPTION_LONG_QUIET,
INFO_DESCRIPTION_QUIET.get());
- scriptFriendlyArgument = new BooleanArgument("script-friendly", 's',
- "script-friendly", INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
+ scriptFriendlyArgument = new BooleanArgument("script-friendly",
+ OPTION_SHORT_SCRIPT_FRIENDLY, OPTION_LONG_SCRIPT_FRIENDLY,
+ INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
noPromptArgument = new BooleanArgument(
OPTION_LONG_NO_PROMPT,
@@ -531,13 +533,17 @@
INFO_DESCRIPTION_NO_PROP_FILE.get());
// Register the global arguments.
+
+ ArgumentGroup toolOptionsGroup = new ArgumentGroup(
+ INFO_DESCRIPTION_CONFIG_OPTIONS_ARGS.get(), 2);
+ parser.addGlobalArgument(advancedModeArgument, toolOptionsGroup);
+
parser.addGlobalArgument(showUsageArgument);
parser.setUsageArgument(showUsageArgument, getOutputStream());
parser.addGlobalArgument(verboseArgument);
parser.addGlobalArgument(quietArgument);
parser.addGlobalArgument(scriptFriendlyArgument);
parser.addGlobalArgument(noPromptArgument);
- parser.addGlobalArgument(advancedModeArgument);
parser.addGlobalArgument(propertiesFileArgument);
parser.setFilePropertiesArgument(propertiesFileArgument);
parser.addGlobalArgument(noPropertiesFileArgument);
--
Gitblit v1.10.0