From 0fd845d18cfaf23fc9f54e92775c735955e4e859 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 27 Jul 2015 09:02:08 +0000
Subject: [PATCH] OPENDJ-2027 CR-7646 Change tools message on error
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 4147e59..cf62c10 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -963,13 +963,6 @@
return verboseArgument.isPresent();
}
- /** Displays the provided error message followed by a help usage reference. */
- private void displayErrorMessageAndUsageReference(LocalizableMessage message) {
- errPrintln(message);
- errPrintln();
- errPrintln(parser.getHelpUsageReference());
- }
-
/**
* Registers the global arguments with the argument parser.
*
@@ -1123,7 +1116,7 @@
parser.parseArguments(args);
checkForConflictingArguments();
} catch (ArgumentException ae) {
- displayErrorMessageAndUsageReference(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ parser.displayMessageAndUsageReference(getErrStream(), ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return ReturnCode.CONFLICTING_ARGS.get();
}
@@ -1150,7 +1143,7 @@
try {
factory = new LDAPManagementContextFactory(cfp);
} catch (ArgumentException e) {
- displayErrorMessageAndUsageReference(ERR_ERROR_PARSING_ARGS.get(e.getMessage()));
+ parser.displayMessageAndUsageReference(getErrStream(), ERR_ERROR_PARSING_ARGS.get(e.getMessage()));
return ReturnCode.CONFLICTING_ARGS.get();
}
@@ -1167,8 +1160,8 @@
// Top-level interactive mode.
retCode = runInteractiveMode();
} else {
- displayErrorMessageAndUsageReference(
- ERR_ERROR_PARSING_ARGS.get(ERR_DSCFG_ERROR_MISSING_SUBCOMMAND.get()));
+ parser.displayMessageAndUsageReference(
+ getErrStream(), ERR_ERROR_PARSING_ARGS.get(ERR_DSCFG_ERROR_MISSING_SUBCOMMAND.get()));
retCode = ReturnCode.ERROR_USER_DATA.get();
}
} else {
@@ -1277,7 +1270,10 @@
try {
// Force retrieval of management context.
factory.getManagementContext(app);
- } catch (ArgumentException | ClientException e) {
+ } catch (ArgumentException e) {
+ parser.displayMessageAndUsageReference(getErrStream(), e.getMessageObject());
+ return ReturnCode.ERROR_USER_DATA.get();
+ } catch (ClientException e) {
app.errPrintln(e.getMessageObject());
return ReturnCode.ERROR_UNEXPECTED.get();
}
--
Gitblit v1.10.0