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/guitools/controlpanel/ControlPanelArgumentParser.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
index a9f9872..26784aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
@@ -28,6 +28,8 @@
 
 import static org.opends.messages.ToolMessages.*;
 
+import static com.forgerock.opendj.cli.CommonArguments.*;
+
 import java.util.LinkedHashSet;
 
 import org.forgerock.i18n.LocalizableMessage;
@@ -40,7 +42,6 @@
 import com.forgerock.opendj.cli.ArgumentException;
 import com.forgerock.opendj.cli.ArgumentParser;
 import com.forgerock.opendj.cli.BooleanArgument;
-import com.forgerock.opendj.cli.CommonArguments;
 import com.forgerock.opendj.cli.FileBasedArgument;
 import com.forgerock.opendj.cli.IntegerArgument;
 import com.forgerock.opendj.cli.StringArgument;
@@ -109,33 +110,33 @@
    */
   public void initializeArguments() throws ArgumentException
   {
-    hostNameArg = CommonArguments.getHostName(UserData.getDefaultHostName());
+    hostNameArg = hostNameArgument(UserData.getDefaultHostName());
     addArgument(hostNameArg);
 
     portArg =
-        CommonArguments.getPort(getDefaultAdministrationPort(),
+        portArgument(getDefaultAdministrationPort(),
             INFO_DESCRIPTION_ADMIN_PORT.get());
     addArgument(portArg);
 
-    bindDnArg = CommonArguments.getBindDN(getDefaultBindDN());
+    bindDnArg = bindDNArgument(getDefaultBindDN());
     addArgument(bindDnArg);
 
-    bindPasswordArg = CommonArguments.getBindPassword();
+    bindPasswordArg = bindPasswordArgument();
     addArgument(bindPasswordArg);
 
-    bindPasswordFileArg = CommonArguments.getBindPasswordFile();
+    bindPasswordFileArg = bindPasswordFileArgument();
     addArgument(bindPasswordFileArg);
 
-    trustAllArg = CommonArguments.getTrustAll();
+    trustAllArg = trustAllArgument();
     addArgument(trustAllArg);
 
-    remoteArg = CommonArguments.getRemote();
+    remoteArg = remoteArgument();
     addArgument(remoteArg);
 
-    connectTimeoutArg = CommonArguments.getConnectTimeOut();
+    connectTimeoutArg = connectTimeOutArgument();
     addArgument(connectTimeoutArg);
 
-    showUsageArg = CommonArguments.getShowUsage();
+    showUsageArg = showUsageArgument();
     addArgument(showUsageArg);
     setUsageArgument(showUsageArg);
   }

--
Gitblit v1.10.0