Changeset 16573 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2020-06-08T21:02:35+02:00 (5 years ago)

Author:

simon04

Message:

fix #19056 - Add SequenceCommand.wrapIfNeeded (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• DeleteCommand.java (modified) (1 diff)
• SequenceCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -463 +463 @@
         }
 
-        return new SequenceCommand(tr("Delete"), cmds);
+        return SequenceCommand.wrapIfNeeded(tr("Delete"), cmds);
     }
 

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -73 +73 @@
     public SequenceCommand(String name, Command... sequenz) {
         this(name, Arrays.asList(sequenz));
+    }
+
+    /**
+     * Convenient constructor, if the commands are known at compile time.
+     * @param name The description text to be used for the sequence command, if one is created.
+     * @param sequenz The sequence that should be executed.
+     * @return Either a SequenceCommand, or the only command in the potential sequence
+     * @since 16573
+     */
+    public static Command wrapIfNeeded(String name, Command... sequenz) {
+        if (sequenz.length == 1) {
+            return sequenz[0];
+        }
+        return new SequenceCommand(name, sequenz);
+    }
+
+    /**
+     * Convenient constructor, if the commands are known at compile time.
+     * @param name The description text to be used for the sequence command, if one is created.
+     * @param sequenz The sequence that should be executed.
+     * @return Either a SequenceCommand, or the only command in the potential sequence
+     * @since 16573
+     */
+    public static Command wrapIfNeeded(String name, Collection<Command> sequenz) {
+        if (sequenz.size() == 1) {
+            return sequenz.iterator().next();
+        }
+        return new SequenceCommand(name, sequenz);
     }