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

Timestamp:

2013-05-10T17:13:24+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8690 - After copying some primitives, only select those that have been directly selected (and not all that have been created) -> Copying a way only selects the new way

File:

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

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

@@ -30 +30 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Paste OSM primitives from clipboard to the current edit layer.
+ * @since 404
+ */
 public final class PasteAction extends JosmAction implements PasteBufferChangedListener {
 
+    /**
+     * Constructs a new {@code PasteAction}.
+     */
     public PasteAction() {
         super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
@@ -45 +52 @@
     }
 
-    public  void pasteData(PrimitiveDeepCopy pasteBuffer, Layer source, ActionEvent e) {
+    /**
+     * Paste OSM primitives from the given paste buffer and OSM data layer source to the current edit layer.
+     * @param pasteBuffer The paste buffer containing primitive ids to copy
+     * @param source The OSM data layer used to look for primitive ids
+     * @param e The ActionEvent that triggered this operation
+     */
+    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;
@@ -87 +100 @@
         // Make a copy of pasteBuffer and map from old id to copied data id
         List<PrimitiveData> bufferCopy = new ArrayList<PrimitiveData>();
+        List<PrimitiveData> toSelect = new ArrayList<PrimitiveData>();
         Map<Long, Long> newNodeIds = new HashMap<Long, Long>();
         Map<Long, Long> newWayIds = new HashMap<Long, Long>();
@@ -104 +118 @@
             }
             bufferCopy.add(copy);
+            if (pasteBuffer.getDirectlyAdded().contains(data)) {
+                toSelect.add(copy);
+            }
         }
 
@@ -148 +165 @@
         /* Now execute the commands to add the duplicated contents of the paste buffer to the map */
 
-        Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy));
+        Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy, toSelect));
         Main.map.mapView.repaint();
     }