From 9ea7b3f8b3730a5be6c441ed1a6e52b00eb1233f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Feb 2014 09:49:48 +0000
Subject: [PATCH] OPENDJ-1337 Remove all code related to dsframework
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 ae770fe..b5053a3 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,11 +27,6 @@
package org.opends.guitools.uninstaller;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
-import static org.opends.server.tools.ToolConstants.*;
-
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -41,12 +36,18 @@
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 org.opends.server.tools.ToolConstants;
+
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.*;
+
/**
* Class used to parse and populate the arguments of the Uninstaller.
*
@@ -249,6 +250,7 @@
* @return <CODE>true</CODE> if the user specified to have a verbose
* uninstall and <CODE>false</CODE> otherwise.
*/
+ @Override
public boolean isVerbose()
{
return verboseArg.isPresent();
@@ -373,6 +375,7 @@
* @param buf the LocalizableMessageBuilder to write the error messages.
* @return return code.
*/
+ @Override
public int validateGlobalOptions(LocalizableMessageBuilder buf)
{
int returnValue;
@@ -397,13 +400,13 @@
removeBackupFilesArg,
removeLDIFFilesArg
};
- for (int i=0; i<removeArgs.length; i++)
+ for (BooleanArgument removeArg : removeArgs)
{
- if (removeArgs[i].isPresent())
+ if (removeArg.isPresent())
{
LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
removeAllArg.getLongIdentifier(),
- removeArgs[i].getLongIdentifier());
+ removeArg.getLongIdentifier());
if (buf.length() > 0)
{
buf.append(EOL);
@@ -415,11 +418,11 @@
super.validateGlobalOptions(buf);
if (buf.length() > 0)
{
- returnValue = CONFLICTING_ARGS.getReturnCode();
+ returnValue = ErrorReturnCode.CONFLICTING_ARGS.getReturnCode();
}
else
{
- returnValue = SUCCESSFUL_NOP.getReturnCode();
+ returnValue = ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode();
}
return returnValue;
}
--
Gitblit v1.10.0