From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
index e2b45c4..019d078 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
@@ -24,7 +24,6 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2013-2015 ForgeRock AS.
*/
-
package org.opends.quicksetup;
import org.forgerock.i18n.LocalizableMessage;
@@ -86,17 +85,16 @@
* @return boolean where true indicates usage should be printed
*/
protected boolean shouldPrintUsage() {
- boolean printUsage = false;
- if ((args != null) && (args.length > 0)) {
+ if (args != null && args.length > 0) {
for (String arg : args) {
if (arg.equals("-?") ||
arg.equalsIgnoreCase("-H") ||
arg.equalsIgnoreCase("--help")) {
- printUsage = true;
+ return true;
}
}
}
- return printUsage;
+ return false;
}
/**
@@ -106,17 +104,16 @@
* @return boolean where true indicates usage should be printed
*/
protected boolean isQuiet() {
- boolean printUsage = false;
- if ((args != null) && (args.length > 0)) {
+ if (args != null && args.length > 0) {
for (String arg : args) {
if (arg.equals("-?") ||
arg.equalsIgnoreCase("-Q") ||
arg.equalsIgnoreCase("--quiet")) {
- printUsage = true;
+ return true;
}
}
}
- return printUsage;
+ return false;
}
/**
@@ -126,18 +123,17 @@
* @return boolean where true indicates version should be printed
*/
protected boolean shouldPrintVersion() {
- boolean printVersion = false;
- if ((args != null) && (args.length > 0))
+ if (args != null && args.length > 0)
{
for (String arg : args)
{
if (arg.equalsIgnoreCase("--version"))
{
- printVersion = true;
+ return true;
}
}
}
- return printVersion;
+ return false;
}
/**
@@ -149,15 +145,13 @@
* should be launched
*/
protected boolean isCli() {
- boolean isCli = false;
for (String arg : args) {
if (arg.equalsIgnoreCase("--"+OPTION_LONG_CLI) ||
arg.equalsIgnoreCase("-"+OPTION_SHORT_CLI)) {
- isCli = true;
- break;
+ return true;
}
}
- return isCli;
+ return false;
}
/**
--
Gitblit v1.10.0