Changeset 868 in josm for trunk/src/org

Timestamp:

2008-08-25T18:10:18+02:00 (16 years ago)

Author:

stoecker

Message:

fixed initial move offset for virtual nodes

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (1 diff)

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

@@ -182 +182 @@
                         virtualNode = null;
                 }
-
-                Collection<OsmPrimitive> selection = Main.ds.getSelected();
-                Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-                
-                // when rotating, having only one node makes no sense - quit silently
-                if (mode == Mode.rotate && affectedNodes.size() < 2) 
-                        return;
-
-                Command c = !Main.main.undoRedo.commands.isEmpty()
-                        ? Main.main.undoRedo.commands.getLast() : null;
-                if(c instanceof SequenceCommand)
-                        c = ((SequenceCommand)c).getLastCommand();
-
-                if (mode == Mode.move) {
-                        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
-                                ((MoveCommand)c).moveAgain(dx,dy);
-                        else
-                                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
+                {
+                        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+                        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+                
+                        // when rotating, having only one node makes no sense - quit silently
+                        if (mode == Mode.rotate && affectedNodes.size() < 2) 
+                                return;
+
+                        Command c = !Main.main.undoRedo.commands.isEmpty()
+                                ? Main.main.undoRedo.commands.getLast() : null;
+                        if(c instanceof SequenceCommand)
+                                c = ((SequenceCommand)c).getLastCommand();
+
+                        if (mode == Mode.move) {
+                                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
+                                        ((MoveCommand)c).moveAgain(dx,dy);
+                                else
+                                        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))
+                                        ((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN);
+                                else
+                                        Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN));
                         }
-                } else if (mode == Mode.rotate) {
-                        if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects))
-                                ((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN);
-                        else
-                                Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN));
                 }