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

Timestamp:

2024-06-20T15:55:07+02:00 (9 months ago)

Author:

taylor.smock

Message:

See #17858: Update code for newer Java features

Also add a note that toUnmodifiableList does not like nulls.

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHook.java (modified) (2 diffs)
• PlatformHookOsx.java (modified) (1 diff)
• StreamUtils.java (modified) (1 diff)

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

@@ -248 +248 @@
     /**
      * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts.
-     * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
+     * It was advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
      * <ul>
      * <li>it returns KeyEvent.CTRL_MASK instead of KeyEvent.CTRL_DOWN_MASK. We used the extended
@@ -258 +258 @@
      */
     default int getMenuShortcutKeyMaskEx() {
-        // To remove when switching to Java 10+, and use Toolkit.getMenuShortcutKeyMaskEx instead
+        if (!GraphicsEnvironment.isHeadless()) {
+            return Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
+        }
         return InputEvent.CTRL_DOWN_MASK;
     }

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

@@ -104 +104 @@
         return !("true".equals(getSystemProperty("apple.laf.useScreenMenuBar"))
                 && ("Aqua".equals(laf) || laf.contains("Mac")));
-    }
-
-    @Override
-    public int getMenuShortcutKeyMaskEx() {
-        return InputEvent.META_DOWN_MASK;
     }
 

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

@@ -68 +68 @@
      */
     public static <T> Collector<T, ?, List<T>> toUnmodifiableList() {
-        // Java 10: use java.util.stream.Collectors.toUnmodifiableList
+        // Java 10: use java.util.stream.Collectors.toUnmodifiableList (note: does not like null checks OR null entries)
         return Collectors.collectingAndThen(Collectors.toList(), Utils::toUnmodifiableList);
     }