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/LDAPDelete.java |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
index 409ad41..30db426 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
@@ -197,9 +197,8 @@
         }
         else
         {
-          LocalizableMessage msg = INFO_OPERATION_FAILED.get("DELETE");
-          err.println(wrapText(msg, MAX_LINE_WIDTH));
-          err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
+          printWrappedText(err, INFO_OPERATION_FAILED.get("DELETE"));
+          printWrappedText(err, ae.getMessage());
           return;
         }
       }
@@ -549,8 +548,7 @@
       argParser.setUsageArgument(showUsage, out);
     } catch (ArgumentException ae)
     {
-      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 CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -561,8 +559,7 @@
     }
     catch (ArgumentException ae)
     {
-      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 CLIENT_SIDE_PARAM_ERROR;
     }
@@ -576,10 +573,8 @@
 
     if(bindPassword.isPresent() && bindPasswordFile.isPresent())
     {
-      LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
-              bindPassword.getLongIdentifier(),
-              bindPasswordFile.getLongIdentifier());
-      err.println(wrapText(message, MAX_LINE_WIDTH));
+      printWrappedText(
+          err, ERR_TOOL_CONFLICTING_ARGS.get(bindPassword.getLongIdentifier(), bindPasswordFile.getLongIdentifier()));
       return CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -592,7 +587,7 @@
     } catch(ArgumentException ae)
     {
       logger.traceException(ae);
-      err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
+      printWrappedText(err, ae.getMessage());
       return CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -601,14 +596,14 @@
       int versionNumber = version.getIntValue();
       if(versionNumber != 2 && versionNumber != 3)
       {
-        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber), MAX_LINE_WIDTH));
+        printWrappedText(err, ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber));
         return CLIENT_SIDE_PARAM_ERROR;
       }
       connectionOptions.setVersionNumber(versionNumber);
     } catch(ArgumentException ae)
     {
       logger.traceException(ae);
-      err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
+      printWrappedText(err, ae.getMessage());
       return CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -623,7 +618,7 @@
     catch (Exception ex)
     {
       logger.traceException(ex);
-      err.println(wrapText(ex.getMessage(), MAX_LINE_WIDTH));
+      printWrappedText(err, ex.getMessage());
       return CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -663,8 +658,7 @@
         Control ctrl = LDAPToolUtils.getControl(ctrlString, err);
         if(ctrl == null)
         {
-          LocalizableMessage message = ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
-          err.println(wrapText(message, MAX_LINE_WIDTH));
+          printWrappedText(err, ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString));
           err.println(argParser.getUsage());
           return CLIENT_SIDE_PARAM_ERROR;
         }
@@ -704,14 +698,12 @@
     {
       if(!connectionOptions.useSSL() && !connectionOptions.useStartTLS())
       {
-        LocalizableMessage message = ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS.get();
-        err.println(wrapText(message, MAX_LINE_WIDTH));
+        printWrappedText(err, ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS.get());
         return CLIENT_SIDE_PARAM_ERROR;
       }
       if(keyStorePathValue == null)
       {
-        LocalizableMessage message = ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE.get();
-        err.println(wrapText(message, MAX_LINE_WIDTH));
+        printWrappedText(err, ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE.get());
         return CLIENT_SIDE_PARAM_ERROR;
       }
     }
@@ -789,7 +781,7 @@
     } catch(Exception e)
     {
       logger.traceException(e);
-      err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
+      printWrappedText(err, e.getMessage());
       return 1;
     } finally
     {

--
Gitblit v1.10.0