Changeset 3384 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-07-25T15:56:14+02:00 (14 years ago)

Author:

jttt

Message:

Support Copy&Paste in relation editor

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CopyAction.java (modified) (6 diffs)
• JosmAction.java (modified) (2 diffs)
• PasteAction.java (modified) (3 diffs)
• PasteTagsAction.java (modified) (3 diffs)

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

@@ -3 +3 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.Toolkit;
@@ -14 +14 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import javax.swing.JOptionPane;
@@ -20 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
 public final class CopyAction extends JosmAction {
-
-    private LinkedList<JosmAction> listeners;
 
     public CopyAction() {
@@ -31 +29 @@
                 Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.GROUP_MENU), true);
         putValue("help", ht("/Action/Copy"));
-        listeners = new LinkedList<JosmAction>();
-    }
-
-    @Override public void addListener(JosmAction a) {
-        listeners.add(a);
     }
 
@@ -42 +35 @@
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
+        copy(getEditLayer(), selection);
+    }
+
+    public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
         /* copy ids to the clipboard */
         StringBuilder idsBuilder = new StringBuilder();
-        for (OsmPrimitive p : selection) {
+        for (OsmPrimitive p : primitives) {
             idsBuilder.append(p.getId()+",");
         }
@@ -56 +53 @@
         }
         catch (RuntimeException x) {}
-        
-        Main.pasteBuffer.makeCopy(selection);
-        Main.pasteSource = getEditLayer();
-        Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */
 
-        for(JosmAction a : listeners) {
-            a.pasteBufferChanged(Main.pasteBuffer);
-        }
+        Main.pasteBuffer.makeCopy(primitives);
+        Main.pasteSource = source;
     }
 

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -103 +102 @@
      * needs to be overridden to be useful
      */
-    public void pasteBufferChanged(PrimitiveDeepCopy newPasteBuffer) {
-        return;
-    }
-
-    /**
-     * needs to be overridden to be useful
-     */
     public void addListener(JosmAction a) {
         return;

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public final class PasteAction extends JosmAction {
+public final class PasteAction extends JosmAction implements PasteBufferChangedListener {
 
     public PasteAction() {
@@ -33 +34 @@
                 Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
         putValue("help", ht("/Action/Paste"));
+        Main.pasteBuffer.addPasteBufferChangedListener(this);
     }
 
@@ -167 +169 @@
         setEnabled(!Main.pasteBuffer.isEmpty());
     }
+
+    @Override
+    public void pasteBufferChanged(PrimitiveDeepCopy pasteBuffer) {
+        updateEnabledState();
+    }
 }

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

@@ -3 +3 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public final class PasteTagsAction extends JosmAction {
+public final class PasteTagsAction extends JosmAction implements PasteBufferChangedListener {
 
     public PasteTagsAction(JosmAction copyAction) {
@@ -33 +34 @@
                 tr("Apply tags of contents of paste buffer to all selected items."),
                 Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
-        copyAction.addListener(this);
+        Main.pasteBuffer.addPasteBufferChangedListener(this);
         putValue("help", ht("/Action/PasteTags"));
     }