Changeset 18704 in josm for trunk/src/org

Timestamp:

2023-04-19T18:03:38+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #22865: Pressing "Presets" button causes JOSM to get stuck on loading (macOS)

This is caused by JDK-8297117, and the Name Suggestion Index is the only preset
that should trigger the bug. This works around the issue by preventing the merging
of our MenuBar with the system menu when the Name Suggestion Index may be
enabled.

File:

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

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 
@@ -50 +51 @@
 
     @Override
-    public void preStartupHook() {
+    public void afterPrefStartupHook() {
         // This will merge our MenuBar into the system menu.
         // MUST be set before Swing is initialized!
-        // And will not work when one of the system independent LAFs is used.
-        // They just insist on painting themselves...
-        Utils.updateSystemProperty("apple.laf.useScreenMenuBar", "true");
+
+        // But only use the menu bar if the Name Suggestion Index is not enabled -- see JDK-8297117 (can remove once that is fixed)
+        // The NSI is especially egregious since it adds something like 8k presets, and is the most likely to trigger JDK-8297117.
+        if (TaggingPresetReader.getPresetSources().stream().noneMatch(url -> url.contains("name-suggestion-index"))) {
+            Utils.updateSystemProperty("apple.laf.useScreenMenuBar", "true");
+        }
         Utils.updateSystemProperty("apple.awt.application.name", "JOSM");
     }