Changeset 17998 in josm for trunk/src/org

Timestamp:

2021-07-11T04:31:05+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20950 - UnsupportedOperationException when right-clicking on an MVT Layer in non-expert mode (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toCollection;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +11 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+import java.util.stream.Stream;
 
 import javax.swing.AbstractAction;
@@ -82 +83 @@
         if (selectedLayers.size() == 1) {
             Action[] entries = selectedLayers.get(0).getMenuEntries();
-            actions = entries != null ? Arrays.asList(entries) : Collections.emptyList();
+            // Since we may add to the array later, we cannot use Arrays.asList -- it prohibits the use of `add` or `remove`.
+            actions = entries != null ? Stream.of(entries).collect(toCollection(ArrayList::new)) : emptyList();
         } else {
             // Very simple algorithm - first selected layer has actions order as in getMenuEntries, actions from other layers go to the end