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/upgrade/UpgradeCli.java |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
index 663164d..2eca4f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -219,14 +219,6 @@
     return acceptLicense.isPresent();
   }
 
-  /** Displays the provided message followed by a help usage reference. */
-  private void displayMessageAndUsageReference(final LocalizableMessage message)
-  {
-    println(message);
-    println();
-    println(parser.getHelpUsageReference());
-  }
-
   /** Initialize arguments provided by the command line. */
   private void initializeGlobalArguments() throws ArgumentException
   {
@@ -312,8 +304,7 @@
     }
     catch (ArgumentException ae)
     {
-      final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-      displayMessageAndUsageReference(message);
+      parser.displayMessageAndUsageReference(getErrStream(), ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
       return EXIT_CODE_ERROR;
     }
 

--
Gitblit v1.10.0