src/org/netbeans/jemmy/JemmyProperties.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation. Oracle designates this

@@ -39,10 +39,11 @@
 import org.netbeans.jemmy.drivers.APIDriverInstaller;
 import org.netbeans.jemmy.drivers.DefaultDriverInstaller;
 import org.netbeans.jemmy.drivers.DriverInstaller;
 import org.netbeans.jemmy.drivers.InputDriverInstaller;
 import org.netbeans.jemmy.explorer.GUIBrowser;
+import org.netbeans.jemmy.util.Platform;
 
 /**
  *
  * Keeps default Jemmy properties.
  *

@@ -809,11 +810,11 @@
                 | InvocationTargetException e) {
             getCurrentOutput().printLine("Cannot init driver installer:");
             getCurrentOutput().printStackTrace(e);
         }
         if (installer == null) {
-            if (System.getProperty("os.name").startsWith("Mac OS X")) {
+            if (Platform.isOSX()) {
                 installer = new APIDriverInstaller((model & SHORTCUT_MODEL_MASK) != 0);
             } else {
                 installer = new DefaultDriverInstaller((model & SHORTCUT_MODEL_MASK) != 0);
             }
         }