From 88496c3a54b4c6e969cb0dce5cf67e5da6846740 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 13:59:39 +0000
Subject: [PATCH] OPENDJ-2772 Code cleanup
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
index a150056..1094b5e 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
@@ -17,6 +17,7 @@
package com.forgerock.opendj.ldap.tools;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.CommonArguments.showUsageArgument;
import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
@@ -70,8 +71,10 @@
/** Run Make LDIF with provided command-line arguments. */
int run(final String[] args) {
final LocalizableMessage toolDescription = INFO_MAKELDIF_TOOL_DESCRIPTION.get();
- final ArgumentParser argParser = new ArgumentParser(MakeLDIF.class.getName(), toolDescription,
- false, true, 1, 1, "template-file-path");
+ final ArgumentParser argParser = LDAPToolArgumentParser.builder(MakeLDIF.class.getName())
+ .toolDescription(toolDescription)
+ .trailingArguments(1, "template-file-path")
+ .build();
argParser.setVersionHandler(newSdkVersionHandler());
argParser.setShortToolDescription(REF_SHORT_DESC_MAKELDIF.get());
argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_MAKELDIF.get());
@@ -110,11 +113,9 @@
.multiValued()
.valuePlaceholder(INFO_CONSTANT_PLACEHOLDER.get())
.buildAndAddToParser(argParser);
- showUsage =
- BooleanArgument.builder(OPTION_LONG_HELP)
- .shortIdentifier(OPTION_SHORT_HELP)
- .description(INFO_MAKELDIF_DESCRIPTION_HELP.get())
- .buildAndAddToParser(argParser);
+
+ showUsage = showUsageArgument();
+ argParser.addArgument(showUsage);
wrapColumn =
IntegerArgument.builder("wrapColumn")
--
Gitblit v1.10.0