Changeset 86 in josm for src/org/openstreetmap/josm/command/ChangePropertyCommand.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/command/ChangePropertyCommand.java (moved) (moved from src/org/openstreetmap/josm/command/ChangeKeyValueCommand.java ) (5 diffs)

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

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -16 +13 @@
  * @author imi
  */
-public class ChangeKeyValueCommand implements Command {
+public class ChangePropertyCommand extends Command {
 
         /**
@@ -33 +30 @@
         private final String value;
         
-        /**
-         * These are the old values of the objects to do a proper undo.
-         */
-        private List<Map<String, String>> oldProperties;
-        
-        /**
-         * These are the old modified states of the data.
-         */
-        private List<Boolean> oldModified = new LinkedList<Boolean>();
-
-        public ChangeKeyValueCommand(Collection<OsmPrimitive> objects, String key, String value) {
+        public ChangePropertyCommand(Collection<OsmPrimitive> objects, String key, String value) {
                 this.objects = new LinkedList<OsmPrimitive>(objects);
                 this.key = key;
@@ -49 +36 @@
         }
         
-        public void executeCommand() {
-                // save old
-                oldProperties = new LinkedList<Map<String, String>>();
-                for (OsmPrimitive osm : objects) {
-                        oldProperties.add(osm.keys == null ? null : new HashMap<String, String>(osm.keys));
-                        oldModified.add(osm.modifiedProperties);
-                        osm.modifiedProperties = true;
-                }
-
+        @Override public void executeCommand() {
+                super.executeCommand(); // save old
                 if (value == null) {
                         for (OsmPrimitive osm : objects)
@@ -67 +47 @@
         }
 
-        public void undoCommand() {
-                Iterator<Map<String, String>> it = oldProperties.iterator();
-                Iterator<Boolean> itMod = oldModified.iterator();
-                for (OsmPrimitive osm : objects) {
-                        osm.keys = it.next();
-                        osm.modifiedProperties = itMod.next();
-                }
-        }
-
-        public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+        @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 modified.addAll(objects);
         }