From c928fc096ecc63d92c887dbe71b6f1bb38c8382a Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 12 Feb 2008 15:27:13 +0000
Subject: [PATCH] Fix for 2921 (setup CLI error message does not keep case of argument).
---
opends/src/server/org/opends/server/util/args/SubCommand.java | 6 ++++--
opends/src/server/org/opends/server/util/args/ArgumentParser.java | 15 +++++++++------
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 15 +++++++++------
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index 5432827..4953a33 100644
--- a/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -622,7 +622,7 @@
String conflictingName = longIDMap.get(longID).getName();
Message message = ERR_ARGPARSER_DUPLICATE_LONG_ID.get(
- argument.getName(), String.valueOf(longID), conflictingName);
+ argument.getName(), argument.getLongIdentifier(), conflictingName);
throw new ArgumentException(message);
}
}
@@ -860,6 +860,7 @@
}
// If we're not case-sensitive, then convert the name to lowercase.
+ String origArgName = argName;
if (! longArgumentsCaseSensitive)
{
argName = toLowerCase(argName);
@@ -898,7 +899,7 @@
{
// There is no such argument registered.
Message message =
- ERR_ARGPARSER_NO_ARGUMENT_WITH_LONG_ID.get(argName);
+ ERR_ARGPARSER_NO_ARGUMENT_WITH_LONG_ID.get(origArgName);
throw new ArgumentException(message);
}
}
@@ -929,7 +930,8 @@
if ((i+1) == numArguments)
{
Message message =
- ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID.get(argName);
+ ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID.get(
+ origArgName);
throw new ArgumentException(message);
}
@@ -940,7 +942,7 @@
if (! a.valueIsAcceptable(argValue, invalidReason))
{
Message message = ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID.get(
- argValue, argName, invalidReason.toString());
+ argValue, origArgName, invalidReason.toString());
throw new ArgumentException(message);
}
@@ -949,7 +951,7 @@
if (a.hasValue() && (! a.isMultiValued()))
{
Message message =
- ERR_ARGPARSER_NOT_MULTIVALUED_FOR_LONG_ID.get(argName);
+ ERR_ARGPARSER_NOT_MULTIVALUED_FOR_LONG_ID.get(origArgName);
throw new ArgumentException(message);
}
@@ -960,7 +962,8 @@
if (argValue != null)
{
Message message =
- ERR_ARGPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE.get(argName);
+ ERR_ARGPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE.get(
+ origArgName);
throw new ArgumentException(message);
}
}
diff --git a/opends/src/server/org/opends/server/util/args/SubCommand.java b/opends/src/server/org/opends/server/util/args/SubCommand.java
index 7a11bcf..6774afc 100644
--- a/opends/src/server/org/opends/server/util/args/SubCommand.java
+++ b/opends/src/server/org/opends/server/util/args/SubCommand.java
@@ -327,7 +327,8 @@
if (longIDMap.containsKey(longID))
{
Message message = ERR_ARG_SUBCOMMAND_DUPLICATE_LONG_ID.get(
- argumentName, name, longID, longIDMap.get(longID).getName());
+ argumentName, name, argument.getLongIdentifier(),
+ longIDMap.get(longID).getName());
throw new ArgumentException(message);
}
@@ -335,7 +336,8 @@
if (arg != null)
{
Message message = ERR_ARG_SUBCOMMAND_ARGUMENT_LONG_ID_GLOBAL_CONFLICT.
- get(argumentName, name, longID, arg.getName());
+ get(argumentName, name, argument.getLongIdentifier(),
+ arg.getName());
throw new ArgumentException(message);
}
}
diff --git a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index 658cd4c..247aa6c 100644
--- a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -506,7 +506,7 @@
String name = globalLongIDMap.get(longID).getName();
Message message = ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID.get(
- longID, argumentName, name);
+ argument.getLongIdentifier(), argumentName, name);
throw new ArgumentException(message);
}
@@ -518,7 +518,7 @@
String name = s.getArgument(longID).getName();
Message message = ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT.get(
- longID, argumentName, name, cmdName);
+ argument.getLongIdentifier(), argumentName, name, cmdName);
throw new ArgumentException(message);
}
}
@@ -782,6 +782,7 @@
}
// If we're not case-sensitive, then convert the name to lowercase.
+ String origArgName = argName;
if (! longArgumentsCaseSensitive)
{
argName = toLowerCase(argName);
@@ -823,7 +824,8 @@
{
// There is no such global argument.
Message message =
- ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_LONG_ID.get(argName);
+ ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_LONG_ID.get(
+ origArgName);
throw new ArgumentException(message);
}
}
@@ -861,7 +863,7 @@
{
// There is no such global or subcommand argument.
Message message =
- ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_LONG_ID.get(argName);
+ ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_LONG_ID.get(origArgName);
throw new ArgumentException(message);
}
}
@@ -912,7 +914,7 @@
if (a.hasValue() && (! a.isMultiValued()))
{
Message message =
- ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_LONG_ID.get(argName);
+ ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_LONG_ID.get(origArgName);
throw new ArgumentException(message);
}
@@ -923,7 +925,8 @@
if (argValue != null)
{
Message message =
- ERR_SUBCMDPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE.get(argName);
+ ERR_SUBCMDPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE.get(
+ origArgName);
throw new ArgumentException(message);
}
}
--
Gitblit v1.10.0