From 1932d41262099a16f43749a90677366818b3664c 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] OPENDJ-2701 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 c4b6aaa..0e87337 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
@@ -25,6 +25,7 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedHashSet;
+import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -159,20 +160,20 @@
quietArg = quietArgument();
args.add(quietArg);
- ArrayList<Argument> defaultArgs = new ArrayList<>(createGlobalArguments(outStream, alwaysSSL));
+ final List<Argument> defaultArgs = new ArrayList<>(createGlobalArguments(outStream, alwaysSSL));
secureArgsList.createVisibleAdminUidArgument(INFO_DESCRIPTION_ADMIN_UID.get());
- int index = defaultArgs.indexOf(secureArgsList.bindDnArg);
+ int index = defaultArgs.indexOf(secureArgsList.getBindDnArg());
if (index != -1)
{
- defaultArgs.add(index, secureArgsList.adminUidArg);
- defaultArgs.remove(secureArgsList.bindDnArg);
+ defaultArgs.add(index, secureArgsList.getAdminUidArg());
+ defaultArgs.remove(secureArgsList.getBindDnArg());
}
else
{
- defaultArgs.add(secureArgsList.adminUidArg);
+ defaultArgs.add(secureArgsList.getAdminUidArg());
}
- defaultArgs.remove(secureArgsList.hostNameArg);
- defaultArgs.remove(secureArgsList.portArg);
+ defaultArgs.remove(secureArgsList.getHostNameArg());
+ defaultArgs.remove(secureArgsList.getPortArg());
referencedHostNameArg =
StringArgument.builder(OPTION_LONG_REFERENCED_HOST_NAME)
.shortIdentifier(OPTION_SHORT_HOST)
@@ -314,7 +315,7 @@
*/
public String getDefaultAdministratorUID()
{
- return secureArgsList.adminUidArg.getDefaultValue();
+ return secureArgsList.getAdminUidArg().getDefaultValue();
}
/**
--
Gitblit v1.10.0