Changeset 13108 in josm for trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

Timestamp:

2017-11-10T22:37:58+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15538 - add robustness to AlignInLineAction

File:

• trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -173 +173 @@
 
         try {
-            MainApplication.undoRedo.add(buildCommand());
+            Command cmd = buildCommand(getLayerManager().getEditDataSet());
+            if (cmd != null) {
+                MainApplication.undoRedo.add(cmd);
+            }
         } catch (InvalidSelection except) {
             Logging.debug(except);
@@ -184 +187 @@
     /**
      * Builds "align in line" command depending on the selected objects.
+     * @param ds data set in which the command operates
      * @return the resulting command to execute to perform action
      * @throws InvalidSelection if a polygon is selected, or if a node is used by 3 or more ways
-     * @since 12562
-     */
-    public Command buildCommand() throws InvalidSelection {
-        DataSet ds = getLayerManager().getEditDataSet();
+     * @since 13108
+     */
+    public Command buildCommand(DataSet ds) throws InvalidSelection {
         List<Node> selectedNodes = new ArrayList<>(ds.getSelectedNodes());
         List<Way> selectedWays = new ArrayList<>(ds.getSelectedWays());
@@ -276 +279 @@
                 throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));
         }
-        return new SequenceCommand(tr("Align Nodes in Line"), cmds);
+        return cmds.isEmpty() ? null : new SequenceCommand(tr("Align Nodes in Line"), cmds);
     }