From 221b6a91c54d11edc7808875ae705b931c0c9406 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 30 Jan 2015 14:45:36 +0000
Subject: [PATCH] Stopped execution of dsconfig after generating the reference documentation
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
index f403135..110acc1 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
@@ -764,7 +764,6 @@
* The subcommand for which to display the usage information.
*/
public void getSubCommandUsage(StringBuilder buffer, SubCommand subCommand) {
- setUsageOrVersionDisplayed(true);
String scriptName = System.getProperty(PROPERTY_SCRIPT_NAME);
if (scriptName == null || scriptName.length() == 0) {
scriptName = "java " + getMainClassName();
@@ -834,12 +833,10 @@
public String getUsage() {
final StringBuilder buffer = new StringBuilder();
+ setUsageOrVersionDisplayed(true);
if (subCommand == null) {
if (System.getProperty("org.forgerock.opendj.gendoc") != null) {
- // Generate reference documentation for dsconfig subcommands
- for (SubCommand s : subCommands.values()) {
- buffer.append(toRefSect2(s));
- }
+ generateReferenceDoc(buffer, subCommands.values());
} else if (usageGroupArguments.size() > 1) {
// We have sub-command groups, so don't display any
// sub-commands by default.
@@ -906,12 +903,8 @@
writeToUsageOutputStream(buffer);
}
- /**
- * Appends complete usage information for the specified set of sub-commands.
- */
+ /** Appends complete usage information for the specified set of sub-commands. */
private void getFullUsage(Collection<SubCommand> c, boolean showGlobalOptions, StringBuilder buffer) {
- setUsageOrVersionDisplayed(true);
-
final LocalizableMessage toolDescription = getToolDescription();
if (toolDescription != null && toolDescription.length() > 0) {
buffer.append(wrapText(toolDescription, MAX_LINE_WIDTH - 1));
@@ -1113,6 +1106,13 @@
}
}
+ /** Generate reference documentation for dsconfig subcommands. */
+ private void generateReferenceDoc(final StringBuilder buffer, Collection<SubCommand> values) {
+ for (SubCommand s : values) {
+ buffer.append(toRefSect2(s));
+ }
+ }
+
/**
* Generate reference documentation for dsconfig subcommands in DocBook 5 XML format. As the number of categories is
* large, the subcommand entries are sorted here by name for inclusion in a <refsect1> covering all dsconfig
--
Gitblit v1.10.0