Changeset 19102 in josm for trunk/src

Timestamp:

2024-06-12T12:32:03+02:00 (6 months ago)

Author:

taylor.smock

Message:

Revert Utils.toUnmodifiableList changes from r19101 (see #23727, patch by GerdP, modified with extra context)

File:

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

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

@@ -636 +636 @@
     @SuppressWarnings("unchecked")
     public static <T> List<T> toUnmodifiableList(Collection<T> collection) {
+        // Note: Windows does a `null` check on startup on these lists. See #23717.
+        // Only change this once that is fixed.
+        // Java 9: use List.of(...)
         if (isEmpty(collection)) {
             return Collections.emptyList();
@@ -641 +644 @@
             return Collections.singletonList(collection.iterator().next());
         } else {
-            // List.copyOf would also work, but if the original collection is immutable, it just returns the original
-            // collection.
-            return (List<T>) List.of(collection.toArray());
+            return (List<T>) Arrays.asList(collection.toArray());
         }
     }