From 8af4770c261b54c3f12bb4e8fe14b6f6b567514b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 30 Aug 2007 13:49:23 +0000
Subject: [PATCH] Make the --advanced dsconfig option a global option so that it is available to the global interactive mode.
---
opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 251a429..4f1dc52 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -249,6 +249,16 @@
}
/**
+ * The value for the long option advanced.
+ */
+ private static final String OPTION_DSCFG_LONG_ADVANCED = "advanced";
+
+ /**
+ * The value for the short option advanced.
+ */
+ private static final Character OPTION_DSCFG_SHORT_ADVANCED = null;
+
+ /**
* The tracer object for the debug logger.
*/
private static final DebugTracer TRACER = getTracer();
@@ -310,6 +320,9 @@
return app.run(args);
}
+ // The argument which should be used to request advanced mode.
+ private BooleanArgument advancedModeArgument;
+
// Flag indicating whether or not the application environment has
// already been initialized.
private boolean environmentInitialized = false;
@@ -408,6 +421,15 @@
/**
* {@inheritDoc}
*/
+ public boolean isAdvancedMode() {
+ return advancedModeArgument.isPresent();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
public boolean isInteractive() {
return !noPromptArgument.isPresent();
}
@@ -486,6 +508,10 @@
OPTION_LONG_NO_PROMPT,
INFO_DESCRIPTION_NO_PROMPT.get());
+ advancedModeArgument = new BooleanArgument(OPTION_DSCFG_LONG_ADVANCED,
+ OPTION_DSCFG_SHORT_ADVANCED, OPTION_DSCFG_LONG_ADVANCED,
+ INFO_DSCFG_DESCRIPTION_ADVANCED.get());
+
showUsageArgument = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
OPTION_LONG_HELP, INFO_DSCFG_DESCRIPTION_SHOW_GROUP_USAGE_SUMMARY
.get());
@@ -497,6 +523,7 @@
parser.addGlobalArgument(quietArgument);
parser.addGlobalArgument(scriptFriendlyArgument);
parser.addGlobalArgument(noPromptArgument);
+ parser.addGlobalArgument(advancedModeArgument);
// Register any global arguments required by the management
// context factory.
--
Gitblit v1.10.0