Changeset 15376 in josm

Timestamp:

2019-09-26T17:14:19+02:00 (5 years ago)

Author:

Don-vip

Message:

see #14465 - allow plugins to retrieve selected tags with multiple values

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Tags.java (added)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -70 +70 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Tags;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -714 +715 @@
 
     /**
-     * Returns the selected tag.
+     * Returns the selected tag. Value is empty if several tags are selected for a given key.
      * @return The current selected tag
      */
     public Tag getSelectedProperty() {
+        Tags tags = getSelectedProperties();
+        return tags == null ? null : new Tag(
+                tags.getKey(),
+                tags.getValues().size() > 1 ? "" : tags.getValues().iterator().next());
+    }
+
+    /**
+     * Returns the selected tags. Contains all values if several are selected for a given key.
+     * @return The current selected tags
+     * @since 15376
+     */
+    public Tags getSelectedProperties() {
         int row = tagTable.getSelectedRow();
         if (row == -1) return null;
         Map<String, Integer> map = editHelper.getDataValues(row);
-        return new Tag(
-                editHelper.getDataKey(row),
-                map.size() > 1 ? "" : map.keySet().iterator().next());
+        return new Tags(editHelper.getDataKey(row), map.keySet());
     }