Changeset 6092 in josm for trunk/src

Timestamp:

2013-07-30T18:24:18+02:00 (11 years ago)

Author:

akks

Message:

fix #7352: add "Paste tags" button to the relation editor

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/GenericRelationEditor.java (modified) (7 diffs)
• tagging/TagEditorModel.java (modified) (2 diffs)
• tagging/TagEditorPanel.java (modified) (2 diffs)
• tagging/TagTable.java (modified) (6 diffs)

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

@@ -137 +137 @@
             @Override
             public void updateTags(List<Tag> tags) {
-                GenericRelationEditor.this.updateTags(tags);
+                tagEditorPanel.getModel().updateTags(tags);
             }
 
@@ -216 +216 @@
                 }
         );
+        registerCopyPasteAction(tagEditorPanel.getPasteAction(), 
+                "PASTE_TAGS",
+                Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke());
+        registerCopyPasteAction(new PasteMembersAction(), "PASTE_MEMBERS", Shortcut.getPasteKeyStroke());
+        registerCopyPasteAction(new CopyMembersAction(), "COPY_MEMBERS", Shortcut.getCopyKeyStroke());
 
         tagEditorPanel.setNextFocusComponent(memberTable);
@@ -427 +432 @@
         pnl3.add(splitPane, BorderLayout.CENTER);
 
-        new PasteMembersAction();
-        new CopyMembersAction();
-        new PasteTagsAction();
-
         return pnl3;
     }
@@ -696 +697 @@
     }
 
-    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 {
     }
@@ -1718 +1691 @@
     class PasteMembersAction extends AddFromSelectionAction {
 
-        public PasteMembersAction() {
-            registerCopyPasteAction(this, "PASTE_MEMBERS", Shortcut.getPasteKeyStroke());
-        }
-
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -1765 +1734 @@
 
     class CopyMembersAction extends AbstractAction {
-
-        public CopyMembersAction() {
-            registerCopyPasteAction(this, "COPY_MEMBERS", Shortcut.getCopyKeyStroke());
-        }
-
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -1783 +1747 @@
     }
 
-    class PasteTagsAction extends AbstractAction {
-
-        public PasteTagsAction() {
-            registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).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

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -21 +21 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Tagged;
@@ -576 +577 @@
 
     /**
+     * Load tags from given list
+     * @param tags - the list
+     */
+    public void updateTags(List<Tag> tags) {
+         if (tags.isEmpty())
+            return;
+
+        Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
+        for (int i=0; i<getRowCount(); i++) {
+            TagModel tagModel = get(i);
+            modelTags.put(tagModel.getName(), tagModel);
+        }
+        for (Tag tag: tags) {
+            TagModel existing = modelTags.get(tag.getKey());
+
+            if (tag.getValue().isEmpty()) {
+                if (existing != null) {
+                    delete(tag.getKey());
+                }
+            } else {
+                if (existing != null) {
+                    updateTagValue(existing, tag.getValue());
+                } else {
+                    add(tag.getKey(), tag.getValue());
+                }
+            }
+        }
+    }
+
+    /**
      * replies true, if this model has been updated
      *

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -10 +10 @@
 import java.awt.event.FocusEvent;
 import java.util.EnumSet;
+import javax.swing.AbstractAction;
 
 import javax.swing.BoxLayout;
@@ -85 +86 @@
         btn.setMargin(new Insets(0,0,0,0));
         tagTable.addComponentNotStoppingCellEditing(btn);
+        
+        // paste action
+        pnl.add(btn = new JButton(tagTable.getPasteAction()));
+        btn.setMargin(new Insets(0,0,0,0));
+        tagTable.addComponentNotStoppingCellEditing(btn);
         return pnl;
+    }
+
+    public AbstractAction getPasteAction() {
+        return tagTable.getPasteAction();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -15 +15 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Collections;
 import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.AbstractAction;
+import static javax.swing.Action.SHORT_DESCRIPTION;
+import static javax.swing.Action.SMALL_ICON;
 import javax.swing.CellEditor;
 import javax.swing.DefaultListSelectionModel;
@@ -32 +38 @@
 import javax.swing.table.TableColumn;
 import javax.swing.text.JTextComponent;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.PasteTagsAction.TagPaster;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 
 import org.openstreetmap.josm.gui.dialogs.relation.RunnableAction;
@@ -304 +314 @@
     }
 
+     /**
+     * Action to be run when the user wants to paste tags from buffer
+     */
+    class PasteAction extends RunnableAction implements PropertyChangeListener{
+        public PasteAction() {
+            putValue(SMALL_ICON, ImageProvider.get("","pastetags"));
+            putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
+            TagTable.this.addPropertyChangeListener(this);
+            updateEnabledState();
+        }
+
+        @Override
+        public void run() {
+            Relation relation = new Relation();
+            model.applyToPrimitive(relation);
+            TagPaster tagPaster = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), Collections.<OsmPrimitive>singletonList(relation));
+            model.updateTags(tagPaster.execute());
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(TagTable.this.isEnabled());
+        }
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            updateEnabledState();
+        }
+    }
+    
     /** the delete action */
     private RunnableAction deleteAction = null;
@@ -310 +349 @@
     private RunnableAction addAction = null;
 
+    /** the tag paste action */
+    private RunnableAction pasteAction = null;
+
     /**
      *
@@ -320 +362 @@
     public RunnableAction getAddAction() {
         return addAction;
+    }
+
+    public RunnableAction getPasteAction() {
+        return pasteAction;
     }
 
@@ -353 +399 @@
         .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_MASK), "addTag");
         getActionMap().put("addTag", addAction);
+
+        pasteAction = new PasteAction();
 
         // create the table cell editor and set it to key and value columns