From afa089fedd62a29826d57cc34293ad5e0e6a4efd Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 13:15:01 +0000
Subject: [PATCH] Replaced OperatingSystem class by its SDK class.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index a23f900..ab0b77c 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -61,6 +61,8 @@
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;
+import com.forgerock.opendj.util.OperatingSystem;
+
import static org.forgerock.util.Utils.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.Step.*;
@@ -2960,7 +2962,7 @@
serverProperties.put(ADSContext.ServerProperty.ID, serverID);
serverProperties.put(ADSContext.ServerProperty.HOST_OS,
- getOSString());
+ OperatingSystem.getOperatingSystem().toString());
return serverProperties;
}
@@ -3069,7 +3071,7 @@
long requiredInMb = getRequiredInstallSpace() / (1024 * 1024);
errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(serverLocation, requiredInMb));
qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- } else if (isWindows() && (serverLocation.contains("%")))
+ } else if (OperatingSystem.isWindows() && (serverLocation.contains("%")))
{
errorMsgs.add(INFO_INVALID_CHAR_IN_PATH.get("%"));
qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
--
Gitblit v1.10.0