Changeset 17487 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2021-02-08T20:52:53+01:00 (3 years ago)

Author:

GerdP

Message:

see #20257:macOS build process fixes and improvements

• ​apply ​https://github.com/openstreetmap/josm/pull/68.diff without understanding what it does

File:

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

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

@@ -26 +26 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
@@ -31 +32 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
+import org.openstreetmap.josm.spi.preferences.Config;
+
 
 /**
@@ -81 +84 @@
             }
             // setup the dock icon. It is automatically set with application bundle and Web start but we need
-            // to do it manually if run with `java -jar``
-            eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(appli, ImageProvider.get("logo").getImage());
+            // to do it manually if run with `java -jar``. 
+            eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(
+                appli, 
+                Optional.ofNullable(
+                    new ImageProvider(Config.getUrls().getJOSMWebsite()+"/logo-macos.png").setOptional(true).get()
+                ).orElse( // Fall back to default icon
+                    ImageProvider.get("logo")).getImage()
+            );
+        
             // enable full screen
             enableOSXFullscreen(MainApplication.getMainFrame());