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

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

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

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

@@ -31 +31 @@
     public PasteAction() {
         super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
-            Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
         setEnabled(false);
     }
@@ -39 +39 @@
     }
 
-    public static void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
+    public  void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
         /* Find the middle of the pasteBuffer area */
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
@@ -63 +63 @@
 
         HashMap<OsmPrimitive,OsmPrimitive> map = new HashMap<OsmPrimitive,OsmPrimitive>();
-          /* temporarily maps old nodes to new so we can do a true deep copy */
+        /* 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 */
@@ -69 +69 @@
             Node nnew = new Node(n);
             nnew.id = 0;
-            if (Main.main.createOrGetEditLayer() == source) {
+            if (Main.map.mapView.getEditLayer() == source) {
                 nnew.setEastNorth(nnew.getEastNorth().add(offsetEast, offsetNorth));
             }
@@ -113 +113 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Paste"), clist));
-        Main.ds.setSelected(osms);
+        getCurrentDataSet().setSelected(osms);
         Main.map.mapView.repaint();
     }