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/LDIFDiff.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
index 299f5ba..df69f58 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
@@ -71,11 +71,13 @@
 
 import static org.opends.messages.ToolMessages.*;
 import static org.opends.server.protocols.ldap.LDAPResultCode.*;
+
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
 
 import static org.opends.server.util.CollectionUtils.*;
 import static org.opends.server.util.ServerConstants.*;
-import static com.forgerock.opendj.cli.Utils.filterExitCode;
+
+import static com.forgerock.opendj.cli.Utils.*;
 
 /**
  * This class provides a program that may be used to determine the differences
@@ -252,8 +254,7 @@
     }
     catch (ArgumentException ae)
     {
-      LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
-      err.println(message);
+      printWrappedText(err, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
       return OPERATIONS_ERROR;
     }
 
@@ -265,8 +266,7 @@
     }
     catch (ArgumentException ae)
     {
-      LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-      err.println(message);
+      printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
       err.println(argParser.getUsage());
       return CLIENT_SIDE_PARAM_ERROR;
     }
@@ -309,7 +309,7 @@
         }
         catch (Exception e)
         {
-          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
+          printWrappedText(err, ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
           return OPERATIONS_ERROR;
         }
 
@@ -320,7 +320,7 @@
         }
         catch (Exception e)
         {
-          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
+          printWrappedText(err, ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
           return OPERATIONS_ERROR;
         }
 
@@ -330,7 +330,7 @@
         }
         catch (Exception e)
         {
-          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
+          printWrappedText(err, ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
           return OPERATIONS_ERROR;
         }
       }
@@ -356,7 +356,7 @@
       }
       catch (Exception e)
       {
-        err.println(ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS.get(ignoreAttrsFile.getValue(), e));
+        printWrappedText(err, ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS.get(ignoreAttrsFile.getValue(), e));
         return OPERATIONS_ERROR;
       }
       finally
@@ -390,7 +390,7 @@
       }
       catch (Exception e)
       {
-        err.println(ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES.get(ignoreEntriesFile.getValue(), e));
+        printWrappedText(err, ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES.get(ignoreEntriesFile.getValue(), e));
         return OPERATIONS_ERROR;
       }
       finally
@@ -408,7 +408,7 @@
     }
     catch (Exception e)
     {
-      err.println(ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
+      printWrappedText(err, ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
       return OPERATIONS_ERROR;
     }
 
@@ -431,7 +431,7 @@
     }
     catch (Exception e)
     {
-      err.println(ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
+      printWrappedText(err, ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
       return OPERATIONS_ERROR;
     }
     finally
@@ -448,7 +448,7 @@
     }
     catch (Exception e)
     {
-      err.println(ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF.get(targetLDIF.getValue(), e));
+      printWrappedText(err, ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF.get(targetLDIF.getValue(), e));
       return OPERATIONS_ERROR;
     }
 
@@ -471,7 +471,7 @@
     }
     catch (Exception e)
     {
-      err.println(ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF.get(targetLDIF.getValue(), e));
+      printWrappedText(err, ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF.get(targetLDIF.getValue(), e));
       return OPERATIONS_ERROR;
     }
     finally
@@ -507,7 +507,7 @@
     }
     catch (Exception e)
     {
-      err.println(ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT.get(e));
+      printWrappedText(err, ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT.get(e));
       return OPERATIONS_ERROR;
     }
 
@@ -683,7 +683,7 @@
     }
     catch (IOException e)
     {
-      err.println(ERR_LDIFDIFF_ERROR_WRITING_OUTPUT.get(e));
+      printWrappedText(err, ERR_LDIFDIFF_ERROR_WRITING_OUTPUT.get(e));
       return OPERATIONS_ERROR;
     }
     finally

--
Gitblit v1.10.0