From 8ea2010f7120a470dfc2e9b4c45b9f0a85dea3d7 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] Very little fix in uninstall
---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 6 ++----
opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties | 2 ++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 7b0261f..83d6bd5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -19,7 +19,6 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
-import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;
import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.AdminToolMessages.*;
@@ -356,9 +355,8 @@
{
if (!noPromptArg.isPresent() && forceOnErrorArg.isPresent())
{
- final LocalizableMessage message =
- ERR_TOOL_CONFLICTING_ARGS.get(forceOnErrorArg.getLongIdentifier(),
- noPromptArg.getLongIdentifier());
+ final LocalizableMessage message = ERR_UNINSTALL_FORCE_REQUIRES_NO_PROMPT.get(
+ forceOnErrorArg.getLongIdentifier(), noPromptArg.getLongIdentifier());
if (buf.length() > 0)
{
buf.append(LINE_SEPARATOR);
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
index c979814..7df9281 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
@@ -529,6 +529,8 @@
but no action was required
ERR_REPLICATION_USER_CANCELLED=User cancelled the operation
ERR_REPLICATION_NO_MESSAGE=
+ERR_UNINSTALL_FORCE_REQUIRES_NO_PROMPT=The %s option only can be \
+ used when %s has been specified
INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED=Global Administrator \
must be created.%nYou must provide the credentials of the Global \
Administrator that will be created to manage the server instances that are \
--
Gitblit v1.10.0