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-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
index af1b1ae..f8993db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
@@ -426,8 +426,7 @@
}
catch (ArgumentException ae)
{
- printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -492,31 +491,27 @@
{
if (!bindPW.isPresent() && !bindPWFile.isPresent())
{
- printWrappedText(err, ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER.get());
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER.get());
return CLIENT_SIDE_PARAM_ERROR;
}
}
else if (bindPW.isPresent() || bindPWFile.isPresent())
{
- printWrappedText(err, ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER.get());
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER.get());
return CLIENT_SIDE_PARAM_ERROR;
}
else
{
if (provideDNForAuthzID.isPresent())
{
- printWrappedText(
- err, ERR_LDAPPWMOD_DEPENDENT_ARGS.get(provideDNForAuthzID.getLongIdentifier(), bindDN.getLongIdentifier()));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err,
+ ERR_LDAPPWMOD_DEPENDENT_ARGS.get(provideDNForAuthzID.getLongIdentifier(), bindDN.getLongIdentifier()));
return CLIENT_SIDE_PARAM_ERROR;
}
if (!authzID.isPresent() || (!currentPW.isPresent() && !currentPWFile.isPresent()))
{
- printWrappedText(err, ERR_LDAPPWMOD_ANON_REQUIRES_AUTHZID_AND_CURRENTPW.get());
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_LDAPPWMOD_ANON_REQUIRES_AUTHZID_AND_CURRENTPW.get());
return CLIENT_SIDE_PARAM_ERROR;
}
}
@@ -547,7 +542,6 @@
if(ctrl == null)
{
printWrappedText(err, ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString));
- err.println(argParser.getUsage());
return CLIENT_SIDE_PARAM_ERROR;
}
controls.add(ctrl);
--
Gitblit v1.10.0