From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java
index 68f0aec..a29b1d9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -613,10 +613,8 @@
if (shortID != null && shortIDMap.containsKey(shortID))
{
String conflictingName = shortIDMap.get(shortID).getName();
-
- LocalizableMessage message = ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(
- argument.getName(), String.valueOf(shortID), conflictingName);
- throw new ArgumentException(message);
+ throw new ArgumentException(ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(
+ argument.getName(), shortID, conflictingName));
}
if (versionArgument != null
@@ -984,9 +982,8 @@
else
{
// There is no such argument registered.
- LocalizableMessage message = ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(
- String.valueOf(argCharacter));
- throw new ArgumentException(message);
+ throw new ArgumentException(
+ ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
}
}
else
@@ -1011,10 +1008,8 @@
{
if ((i+1) == numArguments)
{
- LocalizableMessage message =
- ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.
- get(String.valueOf(argCharacter));
- throw new ArgumentException(message);
+ throw new ArgumentException(
+ ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
}
argValue = rawArguments[++i];
@@ -1053,17 +1048,15 @@
if (b == null)
{
// There is no such argument registered.
- LocalizableMessage message = ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(
- String.valueOf(argCharacter));
- throw new ArgumentException(message);
+ throw new ArgumentException(
+ ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
}
else if (b.needsValue())
{
// This means we're in a scenario like "-abc" where b is a
// valid argument that takes a value. We don't support that.
- LocalizableMessage message = ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES.get(
- String.valueOf(argCharacter), argValue, String.valueOf(c));
- throw new ArgumentException(message);
+ throw new ArgumentException(
+ ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES.get(argCharacter, argValue, c));
}
else
{
@@ -1283,8 +1276,8 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(String
- .valueOf(propertiesFilePath), getExceptionMessage(e));
+ LocalizableMessage message = ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(
+ propertiesFilePath, getExceptionMessage(e));
throw new ArgumentException(message, e);
}
return argumentProperties;
--
Gitblit v1.10.0