Changeset 502 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2007-12-30T23:55:51+01:00 (17 years ago)

Author:

gebner

Message:

SelectAction: When complaining about moving nodes outsides the world, don't
leave the nodes there.

File:

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

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -149 +149 @@
                 if (mode == Mode.rotate && affectedNodes.size() < 2) 
                         return;
-                
-
-                // check if any coordinate would be outside the world
-                for (OsmPrimitive osm : affectedNodes) {
-                        if (osm instanceof Node && ((Node)osm).coor.isOutSideWorld()) {
-                                JOptionPane.showMessageDialog(Main.parent,
-                                        tr("Cannot move objects outside of the world."));
-                                return;
-                        }
-                }
+
                 Command c = !Main.main.undoRedo.commands.isEmpty()
                         ? Main.main.undoRedo.commands.getLast() : null;
@@ -166 +157 @@
                                 ((MoveCommand)c).moveAgain(dx,dy);
                         else
-                                Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
+                                Main.main.undoRedo.add(
+                                        c = new MoveCommand(selection, dx, dy));
+
+                        for (Node n : affectedNodes) {
+                                if (n.coor.isOutSideWorld()) {
+                                        // Revert move
+                                        ((MoveCommand) c).moveAgain(-dx, -dy);
+
+                                        JOptionPane.showMessageDialog(Main.parent,
+                                                tr("Cannot move objects outside of the world."));
+                                        return;
+                                }
+                        }
                 } else if (mode == Mode.rotate) {
                         if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects))