From f56aa3768870512f62d995a83b947ced78cad825 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 24 Mar 2015 08:58:01 +0000
Subject: [PATCH] OPENDJ-1714: Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 8 ++++----
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 2143d9c..e954b58 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -2155,8 +2155,8 @@
*/
protected void createData() throws ApplicationException
{
- if (createNotReplicatedSuffix() &&
- getUserData().getNewSuffixOptions().getType() != NewSuffixOptions.Type.LEAVE_DATABASE_EMPTY)
+ if (createNotReplicatedSuffix()
+ && NewSuffixOptions.Type.LEAVE_DATABASE_EMPTY != getUserData().getNewSuffixOptions().getType())
{
currentProgressStep = getUserData().getNewSuffixOptions().getInstallProgressStep();
if (isVerbose())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index f0edb0d..693a2dc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -567,10 +567,10 @@
private void printStatusCommand()
{
// Use this instead a call to Installation to avoid to launch a new JVM just to retrieve a path.
- final String binariesRelativePath = isWindows() ? Installation.WINDOWS_BINARIES_PATH_RELATIVE :
- Installation.UNIX_BINARIES_PATH_RELATIVE;
- final String statusCliFileName = isWindows() ? Installation.WINDOWS_STATUSCLI_FILE_NAME :
- Installation.UNIX_STATUSCLI_FILE_NAME;
+ final String binariesRelativePath = isWindows() ? Installation.WINDOWS_BINARIES_PATH_RELATIVE
+ : Installation.UNIX_BINARIES_PATH_RELATIVE;
+ final String statusCliFileName = isWindows() ? Installation.WINDOWS_STATUSCLI_FILE_NAME
+ : Installation.UNIX_STATUSCLI_FILE_NAME;
final String binDir = Utils.getPath(Utils.getInstallPathFromClasspath(), binariesRelativePath);
final String cmd = Utils.getPath(binDir, statusCliFileName);
println();
--
Gitblit v1.10.0