From 24ccabcd125b7b60e10ff0ba1642938e033cb6d3 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 11 Feb 2016 14:17:36 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
index 15a21c1..fcaacfe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -27,6 +27,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
+import static com.forgerock.opendj.cli.CommonArguments.*;
import static javax.security.auth.callback.TextOutputCallback.*;
import static org.opends.messages.ToolMessages.*;
@@ -55,7 +56,6 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ClientException;
-import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
@@ -224,11 +224,11 @@
{
if (!globalArgumentsInitialized)
{
- configClass = CommonArguments.getConfigClass(ConfigFileHandler.class.getName());
- configFile = CommonArguments.getConfigFile();
- noPrompt = CommonArguments.getNoPrompt();
- verbose = CommonArguments.getVerbose();
- quietMode = CommonArguments.getQuiet();
+ configClass = configClassArgument(ConfigFileHandler.class.getName());
+ configFile = configFileArgument();
+ noPrompt = noPromptArgument();
+ verbose = verboseArgument();
+ quietMode = quietArgument();
ignoreErrors =
BooleanArgument.builder(OPTION_LONG_IGNORE_ERRORS)
.description(INFO_UPGRADE_OPTION_IGNORE_ERRORS.get())
@@ -237,8 +237,8 @@
BooleanArgument.builder(OPTION_LONG_FORCE_UPGRADE)
.description(INFO_UPGRADE_OPTION_FORCE.get(OPTION_LONG_NO_PROMPT))
.buildArgument();
- acceptLicense = CommonArguments.getAcceptLicense();
- showUsageArgument = CommonArguments.getShowUsage();
+ acceptLicense = acceptLicenseArgument();
+ showUsageArgument = showUsageArgument();
// Register the global arguments.
--
Gitblit v1.10.0