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/dsreplication/ReplicationCliMain.java | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index a883bd3..3a74823 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -374,9 +374,7 @@
}
catch (ArgumentException ae)
{
- errPrintln(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
- errPrintln();
- errPrintln(LocalizableMessage.raw(argParser.getUsage()));
+ argParser.displayMessageAndUsageReference(getErrStream(), ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
logger.error(LocalizableMessage.raw("Complete error stack:"), ae);
return ERROR_USER_DATA;
}
@@ -1843,9 +1841,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception " + ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
return null;
}
firstTry = false;
@@ -1962,9 +1958,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception "+ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
cancelled = true;
}
}
@@ -2226,9 +2220,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception "+ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
cancelled = true;
}
finally
@@ -2535,9 +2527,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception "+ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
cancelled = true;
}
}
@@ -2824,9 +2814,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception " + ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
return null;
}
}
@@ -2944,9 +2932,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception "+ae));
- errPrintln();
- errPrintln(ae.getMessageObject());
- errPrintln();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
cancelled = true;
}
}
@@ -3020,9 +3006,7 @@
catch (ArgumentException ae)
{
logger.warn(LocalizableMessage.raw("Argument exception "+ae));
- println();
- println(ae.getMessageObject());
- println();
+ argParser.displayMessageAndUsageReference(getErrStream(), ae.getMessageObject());
cancelled = true;
}
}
--
Gitblit v1.10.0