Changeset 2305 in josm for trunk/src/org/openstreetmap/josm/actions/PasteAction.java

Timestamp:

2009-10-24T21:22:49+02:00 (15 years ago)

Author:

jttt

Message:

Use PrimitiveData for Copy, Paste and Paste tags actions

File:

• trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.command.AddPrimitivesCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.NodeData;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
+import org.openstreetmap.josm.data.osm.RelationData;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
+import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -40 +38 @@
     }
 
-    public  void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
+    public  void pasteData(PrimitiveDeepCopy pasteBuffer, Layer source, ActionEvent e) {
         /* Find the middle of the pasteBuffer area */
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
-        for (Node n : pasteBuffer.nodes) {
-            double east = n.getEastNorth().east();
-            double north = n.getEastNorth().north();
-            if (east > maxEast) { maxEast = east; }
-            if (east < minEast) { minEast = east; }
-            if (north > maxNorth) { maxNorth = north; }
-            if (north < minNorth) { minNorth = north; }
+        for (PrimitiveData data : pasteBuffer.getAll()) {
+            if (data instanceof NodeData) {
+                NodeData n = (NodeData)data;
+                double east = n.getEastNorth().east();
+                double north = n.getEastNorth().north();
+                if (east > maxEast) { maxEast = east; }
+                if (east < minEast) { minEast = east; }
+                if (north > maxNorth) { maxNorth = north; }
+                if (north < minNorth) { minNorth = north; }
+            }
         }
 
@@ -63 +64 @@
         double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0;
 
-        HashMap<OsmPrimitive,OsmPrimitive> map = new HashMap<OsmPrimitive,OsmPrimitive>();
-        /* temporarily maps old nodes to new so we can do a true deep copy */
 
-        /* do the deep copy of the paste buffer contents, leaving the pasteBuffer unchanged */
-        for (Node n : pasteBuffer.nodes) {
-            Node nnew = new Node(n);
-            nnew.clearOsmId();
-            if (Main.map.mapView.getEditLayer() == source) {
-                nnew.setEastNorth(nnew.getEastNorth().add(offsetEast, offsetNorth));
-            }
-            map.put(n, nnew);
+
+        // Make a copy of pasteBuffer and map from old id to copied data id
+        List<PrimitiveData> bufferCopy = new ArrayList<PrimitiveData>();
+        Map<Long, Long> newIds = new HashMap<Long, Long>();
+        for (PrimitiveData data:pasteBuffer.getAll()) {
+            PrimitiveData copy = data.makeCopy();
+            copy.clearOsmId();
+            newIds.put(data.getId(), copy.getId());
+            bufferCopy.add(copy);
         }
-        for (Way w : pasteBuffer.ways) {
-            Way wnew = new Way();
-            wnew.cloneFrom(w);
-            wnew.clearOsmId();
-            /* make sure we reference the new nodes corresponding to the old ones */
-            List<Node> nodes = new ArrayList<Node>();
-            for (Node n : w.getNodes()) {
-                nodes.add((Node)map.get(n));
-            }
-            wnew.setNodes(nodes);
-            map.put(w, wnew);
-        }
-        for (Relation r : pasteBuffer.relations) {
-            Relation rnew = new Relation(r);
-            r.clearOsmId();
-            List<RelationMember> members = new ArrayList<RelationMember>();
-            for (RelationMember m : r.getMembers()) {
-                OsmPrimitive mo = map.get(m.getMember());
-                if(mo != null) /* FIXME - This only prevents illegal data, but kills the relation */
-                {
-                    RelationMember mnew = new RelationMember(m.getRole(), map.get(m.getMember()));
-                    members.add(mnew);
+
+        // Update references in copied buffer
+        for (PrimitiveData data:bufferCopy) {
+            if (data instanceof NodeData) {
+                NodeData nodeData = (NodeData)data;
+                if (Main.map.mapView.getEditLayer() == source) {
+                    nodeData.setEastNorth(nodeData.getEastNorth().add(offsetEast, offsetNorth));
+                }
+            } else if (data instanceof WayData) {
+                ListIterator<Long> it = ((WayData)data).getNodes().listIterator();
+                while (it.hasNext()) {
+                    it.set(newIds.get(it.next()));
+                }
+            } else if (data instanceof RelationData) {
+                ListIterator<RelationMemberData> it = ((RelationData)data).getMembers().listIterator();
+                while (it.hasNext()) {
+                    RelationMemberData member = it.next();
+                    it.set(new RelationMemberData(member.getRole(), member.getMemberType(), newIds.get(member.getMemberId())));
                 }
             }
-            rnew.setMembers(members);
-            map.put(r, rnew);
         }
 
-        /* Now execute the commands to add the dupicated contents of the paste buffer to the map */
-        Collection<OsmPrimitive> osms = map.values();
-        Collection<Command> clist = new LinkedList<Command>();
-        for (OsmPrimitive osm : osms) {
-            clist.add(new AddCommand(osm));
-        }
+        /* Now execute the commands to add the duplicated contents of the paste buffer to the map */
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Paste"), clist));
-        getCurrentDataSet().setSelected(osms);
+        Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy));
+        //getCurrentDataSet().setSelected(osms);
         Main.map.mapView.repaint();
     }
@@ -121 +110 @@
             return;
         }
-        setEnabled(
-                !Main.pasteBuffer.nodes.isEmpty()
-                || !Main.pasteBuffer.ways.isEmpty()
-                || !Main.pasteBuffer.relations.isEmpty()
-        );
+        setEnabled(!Main.pasteBuffer.isEmpty());
     }
 }