Changeset 14316 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

Timestamp:

2018-10-13T01:37:04+02:00 (6 years ago)

Author:

Don-vip

Message:

rework Travis config:

• add Windows build (Oracle JDK 11 only as Java is not fully supported yet)
• drop openjdk10 (not LTS)
• use openjdk11 on Linux instead of oraclejdk11
• add macOS xcode10 (ships with jdk10)

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -6 +6 @@
 
 import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Window;
@@ -74 +75 @@
                 quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, this);
             Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
-            if (Utils.getJavaVersion() >= 9) {
-                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
-            } else {
+            if (Utils.getJavaVersion() < 9) {
                 setHandlers(eawtApplication, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, appli);
                 // this method has been deprecated, but without replacement. To remove with Java 9 migration
                 eawtApplication.getDeclaredMethod("setEnabledPreferencesMenu", boolean.class).invoke(appli, Boolean.TRUE);
+            } else if (!GraphicsEnvironment.isHeadless()) {
+                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
             }
             // setup the dock icon. It is automatically set with application bundle and Web start but we need