Changeset 558 in josm for trunk

Timestamp:

2008-02-24T18:25:31+01:00 (17 years ago)

Author:

david

Message:

implement Paste Tags

Location:

trunk

Files:

• images/pastetags.png (added)
• src/org/openstreetmap/josm/actions/CopyAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/JosmAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/PasteTagsAction.java (added)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.LinkedList;
 import java.util.Collection;
 
@@ -26 +27 @@
 public final class CopyAction extends JosmAction implements SelectionChangedListener {
 
+        private LinkedList<JosmAction> listeners;
+        
         public CopyAction() {
                 super(tr("Copy"), "copy",
@@ -32 +35 @@
                 setEnabled(false);
                 DataSet.selListeners.add(this);
+                listeners = new LinkedList<JosmAction>();
         }
 
+        @Override public void addListener(JosmAction a) {
+                listeners.add(a);
+        }
+        
         public void actionPerformed(ActionEvent e) {
                 Collection<OsmPrimitive> sel = Main.ds.getSelected();
@@ -99 +107 @@
                 Main.pasteBuffer = pasteBuffer;
                 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);
+                }
         }
 

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -51 +52 @@
         }
 
-
+        /**
+         * needs to be overridden to be useful
+         */
+        public void pasteBufferChanged(DataSet newPasteBuffer) {
+                return;
+        }
+        
+        /**
+         * needs to be overridden to be useful
+         */
+        public void addListener(JosmAction a) {
+                return;
+        }
+        
         private void setHelpId() {
                 String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -111 +111 @@
                 sel.addAll(getSelected(relations));
                 return sel;
+        }
+
+        /**
+         * Return selected nodes.
+         */
+        public Collection<OsmPrimitive> getSelectedNodes() {
+                return getSelected(nodes);
+        }
+
+        /**
+         * Return selected ways.
+         */
+        public Collection<OsmPrimitive> getSelectedWays() {
+                return getSelected(ways);
+        }
+
+        /**
+         * Return selected relations.
+         */
+        public Collection<OsmPrimitive> getSelectedRelations() {
+                return getSelected(relations);
         }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.OpenAction;
 import org.openstreetmap.josm.actions.PasteAction;
+import org.openstreetmap.josm.actions.PasteTagsAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
@@ -74 +75 @@
         public final JosmAction copy = new CopyAction();
         public final JosmAction paste = new PasteAction();
+        public final JosmAction pasteTags = new PasteTagsAction(copy); 
         public final JosmAction duplicate = new DuplicateAction(); 
         public final JosmAction selectAll = new SelectAllAction();
@@ -147 +149 @@
                 current = editMenu.add(paste);
                 current.setAccelerator(paste.shortCut);
+                current = editMenu.add(pasteTags);
+                current.setAccelerator(pasteTags.shortCut);
                 current = editMenu.add(duplicate);
                 current.setAccelerator(duplicate.shortCut);