Changeset 4103 in josm

Timestamp:

2011-05-30T09:42:08+02:00 (13 years ago)

Author:

bastiK

Message:

fixed #6395 - "Paste Tags" (Ctrl+Shift+V) now completely broken

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)

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

@@ -466 +466 @@
     /**
      * Sets the keys of this primitives to the key/value pairs in <code>keys</code>.
-     * If <code>keys</code> is null removes all existing key/value pairs.
+     * Old key/value pairs are removed.
+     * If <code>keys</code> is null, clears existing key/value pairs.
      *
      * @param keys the key/value pairs to set. If null, removes all existing key/value pairs.

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

@@ -1035 +1035 @@
     protected void saveCommonAttributes(PrimitiveData data) {
         data.setId(id);
-        data.getKeys().clear();
-        data.getKeys().putAll(getKeys());
+        data.setKeys(getKeys());
         data.setTimestamp(getTimestamp());
         data.setUser(user);