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

Timestamp:

2005-12-19T22:58:10+01:00 (20 years ago)

Author:

imi

Message:

• Fixed bugs in reading/writing
• Added correct extension filter to load/save
• Delete now moves to deleted. modified flag reintroduced

Location:

src/org/openstreetmap/josm/command

Files:

• ChangeKeyValueCommand.java (modified) (3 diffs)
• MoveCommand.java (modified) (4 diffs)

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

@@ -38 +38 @@
          */
         private List<Map<Key, String>> oldProperties;
+        
+        /**
+         * These are the old modified states of the data.
+         */
+        private List<Boolean> oldModified = new LinkedList<Boolean>();
 
         public ChangeKeyValueCommand(Collection<OsmPrimitive> objects, Key key, String value) {
@@ -48 +53 @@
                 // save old
                 oldProperties = new LinkedList<Map<Key, String>>();
-                for (OsmPrimitive osm : objects)
+                for (OsmPrimitive osm : objects) {
                         oldProperties.add(osm.keys == null ? null : new HashMap<Key, String>(osm.keys));
+                        oldModified.add(osm.modified);
+                }
                         
                 if (value == null) {
@@ -70 +77 @@
         public void undoCommand() {
                 Iterator<Map<Key, String>> it = oldProperties.iterator();
-                for (OsmPrimitive osm : objects)
+                Iterator<Boolean> itMod = oldModified.iterator();
+                for (OsmPrimitive osm : objects) {
                         osm.keys = it.next();
+                        osm.modified = itMod.next();
+                }
         }
 

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

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.Iterator;
@@ -33 +32 @@
 
         /**
-         * x/y List of all old positions of the objects.
+         * Small helper for holding the interesting part of the old data state of the
+         * objects. 
+         * @author imi
          */
-        private List<Point2D.Double> oldPositions = new LinkedList<Point2D.Double>();
+        class OldState
+        {
+                double x,y;
+                boolean modified;
+        }
+        /**
+         * List of all old states of the objects.
+         */
+        private List<OldState> oldState = new LinkedList<OldState>();
 
         /**
@@ -44 +53 @@
                 this.y = y;
                 this.objects = getAffectedNodes(objects);
-                for (Node n : this.objects)
-                        oldPositions.add(new Point2D.Double(n.coor.x, n.coor.y));
+                for (Node n : this.objects) {
+                        OldState os = new OldState();
+                        os.x = n.coor.x;
+                        os.y = n.coor.y;
+                        os.modified = n.modified;
+                        oldState.add(os);
+                }
         }
 
@@ -80 +94 @@
                         n.coor.x += x;
                         n.coor.y += y;
+                        n.modified = true;
                 }
         }
 
         public void undoCommand() {
-                Iterator<Point2D.Double> it = oldPositions.iterator();
+                Iterator<OldState> it = oldState.iterator();
                 for (Node n : objects) {
-                        Point2D.Double p = it.next();
-                        n.coor.x = p.x;
-                        n.coor.y = p.y;
+                        OldState os = it.next();
+                        n.coor.x = os.x;
+                        n.coor.y = os.y;
+                        n.modified = os.modified;
                 }
         }