Changeset 3137 in josm

Timestamp:

Mar 15, 2010 2:18:45 PM (3 years ago)

Author:

Gubaer

Message:

added a few utility methods

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/TagCollection.java (modified) (2 diffs)
• gui/tagging/TagEditorModel.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -54 +55 @@
 
     /**
+     * Creates a tag collection from a map of key/value-pairs. Replies
+     * an empty tag collection if {@code tags} is null.
+     * 
+     * @param tags  the key/value-pairs
+     * @return the tag collection
+     */
+    public static TagCollection from(Map<String,String> tags) {
+        TagCollection ret = new TagCollection();
+        if (tags == null) return ret;
+        for (Entry<String,String> entry: tags.entrySet()) {
+            String key = entry.getKey() == null? "" : entry.getKey();
+            String value = entry.getValue() == null ? "" : entry.getValue();
+            ret.add(new Tag(key,value));
+        }
+        return ret;
+    }
+
+    /**
      * Creates a tag collection from the union of the tags managed by
      * a collection of primitives. Replies an empty tag collection,

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

@@ -22 +22 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Tagged;
 
@@ -331 +332 @@
 
     /**
+     * Initializes the model with the tags in a tag collection. Removes
+     * all tags if {@code tags} is null.
+     *
+     * @param tags the tags
+     */
+    public void initFromTags(TagCollection tags) {
+        clear();
+        if (tags == null){
+            setDirty(false);
+            return;
+        }
+        for (String key : tags.getKeys()) {
+            String value = tags.getJoinedValues(key);
+            add(key,value);
+        }
+        sort();
+        // add an empty row
+        TagModel tag = new TagModel();
+        this.tags.add(tag);
+        setDirty(false);
+    }
+
+    /**
      * applies the current state of the tag editor model to a primitive
      *
@@ -370 +394 @@
         applyToTags(tags);
         return tags;
+    }
+
+    /**
+     * Replies the the tags in this tag editor model as {@see TagCollection}.
+     * 
+     * @return the the tags in this tag editor model as {@see TagCollection}
+     */
+    public TagCollection getTagCollection() {
+        return TagCollection.from(getTags());
     }