From 0f8c0db941311b7e34f0abc3299385175b9051cb Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 15:33:02 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - replaced ToolConstants by ArgumentConstants. - deleted ToolConstants.
---
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 9a4d190..5ff3953 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -62,6 +62,7 @@
import static org.opends.quicksetup.util.Utils.getMessage;
import static org.opends.quicksetup.util.Utils.getMessageFromCollection;
import static org.opends.quicksetup.util.Utils.getServerClock;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.admin.*;
import org.opends.server.admin.client.ManagementContext;
@@ -75,7 +76,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.tools.tasks.TaskScheduleInteraction;
import org.opends.server.tools.tasks.TaskScheduleUserData;
@@ -147,7 +147,6 @@
ERR_CONFIRMATION_TRIES_LIMIT_REACHED;
import static org.opends.quicksetup.util.Utils.getFirstValue;
import static org.opends.quicksetup.util.Utils.getThrowableMsg;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
import static org.opends.server.util.StaticUtils.close;
@@ -583,7 +582,7 @@
else
{
println(ERR_REPLICATION_VALID_SUBCOMMAND_NOT_FOUND.get(
- "--"+ToolConstants.OPTION_LONG_NO_PROMPT));
+ "--"+OPTION_LONG_NO_PROMPT));
println(LocalizableMessage.raw(argParser.getUsage()));
returnValue = ERROR_USER_DATA;
subcommandLaunched = false;
@@ -7718,7 +7717,7 @@
{
printer = new TextTablePrinter(out);
((TextTablePrinter)printer).setColumnSeparator(
- ToolConstants.LIST_TABLE_SEPARATOR);
+ LIST_TABLE_SEPARATOR);
}
tableBuilder.print(printer);
}
@@ -7788,7 +7787,7 @@
printer = new TextTablePrinter(getOutputStream());
((TextTablePrinter)printer).setColumnSeparator(
- ToolConstants.LIST_TABLE_SEPARATOR);
+ LIST_TABLE_SEPARATOR);
}
tableBuilder.print(printer);
}
--
Gitblit v1.10.0