Changeset 31 in josm for src/org/openstreetmap/josm/command

Timestamp:

2005-12-06T23:23:20+01:00 (20 years ago)

Author:

imi

Message:

• fixed broken stuff from last checkin
• complete undo and redo
• futher simplification in DeleteAction

Location:

src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (3 diffs)
• ChangeKeyValueCommand.java (modified) (3 diffs)
• CombineAndDeleteCommand.java (deleted)
• Command.java (modified) (2 diffs)
• DeleteCommand.java (modified) (3 diffs)
• MoveCommand.java (modified) (6 diffs)
• SequenceCommand.java (added)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.Component;
 import java.util.Collection;
 
-import javax.swing.JLabel;
-
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Key;
-import org.openstreetmap.josm.data.osm.LineSegment;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
-import org.openstreetmap.josm.data.osm.visitor.SelectionComponentVisitor;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
+import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor;
 
 /**
@@ -26 +19 @@
          * The dataset this command operates on.
          */
-        DataSet ds;
+        private DataSet ds;
 
-        /**
-         * Helper that adds the object
-         * @author imi
-         */
-        private final class AddVisitor implements Visitor {
-                public void visit(Node n) {ds.nodes.add(n);}
-                public void visit(LineSegment ls) {ds.lineSegments.add(ls);}
-                public void visit(Track t) {ds.tracks.add(t);}
-                public void visit(Key k) {throw new IllegalStateException("Keys are added by using ChangeKeyValueCommand");}
-        }
-
-        /**
-         * Helper that deletes the object (for undo)
-         * @author imi
-         */
-        private final class RemoveVisitor implements Visitor {
-                public void visit(Node n) {ds.nodes.remove(n);}
-                public void visit(LineSegment ls) {ds.lineSegments.remove(ls);}
-                public void visit(Track t) {ds.tracks.remove(t);}
-                public void visit(Key k) {throw new IllegalStateException("Keys are added by using ChangeKeyValueCommand");}
-        }
-        
         /**
          * The primitive to add to the dataset.
@@ -64 +35 @@
 
         public void executeCommand() {
-                osm.visit(new AddVisitor());
+                osm.visit(new AddVisitor(ds));
         }
 
         public void undoCommand() {
-                osm.visit(new RemoveVisitor());
+                osm.visit(new DeleteVisitor(ds));
         }
 
-        public Component commandDescription() {
-                SelectionComponentVisitor v = new SelectionComponentVisitor();
-                osm.visit(v);
-                return new JLabel("Add "+v.name, v.icon, JLabel.LEADING);
-        }
-        
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 added.add(osm);

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.Component;
 import java.util.Collection;
 import java.util.HashMap;
@@ -8 +7 @@
 import java.util.List;
 import java.util.Map;
-
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.osm.Key;
@@ -77 +74 @@
         }
 
-        public Component commandDescription() {
-                String objStr = objects.size()+" object" + (objects.size()==1?"":"s");
-                if (value == null)
-                        return new JLabel("Delete the key '"+key+"' of "+objStr);
-                return new JLabel("Change the key '"+key+"' of "+objStr+" to '"+value+"'");
-        }
-
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 modified.addAll(objects);

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.Component;
 import java.util.Collection;
 
@@ -32 +31 @@
         
         /**
-         * Give a description of the command as component to draw
-         */
-        Component commandDescription();
-        
-        /**
          * Fill in the changed data this command operates on.
          * Add to the lists, don't clear them.

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.Component;
 import java.util.Collection;
-
-import javax.swing.JLabel;
+import java.util.HashSet;
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Key;
-import org.openstreetmap.josm.data.osm.LineSegment;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
+import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
+import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 
@@ -23 +20 @@
          * The dataset this command operates on.
          */
-        DataSet ds;
+        final DataSet ds;
+        /**
+         * The primitive that get deleted.
+         */
+        final Collection<OsmPrimitive> data = new HashSet<OsmPrimitive>();
 
-        /**
-         * Helper that adds the object.
-         * @author imi
-         */
-        private final class AddVisitor implements Visitor {
-                public void visit(Node n) {ds.nodes.add(n);}
-                public void visit(LineSegment ls) {ds.lineSegments.add(ls);}
-                public void visit(Track t) {ds.tracks.add(t);}
-                public void visit(Key k) {throw new IllegalStateException("Keys are added by using ChangeKeyValueCommand");}
-        }
-
-        /**
-         * Helper that deletes the object. Does not respect back reference cache.
-         * @author imi
-         */
-        private final class DeleteVisitor implements Visitor {
-                public void visit(Node n) {ds.nodes.remove(n);}
-                public void visit(LineSegment ls) {ds.lineSegments.remove(ls);}
-                public void visit(Track t) {ds.tracks.remove(t);}
-                public void visit(Key k) {throw new IllegalStateException("Keys are added by using ChangeKeyValueCommand");}
-        }
-        
-        
-        
-        /**
-         * The primitives that are going to deleted.
-         */
-        private final Collection<OsmPrimitive> data;
-        
-        public DeleteCommand(DataSet ds, Collection<OsmPrimitive> data) {
+        public DeleteCommand(DataSet ds, OsmPrimitive osm) {
                 this.ds = ds;
-                this.data = data;
+                CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(ds);
+                osm.visit(v);
+                data.addAll(v.data);
+                data.add(osm);
         }
         
         public void executeCommand() {
-                Visitor v = new DeleteVisitor();
+                Visitor v = new DeleteVisitor(ds);
                 for (OsmPrimitive osm : data)
                         osm.visit(v);
@@ -66 +41 @@
 
         public void undoCommand() {
-                Visitor v = new AddVisitor();
+                Visitor v = new AddVisitor(ds);
                 for (OsmPrimitive osm : data)
                         osm.visit(v);
-        }
-
-        public Component commandDescription() {
-                return new JLabel("Delete "+data.size()+" primitives");
         }
 

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.Component;
 import java.awt.geom.Point2D;
 import java.util.Collection;
@@ -7 +6 @@
 import java.util.LinkedList;
 import java.util.List;
-
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -25 +22 @@
          * The objects that should be moved.
          */
-        private List<OsmPrimitive> objects;
+        public List<Node> objects = new LinkedList<Node>();
         /**
          * x difference movement. Coordinates are in northern/eastern 
@@ -38 +35 @@
          * x/y List of all old positions of the objects.
          */
-        private List<Point2D.Double> oldPositions;
-        
+        private List<Point2D.Double> oldPositions = new LinkedList<Point2D.Double>();
+
         /**
          * Create a MoveCommand and assign the initial object set and movement vector.
          */
         public MoveCommand(Collection<OsmPrimitive> objects, double x, double y) {
-                this.objects = new LinkedList<OsmPrimitive>(objects);
                 this.x = x;
                 this.y = y;
+                this.objects = getAffectedNodes(objects);
+                for (Node n : this.objects)
+                        oldPositions.add(new Point2D.Double(n.coor.x, n.coor.y));
         }
 
-        public void executeCommand() {
+        /**
+         * @return a list of all nodes that will be moved if using the given set of
+         * objects.
+         */
+        public static List<Node> getAffectedNodes(Collection<OsmPrimitive> objects) {
                 AllNodesVisitor visitor = new AllNodesVisitor();
                 for (OsmPrimitive osm : objects)
                         osm.visit(visitor);
-                for (Node n : visitor.nodes) {
+                return new LinkedList<Node>(visitor.nodes);
+        }
+        
+        /**
+         * Move the same set of objects again by the specified vector. The vectors
+         * are added together and so the resulting will be moved to the previous
+         * vector plus this one.
+         * 
+         * The move is immediatly executed and any undo will undo both vectors to
+         * the original position the objects had before first moving.
+         */
+        public void moveAgain(double x, double y) {
+                for (Node n : objects) {
+                        n.coor.x += x;
+                        n.coor.y += y;
+                }
+                this.x += x;
+                this.y += y;
+        }
+        
+        public void executeCommand() {
+                for (Node n : objects) {
                         n.coor.x += x;
                         n.coor.y += y;
@@ -60 +84 @@
 
         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) {
+                for (Node n : objects) {
                         Point2D.Double p = it.next();
                         n.coor.x = p.x;
@@ -71 +92 @@
         }
 
-        public Component commandDescription() {
-                String xstr = Math.abs(x) + (x < 0 ? "W" : "E");
-                String ystr = Math.abs(y) + (y < 0 ? "S" : "N");
-                return new JLabel("Move "+objects.size()+" primitives "+xstr+" "+ystr);
-        }
-
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 for (OsmPrimitive osm : objects)
-                        if (!modified.contains(osm))
-                                modified.add(osm);
+                        modified.add(osm);
         }
 }