Changeset 14177 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

Timestamp:

2018-08-22T02:41:48+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16666 - add workaround against ATK wrapper failure on Debian, Ubuntu and Mint

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (1 diff)

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

@@ -49 +49 @@
     @Override
     public void preStartupHook() {
-        // See #12022 - Disable GNOME ATK Java wrapper as it causes a lot of serious trouble
-        if ("org.GNOME.Accessibility.AtkWrapper".equals(getSystemProperty("assistive_technologies"))) {
-            System.clearProperty("assistive_technologies");
+        // See #12022, #16666 - Disable GNOME ATK Java wrapper as it causes a lot of serious trouble
+        if (isDebianOrUbuntu()) {
+            if (Utils.getJavaVersion() >= 9) {
+                // TODO: find a way to disable ATK wrapper on Java >= 9
+                // We should probably be able to do that by embedding a no-op AccessibilityProvider in our jar
+                // so that it is loaded by ServiceLoader without error
+                // But this require to compile at least one class with Java 9
+            } else {
+                // Java 8 does a simple Class.newInstance() from system classloader
+                Utils.updateSystemProperty("javax.accessibility.assistive_technologies", "java.lang.Object");
+            }
         }
     }