From cc95119cae4bc3417bcaac50af3bdd54ef3c1ad1 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:44:57 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
index 2465c7f..a4a2319 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
@@ -21,6 +21,8 @@
import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_PORT_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_ROOT_USER_PWD_FILE_PLACEHOLDER;
+import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;
+
import static org.opends.messages.ToolMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
@@ -504,7 +506,7 @@
if (directoryManagerPwdStringArg.isPresent() &&
directoryManagerPwdFileArg.isPresent())
{
- errorMessages.add(ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS.get(
+ errorMessages.add(ERR_TOOL_CONFLICTING_ARGS.get(
directoryManagerPwdStringArg.getLongIdentifier(),
directoryManagerPwdFileArg.getLongIdentifier()));
}
@@ -680,7 +682,7 @@
if (keyStorePasswordArg.isPresent() &&
keyStorePasswordFileArg.isPresent())
{
- errorMessages.add(ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS.get(
+ errorMessages.add(ERR_TOOL_CONFLICTING_ARGS.get(
keyStorePasswordArg.getLongIdentifier(),
keyStorePasswordFileArg.getLongIdentifier()));
}
--
Gitblit v1.10.0