Changeset 16303 in josm

Timestamp:

2020-04-15T11:38:48+02:00 (4 years ago)

Author:

GerdP

Message:

see #18670: fix error introduced with r16300
Ungluing an unconnected tagged node (e.g. natural=tree) caused exception instead of "not glued to anything" message

File:

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

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

@@ -109 +109 @@
                 // If there aren't enough ways, maybe the user wanted to unglue the nodes
                 // (= copy tags to a new node)
-                if (!selfCrossing) {
-                    if (selection.size() == 1 && selectedNode.isTagged()) {
+                if (!selfCrossing)
+                    if (checkForUnglueNode(selection)) {
                         unglueOneNodeAtMostOneWay(e);
                     } else {
@@ -116 +116 @@
                         errMsg = tr("This node is not glued to anything else.");
                     }
-                }
             } else {
                 // and then do the work.
@@ -244 +243 @@
         getLayerManager().getEditDataSet().setSelected(moveSelectedNode ? selectedNode : unglued);
         mv.repaint();
+    }
+
+    /**
+     * Checks if selection is suitable for ungluing. This is the case when there's a single,
+     * tagged node selected that's part of at least one way (ungluing an unconnected node does
+     * not make sense. Due to the call order in actionPerformed, this is only called when the
+     * node is only part of one or less ways.
+     *
+     * @param selection The selection to check against
+     * @return {@code true} if selection is suitable
+     */
+    private boolean checkForUnglueNode(Collection<? extends OsmPrimitive> selection) {
+        if (selection.size() != 1)
+            return false;
+        OsmPrimitive n = (OsmPrimitive) selection.toArray()[0];
+        if (!(n instanceof Node))
+            return false;
+        if (((Node) n).getParentWays().isEmpty())
+            return false;
+
+        selectedNode = (Node) n;
+        return selectedNode.isTagged();
     }