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/installer/ui/JavaArgumentsDialog.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 59d7291..2f4c09f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -755,7 +755,7 @@
if (!Utils.isWebStart())
{
String javaHome = System.getProperty("java.home");
- if ((javaHome == null) || (javaHome.length() == 0))
+ if (javaHome == null || javaHome.length() == 0)
{
javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
}
@@ -912,21 +912,20 @@
private boolean displayWebStartWarningIfRequired()
{
- boolean returnValue = true;
if (Utils.isWebStart() && !userAgreedWithWebStart)
{
JavaArguments args = getJavaArguments();
if (!args.equals(javaArguments) &&
- ((args.getInitialMemory() != -1) ||
- (args.getMaxMemory() != -1) ||
- (args.getAdditionalArguments().length > 0)))
+ (args.getInitialMemory() != -1 ||
+ args.getMaxMemory() != -1 ||
+ args.getAdditionalArguments().length > 0))
{
- returnValue = displayConfirmationDialog(
+ userAgreedWithWebStart = displayConfirmationDialog(
INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART.get(),
INFO_CONFIRMATION_TITLE.get());
- userAgreedWithWebStart = returnValue;
+ return userAgreedWithWebStart;
}
}
- return returnValue;
+ return true;
}
}
--
Gitblit v1.10.0