From 593a345cbea7eb30d590cd7110668d902aa7b26b Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Oct 2014 11:23:41 +0000
Subject: [PATCH] AutoRefactor'ed inverting equals().
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java
index a8e8b4b..d3316d0 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java
@@ -197,31 +197,24 @@
*/
public boolean getBooleanValue() throws ArgumentException {
if (values.isEmpty()) {
- final LocalizableMessage message = ERR_ARG_NO_BOOLEAN_VALUE.get(name);
- throw new ArgumentException(message);
+ throw new ArgumentException(ERR_ARG_NO_BOOLEAN_VALUE.get(name));
}
final Iterator<String> iterator = values.iterator();
final String valueString = toLowerCase(iterator.next());
-
- boolean booleanValue;
- if (valueString.equals("true") || valueString.equals("yes") || valueString.equals("on")
- || valueString.equals("1")) {
- booleanValue = true;
- } else if (valueString.equals("false") || valueString.equals("no")
- || valueString.equals("off") || valueString.equals("0")) {
- booleanValue = false;
- } else {
- final LocalizableMessage message =
- ERR_ARG_CANNOT_DECODE_AS_BOOLEAN.get(valueString, name);
- throw new ArgumentException(message);
+ if (iterator.hasNext()) {
+ throw new ArgumentException(ERR_ARG_BOOLEAN_MULTIPLE_VALUES.get(name));
}
- if (iterator.hasNext()) {
- final LocalizableMessage message = ERR_ARG_BOOLEAN_MULTIPLE_VALUES.get(name);
- throw new ArgumentException(message);
+ if ("true".equals(valueString) || "yes".equals(valueString)
+ || "on".equals(valueString) || "1".equals(valueString)) {
+ return true;
+ } else if ("false".equals(valueString) || "no".equals(valueString)
+ || "off".equals(valueString) || "0".equals(valueString)) {
+ return false;
} else {
- return booleanValue;
+ throw new ArgumentException(
+ ERR_ARG_CANNOT_DECODE_AS_BOOLEAN.get(valueString, name));
}
}
--
Gitblit v1.10.0