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/RebuildIndex.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
index 5066609..f50c9fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
@@ -164,8 +164,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 1;
}
@@ -176,55 +175,43 @@
return 0;
}
- // If no arguments were provided, then display usage information and exit.
- final int numArgs = args.length;
- if (numArgs == 0)
- {
- out.println(argParser.getUsage());
- return 1;
- }
-
if (indexList.getValues().isEmpty()
&& !rebuildAll.isPresent()
&& !rebuildDegraded.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX.get());
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX.get());
return 1;
}
if (rebuildAll.isPresent() && indexList.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_ERROR.get());
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_REBUILDINDEX_REBUILD_ALL_ERROR.get());
return 1;
}
if (rebuildDegraded.isPresent() && indexList.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("index"));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("index"));
return 1;
}
if (rebuildDegraded.isPresent() && clearDegradedState.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("clearDegradedState"));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("clearDegradedState"));
return 1;
}
if (rebuildAll.isPresent() && rebuildDegraded.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildDegraded"));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err,
+ ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildDegraded"));
return 1;
}
if (rebuildAll.isPresent() && clearDegradedState.isPresent())
{
- printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("clearDegradedState"));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err,
+ ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("clearDegradedState"));
return 1;
}
@@ -691,7 +678,7 @@
}
catch (ArgumentException ae)
{
- printWrappedText(out, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ argParser.displayMessageAndUsageReference(out, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return 1;
}
--
Gitblit v1.10.0