Changeset 2284 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-10-13T19:40:21+02:00 (15 years ago)

Author:

jttt

Message:

Added PrimitiveData classes. Uses PrimitiveData as storage for Command's undo function

File:

• trunk/src/org/openstreetmap/josm/command/Command.java (modified) (8 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -25 +26 @@
  *
  * The command remembers the {@see OsmDataLayer} it is operating on.
- * 
+ *
  * @author imi
  */
@@ -31 +32 @@
 
     private static final class CloneVisitor extends AbstractVisitor {
-        public Map<OsmPrimitive, OsmPrimitive> orig = new HashMap<OsmPrimitive, OsmPrimitive>();
+        public Map<OsmPrimitive, PrimitiveData> orig = new HashMap<OsmPrimitive, PrimitiveData>();
 
         public void visit(Node n) {
-            orig.put(n, new Node(n));
+            orig.put(n, n.save());
         }
         public void visit(Way w) {
-            orig.put(w, new Way(w));
+            orig.put(w, w.save());
         }
         public void visit(Relation e) {
-            orig.put(e, new Relation(e));
+            orig.put(e, e.save());
         }
     }
 
     /** the map of OsmPrimitives in the original state to OsmPrimitives in cloned state */
-    private Map<OsmPrimitive, OsmPrimitive> cloneMap = new HashMap<OsmPrimitive, OsmPrimitive>();
+    private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<OsmPrimitive, PrimitiveData>();
 
     /** the layer which this command is applied to */
@@ -56 +57 @@
     /**
      * Creates a new command in the context of a specific data layer
-     * 
+     *
      * @param layer the data layer
      */
@@ -86 +87 @@
      */
     public void undoCommand() {
-        for (Entry<OsmPrimitive, OsmPrimitive> e : cloneMap.entrySet()) {
-            e.getKey().cloneFrom(e.getValue());
+        for (Entry<OsmPrimitive, PrimitiveData> e : cloneMap.entrySet()) {
+            e.getKey().load(e.getValue(), layer.data);
         }
     }
@@ -95 +96 @@
      * any buffer if it is not longer applicable to the dataset (e.g. it was part of
      * the removed layer)
-     * 
+     *
      * @param oldLayer the old layer
      * @return true if this command
@@ -109 +110 @@
      * of the object. Usually for undoing.
      */
-    public OsmPrimitive getOrig(OsmPrimitive osm) {
-        OsmPrimitive o = cloneMap.get(osm);
+    public PrimitiveData getOrig(OsmPrimitive osm) {
+        PrimitiveData o = cloneMap.get(osm);
         if (o != null)
             return o;
         Main.debug("unable to find osm with id: " + osm.getId() + " hashCode: " + osm.hashCode());
         for (OsmPrimitive t : cloneMap.keySet()) {
-            OsmPrimitive to = cloneMap.get(t);
+            PrimitiveData to = cloneMap.get(t);
             Main.debug("now: " + t.getId() + " hashCode: " + t.hashCode());
             Main.debug("orig: " + to.getId() + " hashCode: " + to.hashCode());
@@ -124 +125 @@
     /**
      * Replies the layer this command is (or was) applied to.
-     * 
+     *
      * @return
      */