From 3b230cd5af114fd8800f2aa56b7dc06db6cb0db6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Feb 2016 16:00:11 +0000
Subject: [PATCH] Simplified widespread use of OperatingSystem.isWindows() and duplication by using methods dedicated to a task
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
index a981228..ea02c21 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
@@ -22,22 +22,20 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.quicksetup;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import org.opends.quicksetup.util.Utils;
/**
@@ -98,9 +96,7 @@
buf.append(Constants.LINE_SEPARATOR);
buf.append("- ").append(msg);
}
- String cmd = isWindows() ?
- Installation.WINDOWS_SETUP_FILE_NAME :
- Installation.UNIX_SETUP_FILE_NAME;
+ String cmd = Installation.getSetupFileName();
installationMsg = INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf);
}
else
@@ -166,8 +162,6 @@
}
}
-
-
/**
* Indicates whether there are database files under this installation.
*
@@ -181,8 +175,6 @@
return children != null && children.length > 0;
}
-
-
/**
* Indicates whether there are config files under this installation.
*
--
Gitblit v1.10.0