From 087cf569ae8c80453d6f0926bda8c0aad8a93598 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Feb 2014 10:11:29 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - Replaced some argument names by their long identifier.toLowerCase() (in CommonArguments ). - Replaced "trustAll" -> CommonArguments.getTrustAll() - Replaced "showUsage"/"help" -> CommonArguments.getShowUsage() - Renamed sslBlindTrust by trustAll in LDAPPasswordModify.java - Added OPTION_LONG_RESTART to ArgumentConstants. - Replaced "restart" string in StopDS.java by OPTION_LONG_RESTART. - Replaced argument declaration by CommonArguments.getRestart().
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 2da99d2..0d16ad7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -549,34 +549,13 @@
private void initializeGlobalArguments(String[] args)
throws ArgumentException {
if (globalArgumentsInitialized == false) {
+
verboseArgument = CommonArguments.getVerbose();
-
- quietArgument = new BooleanArgument(
- OPTION_LONG_QUIET,
- OPTION_SHORT_QUIET,
- OPTION_LONG_QUIET,
- INFO_DESCRIPTION_QUIET.get());
- quietArgument.setPropertyName(OPTION_LONG_QUIET);
-
- scriptFriendlyArgument = new BooleanArgument("script-friendly",
- OPTION_SHORT_SCRIPT_FRIENDLY, OPTION_LONG_SCRIPT_FRIENDLY,
- INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
- scriptFriendlyArgument.setPropertyName(OPTION_LONG_SCRIPT_FRIENDLY);
-
- noPromptArgument = new BooleanArgument(
- OPTION_LONG_NO_PROMPT,
- OPTION_SHORT_NO_PROMPT,
- OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
-
- advancedModeArgument = new BooleanArgument(OPTION_LONG_ADVANCED,
- null, OPTION_LONG_ADVANCED,
- INFO_DSCFG_DESCRIPTION_ADVANCED.get());
- advancedModeArgument.setPropertyName(OPTION_LONG_ADVANCED);
-
- showUsageArgument = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP, INFO_DSCFG_DESCRIPTION_SHOW_GROUP_USAGE_SUMMARY
- .get());
+ quietArgument = CommonArguments.getQuiet();
+ scriptFriendlyArgument = CommonArguments.getScriptFriendly();
+ noPromptArgument = CommonArguments.getNoPrompt();
+ advancedModeArgument = CommonArguments.getAdvancedMode();
+ showUsageArgument = CommonArguments.getShowUsage();
batchFileArgument = new StringArgument(OPTION_LONG_BATCH_FILE_PATH,
OPTION_SHORT_BATCH_FILE_PATH, OPTION_LONG_BATCH_FILE_PATH,
@@ -588,8 +567,6 @@
OPTION_LONG_DISPLAY_EQUIVALENT,
null, OPTION_LONG_DISPLAY_EQUIVALENT,
INFO_DSCFG_DESCRIPTION_DISPLAY_EQUIVALENT.get());
- advancedModeArgument.setPropertyName(
- OPTION_LONG_DISPLAY_EQUIVALENT);
equivalentCommandFileArgument = new StringArgument(
OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, null,
@@ -649,7 +626,7 @@
if (handlerFactory == null) {
handlerFactory = new SubCommandHandlerFactory(parser);
- Comparator<SubCommand> c = new Comparator<SubCommand>() {
+ final Comparator<SubCommand> c = new Comparator<SubCommand>() {
@Override
public int compare(SubCommand o1, SubCommand o2) {
--
Gitblit v1.10.0