Changeset 30 in josm for src/org/openstreetmap/josm/command/MoveCommand.java

Timestamp:

2005-12-03T14:14:35+01:00 (20 years ago)

Author:

imi

Message:

• Removed edit layer, combine action, save gpx (integrated in normal save)
• Simplified and unified shortkeys
• many small code simplifications
• added undo
• broken checkin!

File:

• src/org/openstreetmap/josm/command/MoveCommand.java (modified) (5 diffs)

src/org/openstreetmap/josm/command/MoveCommand.java

@@ -2 +2 @@
 
 import java.awt.Component;
+import java.awt.geom.Point2D;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JLabel;
@@ -21 +25 @@
          * The objects that should be moved.
          */
-        private Collection<OsmPrimitive> objects;
+        private List<OsmPrimitive> objects;
         /**
          * x difference movement. Coordinates are in northern/eastern 
@@ -32 +36 @@
 
         /**
+         * x/y List of all old positions of the objects.
+         */
+        private List<Point2D.Double> oldPositions;
+        
+        /**
          * Create a MoveCommand and assign the initial object set and movement vector.
          */
         public MoveCommand(Collection<OsmPrimitive> objects, double x, double y) {
-                this.objects = objects;
+                this.objects = new LinkedList<OsmPrimitive>(objects);
                 this.x = x;
                 this.y = y;
-        }
-
-        /**
-         * Move the objects additional to the current movement.
-         */
-        public void move(double x, double y) {
-                this.x += x;
-                this.y += y;
         }
 
@@ -58 +59 @@
         }
 
+        public void undoCommand() {
+                AllNodesVisitor visitor = new AllNodesVisitor();
+                for (OsmPrimitive osm : objects)
+                        osm.visit(visitor);
+                Iterator<Point2D.Double> it = oldPositions.iterator();
+                for (Node n : visitor.nodes) {
+                        Point2D.Double p = it.next();
+                        n.coor.x = p.x;
+                        n.coor.y = p.y;
+                }
+        }
+
         public Component commandDescription() {
                 String xstr = Math.abs(x) + (x < 0 ? "W" : "E");
@@ -65 +78 @@
 
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-                if (modified != null)
-                        for (OsmPrimitive osm : objects)
-                                if (!modified.contains(osm))
-                                        modified.add(osm);
+                for (OsmPrimitive osm : objects)
+                        if (!modified.contains(osm))
+                                modified.add(osm);
         }
 }