Changeset 2305 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-10-24T21:22:49+02:00 (17 years ago)

Author:

jttt

Message:

Use PrimitiveData for Copy, Paste and Paste tags actions

Location:

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

Files:

• Changeset.java (modified) (3 diffs)
• DataSet.java (modified) (12 diffs)
• NodeData.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (5 diffs)
• OsmPrimitiveType.java (modified) (2 diffs)
• PrimitiveData.java (modified) (5 diffs)
• PrimitiveDeepCopy.java (added)
• Relation.java (modified) (3 diffs)
• RelationData.java (modified) (1 diff)
• RelationMemberData.java (modified) (2 diffs)
• Tag.java (modified) (10 diffs)
• TagCollection.java (modified) (50 diffs)
• Tagged.java (modified) (8 diffs)
• Way.java (modified) (1 diff)
• WayData.java (modified) (1 diff)

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

@@ -50 +50 @@
     /**
      * Creates a changeset with id <code>id</code>. If id > 0, sets incomplete to true.
-     * 
+     *
      * @param id the id
      */
@@ -61 +61 @@
     /**
      * Creates a clone of <code>other</code>
-     * 
+     *
      * @param other the other changeset. If null, creates a new changeset with id 0.
      */
@@ -192 +192 @@
         this.tags.remove(key);
     }
+
+    public void removeAll() {
+        this.tags.clear();
+    }
+
 
     public boolean hasEqualSemanticAttributes(Changeset other) {

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.awt.geom.Area;
 import java.util.ArrayList;
@@ -16 +14 @@
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.QuadBuckets;
 
 /**
@@ -113 +110 @@
      */
     public void addPrimitive(OsmPrimitive primitive) {
-        if (primitive == null)
-            return;
         if (primitive instanceof Node) {
             nodes.add((Node) primitive);
@@ -121 +116 @@
         } else if (primitive instanceof Relation) {
             relations.add((Relation) primitive);
+        }
+    }
+
+    public OsmPrimitive addPrimitive(PrimitiveData data) {
+        if (data instanceof NodeData) {
+            Node node = new Node((NodeData)data, this);
+            nodes.add(node);
+            return node;
+        } else if (data instanceof WayData) {
+            Way way = new Way((WayData)data, this);
+            ways.add(way);
+            return way;
+        } else if (data instanceof RelationData) {
+            Relation relation = new Relation((RelationData)data, this);
+            relations.add(relation);
+            return relation;
+        } else {
+            throw new AssertionError();
         }
     }
@@ -145 +158 @@
     }
 
+    public void removePrimitive(long id, OsmPrimitiveType type) {
+        removePrimitive(getPrimitiveById(id, type));
+    }
+
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
         Collection<OsmPrimitive> sel = getSelected(nodes);
@@ -246 +263 @@
      * Sets the current selection to the primitives in <code>selection</code>.
      * Notifies all {@see SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
-     * 
+     *
      * @param selection the selection
      * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
@@ -265 +282 @@
      * Sets the current selection to the primitives in <code>selection</code>
      * and notifies all {@see SelectionChangedListener}.
-     * 
+     *
      * @param selection the selection
      */
@@ -275 +292 @@
      * Adds   the primitives in <code>selection</code> to the current selection
      * and notifies all {@see SelectionChangedListener}.
-     * 
+     *
      * @param selection the selection
      */
@@ -285 +302 @@
      * Adds the primitives in <code>selection</code> to the current selection.
      * Notifies all {@see SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
-     * 
+     *
      * @param selection the selection
      * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
@@ -443 +460 @@
      * exists
      *
-     * @param id  the id, > 0 required
+     * @param id  uniqueId of the primitive. Might be < 0 for newly created primitives
      * @param type the type of  the primitive. Must not be null.
      * @return the primitive
-     * @exception IllegalArgumentException thrown, if id <= 0
-     * @exception IllegalArgumentException thrown, if type is null
-     * @exception IllegalArgumentException thrown, if type is neither NODE, or WAY or RELATION
+     * @exception NullPointerException thrown, if type is null
      */
     public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) {
-        if (id <= 0)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
-        if (id <= 0)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type"));
+        return getPrimitiveById(id, type, false);
+    }
+
+    public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type, boolean createNew) {
         Collection<? extends OsmPrimitive> primitives = null;
         switch(type) {
@@ -462 +477 @@
         }
         for (OsmPrimitive primitive : primitives) {
-            if (primitive.getId() == id) return primitive;
-        }
-        return null;
+            if (primitive.getUniqueId() == id) return primitive;
+        }
+
+        if (createNew) {
+            OsmPrimitive result = null;
+            switch (type) {
+            case NODE: result = new Node(id, true); break;
+            case WAY: result = new Way(id, true); break;
+            case RELATION: result = new Relation(id, true); break;
+            }
+            addPrimitive(result);
+            return result;
+        } else {
+            return null;
+        }
     }
 
@@ -565 +592 @@
      * Replies true if there is at least one primitive in this dataset with
      * {@see OsmPrimitive#isModified()} == <code>true</code>.
-     * 
+     *
      * @return true if there is at least one primitive in this dataset with
      * {@see OsmPrimitive#isModified()} == <code>true</code>.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import org.openstreetmap.josm.data.coor.CachedLatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 
 public class NodeData extends PrimitiveData {
 
-    private LatLon coor;
+    private final CachedLatLon coor = new CachedLatLon(0, 0);
+
+    public NodeData() {
+
+    }
+
+    public NodeData(double lat, double lon, String... keys) {
+        setCoor(new LatLon(lat, lon));
+        setKeysAsList(keys);
+    }
+
+    public NodeData(String... keys) {
+        setKeysAsList(keys);
+    }
+
+    public NodeData(NodeData data) {
+        super(data);
+        setCoor(data.getCoor());
+    }
 
     public LatLon getCoor() {
@@ -13 +33 @@
 
     public void setCoor(LatLon coor) {
-        this.coor = coor;
+        this.coor.setCoor(coor);
+    }
+
+    public EastNorth getEastNorth() {
+        return this.coor.getEastNorth();
+    }
+
+    public void setEastNorth(EastNorth eastNorth) {
+        this.coor.setEastNorth(eastNorth);
+    }
+
+    @Override
+    public NodeData makeCopy() {
+        return new NodeData(this);
+    }
+
+    @Override
+    public Node makePrimitive(DataSet dataSet) {
+        return new Node(this, dataSet);
     }
 

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

@@ -36 +36 @@
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive>, Tagged {
 
-    static final AtomicLong idCounter = new AtomicLong(0);
+    private static final AtomicLong idCounter = new AtomicLong(0);
+
+    static long generateUniqueId() {
+        return idCounter.decrementAndGet();
+    }
 
     private static final int FLAG_MODIFIED = 1 << 0;
@@ -164 +168 @@
                 throw new IllegalArgumentException(tr("Expected ID >= 0. Got {0}.", id));
             else if (id == 0) {
-                this.id = idCounter.decrementAndGet();
+                this.id = generateUniqueId();
             } else {
                 this.id = id;
@@ -400 +404 @@
      */
     public void clearOsmId() {
-        this.id = idCounter.decrementAndGet();
+        this.id = generateUniqueId();
         this.version = 0;
         this.incomplete = false;
@@ -456 +460 @@
         if(directionKeys == null) {
             directionKeys = Main.pref.getCollection("tags.direction",
-                    Arrays.asList(new String[]{"oneway","incline","incline_steep","aerialway"}));
+                    Arrays.asList("oneway","incline","incline_steep","aerialway"));
         }
         return directionKeys;
@@ -841 +845 @@
 
     protected void saveCommonAttributes(PrimitiveData data) {
-        data.setId(data.getId());
+        data.setId(id);
         data.getKeys().clear();
         data.getKeys().putAll(getKeys());

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

@@ -5 +5 @@
 public enum OsmPrimitiveType {
 
-    NODE ("node"),
-    WAY  ("way"),
-    RELATION ("relation");
+    NODE ("node", Node.class, NodeData.class),
+    WAY  ("way", Way.class, WayData.class),
+    RELATION ("relation", Relation.class, RelationData.class);
 
-    private String apiTypeName;
+    private final String apiTypeName;
+    private final Class<? extends OsmPrimitive> osmClass;
+    private final Class<? extends PrimitiveData> dataClass;
 
-    OsmPrimitiveType(String apiTypeName) {
+    OsmPrimitiveType(String apiTypeName, Class<? extends OsmPrimitive> osmClass, Class<? extends PrimitiveData> dataClass) {
         this.apiTypeName = apiTypeName;
+        this.osmClass = osmClass;
+        this.dataClass = dataClass;
     }
 
     public String getAPIName() {
         return apiTypeName;
+    }
+
+    public Class<? extends OsmPrimitive> getOsmClass() {
+        return osmClass;
+    }
+
+    public Class<? extends PrimitiveData> getDataClass() {
+        return dataClass;
     }
 
@@ -30 +42 @@
     }
 
-    public static OsmPrimitiveType from(Class cls) {
+    public static OsmPrimitiveType from(Class<? extends OsmPrimitive> cls) {
         if (cls.equals(Node.class)) return NODE;
         if (cls.equals(Way.class)) return WAY;
         if (cls.equals(Relation.class)) return RELATION;
         throw new IllegalArgumentException(tr("Parameter ''{0}'' is not an acceptable class. Got ''{1}''.", "cls", cls.toString()));
+    }
+
+    public static OsmPrimitiveType fromData(Class<? extends PrimitiveData> cls) {
+        if (cls.equals(NodeData.class)) return NODE;
+        if (cls.equals(WayData.class)) return WAY;
+        if (cls.equals(RelationData.class)) return RELATION;
+        throw new IllegalArgumentException(tr("Parameter ''{0}'' is not an acceptable class. Got ''{1}''.", "cls", cls.toString()));
+    }
+
+    public static OsmPrimitiveType fromData(PrimitiveData data) {
+        return fromData(data.getClass());
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
@@ -12 +15 @@
  *
  */
-public abstract class PrimitiveData {
+public abstract class PrimitiveData implements Tagged {
 
     // Useful?
@@ -19 +22 @@
     //private boolean selected;
     //private boolean highlighted;
+
+    public PrimitiveData() {
+        id = OsmPrimitive.generateUniqueId();
+    }
+
+    public PrimitiveData(PrimitiveData data) {
+        this.keys.putAll(data.keys);
+        this.modified = data.modified;
+        this.visible = data.visible;
+        this.deleted = data.deleted;
+        this.id = data.id;
+        this.user = data.user;
+        this.version = data.version;
+        this.timestamp = data.timestamp;
+    }
 
     private final Map<String, String> keys = new HashMap<String, String>();
@@ -75 +93 @@
     }
 
+    public void clearOsmId() {
+        id = OsmPrimitive.generateUniqueId();
+    }
+
+    public abstract PrimitiveData makeCopy();
+
+    public abstract OsmPrimitive makePrimitive(DataSet dataSet);
 
     @Override
@@ -94 +119 @@
     }
 
+    // Tagged implementation
+
+    public String get(String key) {
+        return keys.get(key);
+    }
+
+    public boolean hasKeys() {
+        return !keys.isEmpty();
+    }
+
+    public Collection<String> keySet() {
+        return keys.keySet();
+    }
+
+    public void put(String key, String value) {
+        keys.put(key, value);
+    }
+
+    public void remove(String key) {
+        keys.remove(key);
+    }
+
+    public void removeAll() {
+        keys.clear();
+    }
+
+    public void setKeys(Map<String, String> keys) {
+        this.keys.clear();
+        this.keys.putAll(keys);
+    }
+
+
+    @SuppressWarnings("unchecked")
+    static public <T extends PrimitiveData>  List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
+        List<T> ret = new ArrayList<T>();
+        for(PrimitiveData p: list) {
+            if (type.getDataClass().isInstance(p)) {
+                ret.add((T)p);
+            }
+        }
+        return ret;
+    }
+
+    protected void setKeysAsList(String... keys) {
+        assert keys.length % 2 == 0;
+        for (int i=0; i<keys.length/2; i++) {
+            this.keys.put(keys[i * 2], keys[i * 2 + 1]);
+        }
+    }
+
+
 
 }

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

@@ -205 +205 @@
                 foundMember = nodes.get(member.getMemberId());
                 if (foundMember == nodeMarker) {
-                    foundMember = new Node(member.getMemberId(), true);
+                    throw new AssertionError("Data consistency problem - relation with missing member detected");
                 }
                 break;
@@ -211 +211 @@
                 foundMember = ways.get(member.getMemberId());
                 if (foundMember == wayMarker) {
-                    foundMember = new Way(member.getMemberId(), true);
+                    throw new AssertionError("Data consistency problem - relation with missing member detected");
                 }
                 break;
@@ -217 +217 @@
                 foundMember = relations.get(member.getMemberId());
                 if (foundMember == relationMarker) {
-                    foundMember = new Relation(member.getMemberId(), true);
+                    throw new AssertionError("Data consistency problem - relation with missing member detected");
                 }
                 break;

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

@@ -9 +9 @@
     private final List<RelationMemberData> members = new ArrayList<RelationMemberData>();
 
+    public RelationData() {
+
+    }
+
+    public RelationData(RelationData data) {
+        super(data);
+        members.addAll(data.members);
+    }
+
     public List<RelationMemberData> getMembers() {
         return members;
+    }
+
+    @Override
+    public RelationData makeCopy() {
+        return new RelationData(this);
+    }
+
+    @Override
+    public Relation makePrimitive(DataSet dataSet) {
+        return new Relation(this, dataSet);
     }
 

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

@@ -4 +4 @@
 public class RelationMemberData {
 
-    private String role;
-    private long memberId;
-    private OsmPrimitiveType memberType;
+    private final String role;
+    private final long memberId;
+    private final OsmPrimitiveType memberType;
 
-    public RelationMemberData() {
-
+    public RelationMemberData(String role, OsmPrimitiveType type, long id) {
+        this.role = role;
+        this.memberType = type;
+        this.memberId = id;
     }
 
     public RelationMemberData(String role, OsmPrimitive primitive) {
-        this.role = role;
-        this.memberId = primitive.getUniqueId();
-        this.memberType = OsmPrimitiveType.from(primitive);
+        this(role, OsmPrimitiveType.from(primitive), primitive.getUniqueId());
     }
 
@@ -21 +21 @@
         return memberId;
     }
-    public void setMemberId(long memberId) {
-        this.memberId = memberId;
-    }
     public String getRole() {
         return role;
     }
-    public void setRole(String role) {
-        this.role = role;
-    }
     public OsmPrimitiveType getMemberType() {
         return memberType;
-    }
-    public void setMemberType(OsmPrimitiveType memberType) {
-        this.memberType = memberType;
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
 
 /**
@@ -21 +17 @@
      */
     public Tag(){
-        this.key = "";
-        this.value = "";
+        this("", "");
     }
 
@@ -28 +23 @@
      * Create a tag whose key is <code>key</code> and whose value is
      * empty.
-     * 
+     *
      * @param key the key. If null, it is set to the empty key.
      */
     public Tag(String key) {
-        this();
-        this.key = key == null ? "" : key;
+        this(key, "");
     }
 
@@ -39 +33 @@
      * Creates a tag for a key and a value. If key and/or value are null,
      * the empty value "" is assumed.
-     * 
+     *
      * @param key the key
      * @param value  the value
@@ -50 +44 @@
     /**
      * Creates clone of the tag <code>tag</code>.
-     * 
-     * @param tag the tag. If null, creates an empty tag.
+     *
+     * @param tag the tag.
      */
     public Tag(Tag tag) {
-        if (tag != null) {
-            key = tag.getKey();
-            value = tag.getValue();
-        }
+        this(tag.getKey(), tag.getValue());
     }
 
     /**
      * Replies the key of the tag. This is never null.
-     * 
+     *
      * @return the key of the tag
      */
@@ -71 +62 @@
     /**
      * Replies the value of the tag. This is never null.
-     * 
+     *
      * @return the value of the tag
      */
@@ -86 +77 @@
      * Replies true if the key of this tag is equal to <code>key</code>.
      * If <code>key</code> is null, assumes the empty key.
-     * 
+     *
      * @param key the key
      * @return true if the key of this tag is equal to <code>key</code>
      */
     public boolean matchesKey(String key) {
-        if (key == null) {
-            key = "";
-        }
         return this.key.equals(key);
     }
@@ -102 +90 @@
      *   <li>removing leading and trailing white space</li>
      * <ul>
-     * 
+     *
      */
     public void normalize() {
@@ -113 +101 @@
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((value == null) ? 0 : value.hashCode());
+        result = prime * result + key.hashCode();
+        result = prime * result + value.hashCode();
         return result;
     }
@@ -120 +108 @@
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
+        if (obj instanceof Tag) {
+            Tag other = (Tag) obj;
+            return key.equals(other.getKey()) && value.equals(other.getValue());
+        } else {
             return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Tag other = (Tag) obj;
-        if (key == null) {
-            if (other.key != null)
-                return false;
-        } else if (!key.equals(other.key))
-            return false;
-        if (value == null) {
-            if (other.value != null)
-                return false;
-        } else if (!value.equals(other.value))
-            return false;
-        return true;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return key + "=" + value;
     }
 }

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

@@ -17 +17 @@
  * TagCollection is a collection of tags which can be used to manipulate
  * tags managed by {@see OsmPrimitive}s.
- * 
+ *
  * A TagCollection can be created:
  * <ul>
@@ -25 +25 @@
  *  <li>from the intersection of all tags managed by a collection of primitives with {@see #commonToAllPrimitives(Collection)}</li>
  * </ul>
- * 
+ *
  * It  provides methods to query the collection, like {@see #size()}, {@see #hasTagsFor(String)}, etc.
- * 
+ *
  * Basic set operations allow to create the union, the intersection and  the difference
  * of tag collections, see {@see #union(TagCollection)}, {@see #intersect(TagCollection)},
  * and {@see #minus(TagCollection)}.
- * 
+ *
  *
  */
@@ -40 +40 @@
      * {@see OsmPrimitive}. If <code>primitive</code> is null, replies
      * an empty tag collection.
-     * 
+     *
      * @param primitive  the primitive
      * @return a tag collection with the tags managed by a specific
      * {@see OsmPrimitive}
      */
-    public static TagCollection from(OsmPrimitive primitive) {
+    public static TagCollection from(Tagged primitive) {
         TagCollection tags = new TagCollection();
         for (String key: primitive.keySet()) {
@@ -62 +62 @@
      * a collection of primitives
      */
-    public static TagCollection unionOfAllPrimitives(Collection<? extends OsmPrimitive> primitives) {
+    public static TagCollection unionOfAllPrimitives(Collection<? extends Tagged> primitives) {
         TagCollection tags = new TagCollection();
         if (primitives == null) return tags;
-        for (OsmPrimitive primitive: primitives) {
+        for (Tagged primitive: primitives) {
             if (primitive == null) {
                 continue;
@@ -78 +78 @@
      * <code>primitives</code>. Replies an empty tag collection of <code>primitives</code>
      * is null.
-     * 
+     *
      * @param primitives the primitives
      * @return  a tag collection with the tags which are common to all primitives
      */
-    public static TagCollection commonToAllPrimitives(Collection<? extends OsmPrimitive> primitives) {
+    public static TagCollection commonToAllPrimitives(Collection<? extends Tagged> primitives) {
         TagCollection tags = new TagCollection();
         if (primitives == null || primitives.isEmpty()) return tags;
@@ -91 +91 @@
         // intersect with the others
         //
-        for (OsmPrimitive primitive: primitives) {
+        for (Tagged primitive: primitives) {
             if (primitive == null) {
                 continue;
@@ -103 +103 @@
      * Replies a tag collection with the union of the tags which are common to all primitives in
      * the dataset <code>ds</code>. Returns an empty tag collection of <code>ds</code> is null.
-     * 
+     *
      * @param ds the dataset
      * @return a tag collection with the union of the tags which are common to all primitives in
@@ -129 +129 @@
      * Creates a clone of the tag collection <code>other</code>. Creats an empty
      * tag collection if <code>other</code> is null.
-     * 
+     *
      * @param other the other collection
      */
@@ -141 +141 @@
     /**
      * Replies the number of tags in this tag collection
-     * 
+     *
      * @return the number of tags in this tag collection
      */
@@ -150 +150 @@
     /**
      * Replies true if this tag collection is empty
-     * 
+     *
      * @return true if this tag collection is empty; false, otherwise
      */
@@ -159 +159 @@
     /**
      * Adds a tag to the tag collection. If <code>tag</code> is null, nothing is added.
-     * 
+     *
      * @param tag the tag to add
      */
@@ -171 +171 @@
      * Adds a collection of tags to the tag collection. If <code>tags</code> is null, nothing
      * is added. null values in the collection are ignored.
-     * 
+     *
      * @param tags the collection of tags
      */
@@ -184 +184 @@
      * Adds the tags of another tag collection to this collection. Adds nothing, if
      * <code>tags</code> is null.
-     * 
+     *
      * @param tags the other tag collection
      */
@@ -195 +195 @@
      * Removes a specific tag from the tag collection. Does nothing if <code>tag</code> is
      * null.
-     * 
+     *
      * @param tag the tag to be removed
      */
@@ -206 +206 @@
      * Removes a collection of tags from the tag collection. Does nothing if <code>tags</code> is
      * null.
-     * 
+     *
      * @param tags the tags to be removed
      */
@@ -217 +217 @@
      * Removes all tags in the tag collection <code>tags</code> from the current tag collection.
      * Does nothing if <code>tags</code> is null.
-     * 
+     *
      * @param tags the tag collection to be removed.
      */
@@ -228 +228 @@
      * Removes all tags whose keys are equal to  <code>key</code>. Does nothing if <code>key</code>
      * is null.
-     * 
+     *
      * @param key the key to be removed
      */
@@ -244 +244 @@
      * Removes all tags whose key is in the collection <code>keys</code>. Does nothing if
      * <code>keys</code> is null.
-     * 
+     *
      * @param keys the collection of keys to be removed
      */
@@ -256 +256 @@
     /**
      * Replies true if the this tag collection contains <code>tag</code>.
-     * 
+     *
      * @param tag the tag to look up
      * @return true if the this tag collection contains <code>tag</code>; false, otherwise
@@ -266 +266 @@
     /**
      * Replies true if this tag collection contains at least one tag with key <code>key</code>.
-     * 
+     *
      * @param key the key to look up
      * @return true if this tag collection contains at least one tag with key <code>key</code>; false, otherwise
@@ -281 +281 @@
      * Replies true if this tag collection contains all tags in <code>tags</code>. Replies
      * false, if tags is null.
-     * 
+     *
      * @param tags the tags to look up
      * @return true if this tag collection contains all tags in <code>tags</code>. Replies
@@ -288 +288 @@
     public boolean containsAll(Collection<Tag> tags) {
         if (tags == null) return false;
-        return tags.containsAll(tags);
+        return this.tags.containsAll(tags);
     }
 
@@ -294 +294 @@
      * Replies true if this tag collection at least one tag for every key in <code>keys</code>.
      * Replies false, if <code>keys</code> is null. null values in <code>keys</code> are ignored.
-     * 
+     *
      * @param keys the keys to lookup
      * @return true if this tag collection at least one tag for every key in <code>keys</code>.
@@ -311 +311 @@
     /**
      * Replies the number of tags with key <code>key</code>
-     * 
+     *
      * @param key the key to look up
      * @return the number of tags with key <code>key</code>. 0, if key is null.
@@ -328 +328 @@
     /**
      * Replies true if there is at least one tag for the given key.
-     * 
+     *
      * @param key the key to look up
      * @return true if there is at least one tag for the given key. false, if key is null.
@@ -339 +339 @@
      * Replies true it there is at least one tag with a non empty value for key.
      * Replies false if key is null.
-     * 
+     *
      * @param key the key
      * @return true it there is at least one tag with a non empty value for key.
@@ -354 +354 @@
      * if the value of this tag is not empty. Replies false if key is
      * null.
-     * 
+     *
      * @param key the key
      * @return true if there is exactly one tag for <code>key</code> and
@@ -368 +368 @@
      * Replies true if there is a tag with an empty value for <code>key</code>.
      * Replies false, if key is null.
-     * 
+     *
      * @param key the key
      * @return true if there is a tag with an empty value for <code>key</code>
@@ -381 +381 @@
      * Replies true if there is exactly one tag for <code>key</code> and if
      * the value for this tag is empty. Replies false if key is null.
-     * 
+     *
      * @param key the key
      * @return  true if there is exactly one tag for <code>key</code> and if
@@ -395 +395 @@
      * Replies a tag collection with the tags for a given key. Replies an empty collection
      * if key is null.
-     * 
+     *
      * @param key the key to look up
      * @return a tag collection with the tags for a given key. Replies an empty collection
@@ -415 +415 @@
      * Replies a tag collection with all tags whose key is equal to one of the keys in
      * <code>keys</code>. Replies an empty collection if keys is null.
-     * 
+     *
      * @param keys the keys to look up
      * @return a tag collection with all tags whose key is equal to one of the keys in
@@ -434 +434 @@
     /**
      * Replies the tags of this tag collection as set
-     * 
+     *
      * @return the tags of this tag collection as set
      */
@@ -444 +444 @@
      * Replies the tags of this tag collection as list.
      * Note that the order of the list is not preserved between method invocations.
-     * 
+     *
      * @return the tags of this tag collection as list.
      */
@@ -453 +453 @@
     /**
      * Replies an iterator to iterate over the tags in this collection
-     * 
+     *
      * @return the iterator
      */
@@ -462 +462 @@
     /**
      * Replies the set of keys of this tag collection.
-     * 
+     *
      * @return the set of keys of this tag collection
      */
@@ -475 +475 @@
     /**
      * Replies the set of keys which have at least 2 matching tags.
-     * 
+     *
      * @return the set of keys which have at least 2 matching tags.
      */
@@ -496 +496 @@
      * Sets a unique tag for the key of this tag. All other tags with the same key are
      * removed from the collection. Does nothing if tag is null.
-     * 
+     *
      * @param tag the tag to set
      */
@@ -509 +509 @@
      * removed from the collection. Assume the empty string for key and value if either
      * key or value is null.
-     * 
+     *
      * @param key the key
      * @param value the value
@@ -520 +520 @@
     /**
      * Replies the set of values in this tag collection
-     * 
+     *
      * @return the set of values
      */
@@ -534 +534 @@
      * Replies the set of values for a given key. Replies an empty collection if there
      * are no values for the given key.
-     * 
+     *
      * @param key the key to look up
      * @return the set of values for a given key. Replies an empty collection if there
@@ -552 +552 @@
     /**
      * Replies true if for every key there is one tag only, i.e. exactly one value.
-     * 
+     *
      * @return
      */
@@ -562 +562 @@
      * Applies this tag collection to an {@see OsmPrimitive}. Does nothing if
      * primitive is null
-     * 
+     *
      * @param primitive  the primitive
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
      */
-    public void applyTo(OsmPrimitive primitive) throws IllegalStateException {
+    public void applyTo(Tagged primitive) throws IllegalStateException {
         if (primitive == null) return;
         if (! isApplicableToPrimitive())
@@ -583 +583 @@
      * Applies this tag collection to a collection of {@see OsmPrimitive}s. Does nothing if
      * primitives is null
-     * 
+     *
      * @param primitives  the collection of primitives
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
      */
-    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException{
+    public void applyTo(Collection<? extends Tagged> primitives) throws IllegalStateException{
         if (primitives == null) return;
         if (! isApplicableToPrimitive())
             throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
-        for (OsmPrimitive primitive: primitives) {
+        for (Tagged primitive: primitives) {
             applyTo(primitive);
         }
@@ -600 +600 @@
      * Replaces the tags of an {@see OsmPrimitive} by the tags in this collection . Does nothing if
      * primitive is null
-     * 
+     *
      * @param primitive  the primitive
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
      */
-    public void replaceTagsOf(OsmPrimitive primitive) throws IllegalStateException {
+    public void replaceTagsOf(Tagged primitive) throws IllegalStateException {
         if (primitive == null) return;
         if (! isApplicableToPrimitive())
@@ -618 +618 @@
      * Replaces the tags of a collection of{@see OsmPrimitive}s by the tags in this collection.
      * Does nothing if primitives is null
-     * 
+     *
      * @param primitive  the collection of primitives
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
      */
-    public void replaceTagsOf(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
+    public void replaceTagsOf(Collection<? extends Tagged> primitives) throws IllegalStateException {
         if (primitives == null) return;
         if (! isApplicableToPrimitive())
             throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
-        for (OsmPrimitive primitive: primitives) {
+        for (Tagged primitive: primitives) {
             replaceTagsOf(primitive);
         }
@@ -634 +634 @@
     /**
      * Builds the intersection of this tag collection and another tag collection
-     * 
+     *
      * @param other the other tag collection. If null, replies an empty tag collection.
      * @return the intersection of this tag collection and another tag collection
@@ -653 +653 @@
     /**
      * Replies the difference of this tag collection and another tag collection
-     * 
+     *
      * @param other the other tag collection. May be null.
      * @return the difference of this tag collection and another tag collection
@@ -667 +667 @@
     /**
      * Replies the union of this tag collection and another tag collection
-     * 
+     *
      * @param other the other tag collection. May be null.
      * @return the union of this tag collection and another tag collection
@@ -690 +690 @@
     /**
      * Replies the concatenation of all tag values (concatenated by a semicolon)
-     * 
+     *
      * @return the concatenation of all tag values
      */
@@ -707 +707 @@
         return buffer.toString();
     }
+
+    @Override
+    public String toString() {
+        return tags.toString();
+    }
 }

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

@@ -6 +6 @@
 /**
  * Objects implement Tagged if they provide a map of key/value pairs.
- * 
- * 
+ *
+ *
  */
 // FIXME: better naming? setTags(), getTags(), getKeys() instead of keySet() ?
@@ -14 +14 @@
     /**
      * Sets the map of key/value pairs
-     * 
+     *
      * @param keys the map of key value pairs. If null, reset to the empty map.
      */
@@ -21 +21 @@
     /**
      * Replies the map of key/value pairs. Never null, but may be the empty map.
-     * 
+     *
      * @return the map of key/value pairs
      */
@@ -28 +28 @@
     /**
      * Sets a key/value pairs
-     * 
+     *
      * @param key the key
      * @param value the value. If null, removes the key/value pair.
@@ -36 +36 @@
     /**
      * Replies the value of the given key; null, if there is no value for this key
-     * 
+     *
      * @param key the key
      * @return the value
@@ -44 +44 @@
     /**
      * Removes a given key/value pair
-     * 
+     *
      * @param key the key
      */
@@ -51 +51 @@
     /**
      * Replies true, if there is at least one key/value pair; false, otherwise
-     * 
+     *
      * @return true, if there is at least one key/value pair; false, otherwise
      */
@@ -58 +58 @@
     /**
      * Replies the set of keys
-     * 
+     *
      * @return the set of keys
      */
     Collection<String> keySet();
+
+    /**
+     * Removes all tags
+     */
+    void removeAll();
 }

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

@@ -196 +196 @@
                 newNodes.add(foundNodes.get(nodeId));
             } else {
-                newNodes.add(new Node(nodeId, true));
+                throw new AssertionError("Data consistency problem - way with missing node detected");
             }
         }

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

@@ -9 +9 @@
     private final List<Long> nodes = new ArrayList<Long>();
 
+    public WayData() {
+
+    }
+
+    public WayData(WayData data) {
+        super(data);
+        nodes.addAll(data.getNodes());
+    }
+
     public List<Long> getNodes() {
         return nodes;
+    }
+
+    @Override
+    public WayData makeCopy() {
+        return new WayData(this);
+    }
+
+    @Override
+    public OsmPrimitive makePrimitive(DataSet dataSet) {
+        return new Way(this, dataSet);
     }