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/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index d4266ce..8e64368 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -46,7 +46,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.OpenDsException;
-import org.opends.server.types.OperatingSystem;
+import com.forgerock.opendj.util.OperatingSystem;
import org.opends.server.types.Schema;
import static org.opends.server.types.CommonSchemaElements.*;
@@ -230,7 +230,7 @@
{
sameInstallAndInstance = instance.equals(install);
if (!sameInstallAndInstance &&
- (isLocal() || (isWindows() == Utilities.isWindows())))
+ (isLocal() || (OperatingSystem.isWindows())))
{
File f1 = new File(instance);
File f2 = new File(install);
@@ -458,7 +458,7 @@
}
}
- if (equals && Utilities.isWindows())
+ if (equals && OperatingSystem.isWindows())
{
equals =
desc.isWindowsServiceEnabled() == isWindowsServiceEnabled();
@@ -654,7 +654,7 @@
boolean isWindows;
if (isLocal())
{
- isWindows = Utilities.isWindows();
+ isWindows = OperatingSystem.isWindows();
}
else
{
--
Gitblit v1.10.0