Changeset 1592 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-15T10:05:37+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2583 - patch by Michel Marti - fon't move objects when copying between layers

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/CopyAction.java (modified) (1 diff)
• actions/PasteAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -87 +87 @@
      */
     public static DataSet pasteBuffer = new DataSet();
+    public static Layer pasteSource;
     /**
      * The projection method used.
@@ -348 +349 @@
                 new javax.swing.JLabel(tr("There are unsaved changes. Discard the changes and continue?")+msg),
                 new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")},
-                new String[] {"save.png", "exit.png", "cancel.png"}).getValue(); 
+                new String[] {"save.png", "exit.png", "cancel.png"}).getValue();
 
                 // Save before exiting

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

@@ -48 +48 @@
 
         Main.pasteBuffer = copyData();
+        Main.pasteSource = Main.main.editLayer();
         Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */
 

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -35 +36 @@
 
     public void actionPerformed(ActionEvent e) {
-        pasteData(Main.pasteBuffer, e);
+        pasteData(Main.pasteBuffer, Main.pasteSource, e);
     }
-    
-    public static void pasteData(DataSet pasteBuffer, ActionEvent e) {
+
+    public static void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
         /* Find the middle of the pasteBuffer area */
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
@@ -52 +53 @@
         EastNorth mPosition;
         if((e.getModifiers() & ActionEvent.CTRL_MASK) ==0){
+            /* adjust the coordinates to the middle of the visible map area */
             mPosition = Main.map.mapView.getCenter();
         } else {
@@ -67 +69 @@
             Node nnew = new Node(n);
             nnew.id = 0;
-            /* adjust the coordinates to the middle of the visible map area */
-            nnew.eastNorth = new EastNorth(nnew.eastNorth.east() + offsetEast, nnew.eastNorth.north() + offsetNorth);
-            nnew.coor = Main.proj.eastNorth2latlon(nnew.eastNorth);
+            if (Main.main.editLayer() == source) {
+                nnew.eastNorth = new EastNorth(nnew.eastNorth.east() + offsetEast, nnew.eastNorth.north() + offsetNorth);
+                nnew.coor = Main.proj.eastNorth2latlon(nnew.eastNorth);
+            }
             map.put(n, nnew);
         }