From 1a9b0c4c35b0fbcc2cf09db1f40a17fc76cb4a90 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 09:54:47 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index e788d64..42c0ae8 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -27,6 +27,11 @@
package org.opends.guitools.uninstaller;
+import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_REFERENCED_HOST_NAME;
+import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HOST;
+import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;
+import static com.forgerock.opendj.cli.CliMessages.*;
+
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -36,20 +41,14 @@
import org.opends.quicksetup.UserData;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.admin.client.cli.SecureConnectionCliParser;
-import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
-
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.CommonArguments;
+import com.forgerock.opendj.cli.ReturnCode;
import com.forgerock.opendj.cli.StringArgument;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;
-
/**
* Class used to parse and populate the arguments of the Uninstaller.
*
@@ -70,7 +69,7 @@
private StringArgument referencedHostNameArg;
- // This CLI is always using the administration connector with SSL
+ /** This CLI is always using the administration connector with SSL. */
private final boolean alwaysSSL = true;
/**
@@ -372,12 +371,11 @@
@Override
public int validateGlobalOptions(LocalizableMessageBuilder buf)
{
- int returnValue;
if (!noPromptArg.isPresent() && forceOnErrorArg.isPresent())
{
- LocalizableMessage message = ERR_UNINSTALL_FORCE_REQUIRES_NO_PROMPT.get(
- "--"+forceOnErrorArg.getLongIdentifier(),
- "--"+noPromptArg.getLongIdentifier());
+ final LocalizableMessage message =
+ ERR_TOOL_CONFLICTING_ARGS.get(forceOnErrorArg.getLongIdentifier(),
+ noPromptArg.getLongIdentifier());
if (buf.length() > 0)
{
buf.append(LINE_SEPARATOR);
@@ -412,13 +410,9 @@
super.validateGlobalOptions(buf);
if (buf.length() > 0)
{
- returnValue = ErrorReturnCode.CONFLICTING_ARGS.getReturnCode();
+ return ReturnCode.CONFLICTING_ARGS.get();
}
- else
- {
- returnValue = ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode();
- }
- return returnValue;
+ return ReturnCode.SUCCESS.get();
}
/**
--
Gitblit v1.10.0