Changeset 2008 in josm for trunk/src/org/openstreetmap/josm/actions/CopyAction.java

Timestamp:

30.08.2009 15:41:28 (3 years ago)

Author:

Gubaer

Message:

new: tag conflict resolution when pasting tags (only if necessary)
fixed #2611: cant copy'n'past tags from a relation to ways or other way round
fixed #3137: Paste Tags does not work for relations

File:

• trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) (4 diffs)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -110 +108 @@
                     osm.visit(this);
                 }
-
-                // Used internally only (in PasteTagsAction), therefore no need to translate these
-                if(getCurrentDataSet().getSelectedNodes().size() > 0) {
-                    pasteBuffer.dataSources.add(new DataSource(null, "Copied Nodes"));
-                }
-                if(getCurrentDataSet().getSelectedWays().size() > 0) {
-                    pasteBuffer.dataSources.add(new DataSource(null, "Copied Ways"));
-                }
-                if(getCurrentDataSet().getSelectedRelations().size() > 0) {
-                    pasteBuffer.dataSources.add(new DataSource(null, "Copied Relations"));
-                }
             }
         }.visitAll();
@@ -135 +122 @@
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         if (sel.isEmpty()) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Please select something to copy."),