Changeset 3640 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

2010-10-24T15:07:01+02:00 (13 years ago)

Author:

jttt

Message:

Fix #5579 allow paste tags in the relation editor

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -54 +54 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.actions.PasteTagsAction.TagPaster;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -132 +133 @@
             @Override
             public void updateTags(List<Tag> tags) {
-                Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
-                for (int i=0; i<tagEditorPanel.getModel().getRowCount(); i++) {
-                    TagModel tagModel = tagEditorPanel.getModel().get(i);
-                    modelTags.put(tagModel.getName(), tagModel);
-                }
-                for (Tag tag: tags) {
-                    TagModel existing = modelTags.get(tag.getKey());
-
-                    if (tag.getValue().isEmpty()) {
-                        if (existing != null) {
-                            tagEditorPanel.getModel().delete(tag.getKey());
-                        }
-                    } else {
-                        if (existing != null) {
-                            tagEditorPanel.getModel().updateTagValue(existing, tag.getValue());
-                        } else {
-                            tagEditorPanel.getModel().add(tag.getKey(), tag.getValue());
-                        }
-                    }
-
-                }
+                GenericRelationEditor.this.updateTags(tags);
             }
 
@@ -429 +410 @@
         new PasteMembersAction();
         new CopyMembersAction();
+        new PasteTagsAction();
 
         return pnl3;
@@ -650 +632 @@
     }
 
+    protected void updateTags(List<Tag> tags) {
+
+        if (tags.isEmpty())
+            return;
+
+        Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
+        for (int i=0; i<tagEditorPanel.getModel().getRowCount(); i++) {
+            TagModel tagModel = tagEditorPanel.getModel().get(i);
+            modelTags.put(tagModel.getName(), tagModel);
+        }
+        for (Tag tag: tags) {
+            TagModel existing = modelTags.get(tag.getKey());
+
+            if (tag.getValue().isEmpty()) {
+                if (existing != null) {
+                    tagEditorPanel.getModel().delete(tag.getKey());
+                }
+            } else {
+                if (existing != null) {
+                    tagEditorPanel.getModel().updateTagValue(existing, tag.getValue());
+                } else {
+                    tagEditorPanel.getModel().add(tag.getKey(), tag.getValue());
+                }
+            }
+
+        }
+    }
+
     static class AddAbortException extends Exception  {
     }
@@ -1565 +1575 @@
     }
 
+    class PasteTagsAction extends AbstractAction {
+
+        public PasteTagsAction() {
+            registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT).getKeyStroke());
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            Relation relation = new Relation();
+            tagEditorPanel.getModel().applyToPrimitive(relation);
+            TagPaster tagPaster = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), Collections.<OsmPrimitive>singletonList(relation));
+            updateTags(tagPaster.execute());
+        }
+
+    }
+
     class MemberTableDblClickAdapter extends MouseAdapter {
         @Override