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-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index ccee29a..25e2cff 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -226,19 +226,20 @@
connectionFactory = connectionFactoryProvider.getAuthenticatedConnectionFactory();
} catch (final ArgumentException ae) {
- final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- errPrintln(message);
+ argParser.displayMessageAndUsageReference(getErrStream(), ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
try {
final int versionNumber = version.getIntValue();
if (versionNumber != 2 && versionNumber != 3) {
- errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
+ argParser.displayMessageAndUsageReference(
+ getErrStream(), ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
} catch (final ArgumentException ae) {
- errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
+ argParser.displayMessageAndUsageReference(
+ getErrStream(), ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -246,8 +247,7 @@
final ArrayList<String> attrAndDNStrings = argParser.getTrailingArguments();
if (attrAndDNStrings.isEmpty()) {
- final LocalizableMessage message = ERR_LDAPCOMPARE_NO_ATTR.get();
- errPrintln(message);
+ argParser.displayMessageAndUsageReference(getErrStream(), ERR_LDAPCOMPARE_NO_ATTR.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -258,23 +258,22 @@
// If no DNs were provided, then exit with an error.
if (dnStrings.isEmpty() && !filename.isPresent()) {
- errPrintln(ERR_LDAPCOMPARE_NO_DNS.get());
+ argParser.displayMessageAndUsageReference(getErrStream(), ERR_LDAPCOMPARE_NO_DNS.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
/* If trailing DNs were provided and the filename argument was also
provided, exit with an error.*/
if (!dnStrings.isEmpty() && filename.isPresent()) {
- errPrintln(ERR_LDAPCOMPARE_FILENAME_AND_DNS.get());
+ argParser.displayMessageAndUsageReference(getErrStream(), ERR_LDAPCOMPARE_FILENAME_AND_DNS.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
// parse the attribute string
final int idx = attributeString.indexOf(":");
if (idx == -1) {
- final LocalizableMessage message =
- ERR_LDAPCOMPARE_INVALID_ATTR_STRING.get(attributeString);
- errPrintln(message);
+ argParser.displayMessageAndUsageReference(
+ getErrStream(), ERR_LDAPCOMPARE_INVALID_ATTR_STRING.get(attributeString));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
final String attributeType = attributeString.substring(0, idx);
--
Gitblit v1.10.0