From df8adb05fcf4cbb21941c2a033e0919d1c885325 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 15 Dec 2015 09:29:28 +0000
Subject: [PATCH] CommonArguments.java: Renamed getVersion() to getLdapVersion().
---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 2 +-
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java | 12 ++++++------
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 2 +-
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 2 +-
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
index 9e9c041..ba719ec 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
@@ -195,16 +195,16 @@
}
/**
- * Returns the "version" integer argument.
+ * Returns the "ldapVersion" integer argument.
*
- * @return The "version" argument.
+ * @return The "ldapVersion" argument.
* @throws ArgumentException
* If there is a problem with any of the parameters used to create this argument.
*/
- public static IntegerArgument getVersion() throws ArgumentException {
- return new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION, OPTION_LONG_PROTOCOL_VERSION, false,
- false, true, INFO_PROTOCOL_VERSION_PLACEHOLDER.get(), 3, OPTION_LONG_PROTOCOL_VERSION,
- INFO_DESCRIPTION_VERSION.get());
+ public static IntegerArgument getLdapVersion() throws ArgumentException {
+ return new IntegerArgument(OPTION_LONG_PROTOCOL_VERSION.toLowerCase(), OPTION_SHORT_PROTOCOL_VERSION,
+ OPTION_LONG_PROTOCOL_VERSION, false, false, true, INFO_PROTOCOL_VERSION_PLACEHOLDER.get(), 3,
+ OPTION_LONG_PROTOCOL_VERSION, INFO_DESCRIPTION_VERSION.get());
}
/**
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index a76f212..72a57d7 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -193,7 +193,7 @@
controlStr = CommonArguments.getControl();
argParser.addArgument(controlStr);
- version = CommonArguments.getVersion();
+ version = CommonArguments.getLdapVersion();
argParser.addArgument(version);
encodingStr = CommonArguments.getEncoding();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index 1dd5c39..59defe8 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -332,7 +332,7 @@
controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
- version = CommonArguments.getVersion();
+ version = CommonArguments.getLdapVersion();
argParser.addArgument(version);
encodingStr =
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index db4a9bd..480ad9f 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -169,7 +169,7 @@
controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
- version = CommonArguments.getVersion();
+ version = CommonArguments.getLdapVersion();
argParser.addArgument(version);
verbose = CommonArguments.getVerbose();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index ca62f2d..7eb772b 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -369,7 +369,7 @@
effectiveRightsAttrs.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSATTR);
argParser.addArgument(effectiveRightsAttrs);
- version = CommonArguments.getVersion();
+ version = CommonArguments.getLdapVersion();
argParser.addArgument(version);
final StringArgument encodingStr =
--
Gitblit v1.10.0