Changeset 5724 in josm for trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

Timestamp:

2013-02-17T15:01:13+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #4664 - warn when reverting a way with direction defined by tag

File:

• trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) (5 diffs)

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

@@ -24 +24 @@
  * A TagCollection can be created:
  * <ul>
- *  <li>from the tags managed by a specific {@link OsmPrimitive} with {@link #from(OsmPrimitive)}</li>
+ *  <li>from the tags managed by a specific {@link OsmPrimitive} with {@link #from(Tagged)}</li>
  *  <li>from the union of all tags managed by a collection of {@link OsmPrimitive}s with {@link #unionOfAllPrimitives(Collection)}</li>
  *  <li>from the union of all tags managed by a {@link DataSet} with {@link #unionOfAllPrimitives(DataSet)}</li>
@@ -51 +51 @@
     public static TagCollection from(Tagged primitive) {
         TagCollection tags = new TagCollection();
-        for (String key: primitive.keySet()) {
-            tags.add(new Tag(key, primitive.get(key)));
+        if (primitive != null) {
+            for (String key: primitive.keySet()) {
+                tags.add(new Tag(key, primitive.get(key)));
+            }
         }
         return tags;
@@ -158 +160 @@
 
     /**
+     * Creates a tag collection from <code>tags</code>.
+     * @param tags the collection of tags
+     * @since 5724
+     */
+    public TagCollection(Collection<Tag> tags) {
+        add(tags);
+    }
+
+    /**
      * Replies the number of tags in this tag collection
      *
@@ -637 +648 @@
      * Does nothing if primitives is null
      *
-     * @param primitive  the collection of primitives
+     * @param primitives the collection of primitives
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
@@ -657 +668 @@
      */
     public TagCollection intersect(TagCollection other) {
-        if (other == null) {
-            other = new TagCollection();
-        }
-        TagCollection ret = new TagCollection(this);
-        for (Tag tag: tags) {
-            if (other.contains(tag)) {
-                ret.add(tag);
+        TagCollection ret = new TagCollection();
+        if (other != null) {
+            for (Tag tag: tags) {
+                if (other.contains(tag)) {
+                    ret.add(tag);
+                }
             }
         }