2 files changed, 5 insertions, 9 deletions
diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
index 023a9d488..1a9d4ac55 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
@@ -70,15 +70,11 @@ public abstract class GraphicsConfigurationFactory {
     }
 
     private static void initialize() {
-        String osName = System.getProperty("os.name");
-        String osNameLowerCase = osName.toLowerCase();
         String factoryClassName = null;
 
         abstractGraphicsDeviceClass = javax.media.nativewindow.AbstractGraphicsDevice.class;
         
-        if (!osNameLowerCase.startsWith("wind") &&
-            !osNameLowerCase.startsWith("mac os x")) {
-            // Assume X11 platform -- should probably test for these explicitly
+        if (NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(false))) {
             try {
                 GraphicsConfigurationFactory factory = (GraphicsConfigurationFactory)
                     NWReflection.createInstance("com.sun.nativewindow.impl.x11.X11GraphicsConfigurationFactory", new Object[] {});
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
index e1e8970f4..4f1323ff8 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
@@ -98,8 +98,8 @@ public abstract class NativeWindowFactory {
         JVMUtil.initSingleton();
 
         // Gather the windowing OS first
-        nativeOSNamePure = System.getProperty("os.name");
-        nativeOSNameCustom = System.getProperty("nativewindow.ws.name");
+        nativeOSNamePure = Debug.getProperty("os.name", false);
+        nativeOSNameCustom = Debug.getProperty("nativewindow.ws.name", true);
         if(null==nativeOSNameCustom||nativeOSNameCustom.length()==0) {
               nativeOSNameCustom = nativeOSNamePure;
         }
@@ -127,8 +127,8 @@ public abstract class NativeWindowFactory {
             } catch (Exception e) { }
         }
 
-        boolean toolkitLockForced   = Boolean.getBoolean("nativewindow.locking");
-        boolean awtToolkitLockDisabled = Boolean.getBoolean("java.awt.headless");
+        boolean toolkitLockForced   = Debug.getBooleanProperty("nativewindow.locking", true);
+        boolean awtToolkitLockDisabled = Debug.getBooleanProperty("java.awt.headless", false);
 
         NativeWindowFactory _factory = null;