Changeset 8817 in josm for trunk

Timestamp:

2015-10-03T01:23:15+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11924 - JDK9 Jigsaw: do not run code in headless environment (for jenkins unit tests)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.io.BufferedReader;
@@ -1485 +1486 @@
         // Force AWT toolkit to update its internal preferences (fix #6345).
         // This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
-        try {
-            Field field = Toolkit.class.getDeclaredField("resources");
-            field.setAccessible(true);
-            field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
-        } catch (Exception | InternalError e) {
-            // Ignore all exceptions, including internal error raised by Java 9 Jigsaw EA:
-            // java.lang.InternalError: legacy getBundle can't be used to find sun.awt.resources.awt in module java.desktop
-            // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JI-9025152 is resolved
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
+        if (!GraphicsEnvironment.isHeadless()) {
+            try {
+                Field field = Toolkit.class.getDeclaredField("resources");
+                field.setAccessible(true);
+                field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
+            } catch (Exception | InternalError e) {
+                // Ignore all exceptions, including internal error raised by Java 9 Jigsaw EA:
+                // java.lang.InternalError: legacy getBundle can't be used to find sun.awt.resources.awt in module java.desktop
+                // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JI-9025152 is resolved
+                if (Main.isTraceEnabled()) {
+                    Main.trace(e.getMessage());
+                }
             }
         }