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/LDAPToolUtils.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
index aa5826e..c7c1bf0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
@@ -25,7 +25,11 @@
* Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.tools;
-import org.forgerock.i18n.LocalizableMessage;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
+import static com.forgerock.opendj.cli.Utils.*;
import java.io.File;
import java.io.FileInputStream;
@@ -33,15 +37,12 @@
import java.io.PrintStream;
import java.net.SocketTimeoutException;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.DN;
-import org.forgerock.opendj.ldap.ByteString;
-
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
@@ -143,7 +144,7 @@
controlCriticality = false;
} else
{
- err.println("Invalid format for criticality value:" + remainder);
+ printWrappedText(err, "Invalid format for criticality value:" + remainder);
return null;
}
return new LDAPControl(controlOID, controlCriticality);
@@ -158,7 +159,7 @@
controlCriticality = false;
} else
{
- err.println("Invalid format for criticality value:" + critical);
+ printWrappedText(err, "Invalid format for criticality value:" + critical);
return null;
}
@@ -226,7 +227,7 @@
// Ensure all the bytes have been read in
if (offset < val.length)
{
- err.println("Could not completely read file "+filePath);
+ printWrappedText(err, ERR_FILE_NOT_FULLY_READABLE.get(filePath));
return null;
}
--
Gitblit v1.10.0