Changeset 12984 in josm for trunk

Timestamp:

2017-10-11T20:11:36+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15429 - add robustness to AlignInLineAction

File:

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

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

@@ -255 +255 @@
             lines.put(w, new Line(w));
         }
+        if (nodes.isEmpty()) {
+            throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));
+        }
         Collection<Command> cmds = new ArrayList<>(nodes.size());
         List<Way> referers = new ArrayList<>(ways.size());
@@ -268 +271 @@
                 cmds.add(lines.get(way).projectionCommand(n));
             } else if (referers.size() == 2) {
-                Command cmd = lines.get(referers.get(0)).intersectionCommand(n, lines.get(referers.get(1)));
-                cmds.add(cmd);
+                cmds.add(lines.get(referers.get(0)).intersectionCommand(n, lines.get(referers.get(1))));
             } else
                 throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));