Changeset 17488 in josm for trunk

Timestamp:

2021-02-08T21:57:55+01:00 (4 years ago)

Author:

GerdP

Message:

see #20257:macOS build process fixes and improvements

• ​fix checkstyle issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1043 +1043 @@
                 Logging.log(Logging.LEVEL_ERROR, null, e);
             }
-        } 
-        // Workaround for JDK-8251377: JTabPanel active tab is unreadable in Big Sur, see #20075
-        // os.version will return 10.16, or 11.0 depending on environment variable
-        // https://twitter.com/BriceDutheil/status/1330926649269956612
-        else {
+        } else {
+            // Workaround for JDK-8251377: JTabPanel active tab is unreadable in Big Sur, see #20075
+            // os.version will return 10.16, or 11.0 depending on environment variable
+            // https://twitter.com/BriceDutheil/status/1330926649269956612
             final String laf = UIManager.getLookAndFeel().getID();
             final String macOSVersion = getSystemProperty("os.version");
-            if(PlatformManager.isPlatformOsx() && (laf.contains("Mac") || laf.contains("Aqua")) && (macOSVersion.startsWith("10.16") || macOSVersion.startsWith("11"))){
+            if (PlatformManager.isPlatformOsx() && (laf.contains("Mac") || laf.contains("Aqua"))
+                    && (macOSVersion.startsWith("10.16") || macOSVersion.startsWith("11"))) {
                 UIManager.put("TabbedPane.foreground", Color.BLACK);
             }

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

@@ -34 +34 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
-
 /**
  * {@code PlatformHook} implementation for Apple macOS (formerly Mac OS X) systems.
@@ -84 +83 @@
             }
             // 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``. 
+            // to do it manually if run with `java -jar``.
             eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(
-                appli, 
+                appli,
                 Optional.ofNullable(
-                    new ImageProvider(Config.getUrls().getJOSMWebsite()+"/logo-macos.png").setOptional(true).get()
-                ).orElse( // Fall back to default icon
+                    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());