From 4e4b322332130bf466e3bdbd9cd7c4ca832d1049 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Jul 2015 13:29:00 +0000
Subject: [PATCH] OPENDJ-2027 (CR-7617) Code cleanup

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java |   51 ++++++++++++++++-----------------------------------
 1 files changed, 16 insertions(+), 35 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 364838a..5066609 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
@@ -153,9 +153,7 @@
     }
     catch (ArgumentException ae)
     {
-      final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
-
-      err.println(wrapText(message, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
       return 1;
     }
 
@@ -166,9 +164,7 @@
     }
     catch (ArgumentException ae)
     {
-      final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-
-      err.println(wrapText(message, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
       err.println(argParser.getUsage());
       return 1;
     }
@@ -192,53 +188,42 @@
         && !rebuildAll.isPresent()
         && !rebuildDegraded.isPresent())
     {
-      final LocalizableMessage message =
-          ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX.get();
-
-      err.println(wrapText(message, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX.get());
       err.println(argParser.getUsage());
       return 1;
     }
 
     if (rebuildAll.isPresent() && indexList.isPresent())
     {
-      final LocalizableMessage msg = ERR_REBUILDINDEX_REBUILD_ALL_ERROR.get();
-      err.println(wrapText(msg, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_ERROR.get());
       err.println(argParser.getUsage());
       return 1;
     }
 
     if (rebuildDegraded.isPresent() && indexList.isPresent())
     {
-      final LocalizableMessage msg = ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("index");
-      err.println(wrapText(msg, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("index"));
       err.println(argParser.getUsage());
       return 1;
     }
 
     if (rebuildDegraded.isPresent() && clearDegradedState.isPresent())
     {
-      final LocalizableMessage msg =
-          ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("clearDegradedState");
-      err.println(wrapText(msg, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get("clearDegradedState"));
       err.println(argParser.getUsage());
       return 1;
     }
 
     if (rebuildAll.isPresent() && rebuildDegraded.isPresent())
     {
-      final LocalizableMessage msg =
-          ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildDegraded");
-      err.println(wrapText(msg, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildDegraded"));
       err.println(argParser.getUsage());
       return 1;
     }
 
     if (rebuildAll.isPresent() && clearDegradedState.isPresent())
     {
-      final LocalizableMessage msg =
-          ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("clearDegradedState");
-      err.println(wrapText(msg, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("clearDegradedState"));
       err.println(argParser.getUsage());
       return 1;
     }
@@ -250,7 +235,7 @@
     }
     catch (InitializationException e)
     {
-      err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
+      printWrappedText(err, e.getMessage());
       return 1;
     }
     return process(argParser, initializeServer, out, err);
@@ -445,9 +430,7 @@
     }
     catch (Exception e)
     {
-      final LocalizableMessage message =
-          ERR_SERVER_BOOTSTRAP_ERROR.get(getExceptionMessage(e));
-      err.println(wrapText(message, MAX_LINE_WIDTH));
+      printWrappedText(err, ERR_SERVER_BOOTSTRAP_ERROR.get(getExceptionMessage(e)));
       return 1;
     }
 
@@ -458,7 +441,7 @@
     }
     catch (Exception ex)
     {
-      err.println(toErrorMsg(ERR_CANNOT_LOAD_CONFIG, ex));
+      printWrappedText(err, toErrorMsg(ERR_CANNOT_LOAD_CONFIG, ex));
       return 1;
     }
 
@@ -469,7 +452,7 @@
     }
     catch (Exception e)
     {
-      err.println(toErrorMsg(ERR_CANNOT_LOAD_SCHEMA, e));
+      printWrappedText(err, toErrorMsg(ERR_CANNOT_LOAD_SCHEMA, e));
       return 1;
     }
 
@@ -481,7 +464,7 @@
     }
     catch (Exception ex)
     {
-      err.println(toErrorMsg(ERR_CANNOT_INITIALIZE_CORE_CONFIG, ex));
+      printWrappedText(err, toErrorMsg(ERR_CANNOT_INITIALIZE_CORE_CONFIG, ex));
       return 1;
     }
 
@@ -492,7 +475,7 @@
     }
     catch (Exception ex)
     {
-      err.println(toErrorMsg(ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER, ex));
+      printWrappedText(err, toErrorMsg(ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER, ex));
       return 1;
     }
 
@@ -698,8 +681,7 @@
       }
       catch (ArgumentException ae)
       {
-        final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
-        out.println(wrapText(message, MAX_LINE_WIDTH));
+        printWrappedText(out, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
         return 1;
       }
 
@@ -709,8 +691,7 @@
       }
       catch (ArgumentException ae)
       {
-        final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-        out.println(wrapText(message, MAX_LINE_WIDTH));
+        printWrappedText(out, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
         return 1;
       }
 

--
Gitblit v1.10.0