Changeset 15707 in josm for trunk

Timestamp:

2020-01-13T23:51:08+01:00 (5 years ago)

Author:

simon04

Message:

see #14465 -Tag2Link: consider all selected primitives/properties

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationListDialog.java (modified) (1 diff)
• SelectionListDialog.java (modified) (1 diff)
• properties/PropertiesDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -667 +667 @@
             @Override
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                final IRelation<?> selection = getSelected();
-                if (selection != null) {
-                    selection.visitKeys((primitive, key, value) -> addLinks(popupMenu, key, value));
-                }
+                getSelectedRelations().forEach(relation ->
+                        relation.visitKeys((primitive, key, value) -> addLinks(popupMenu, key, value)));
             }
         });

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -236 +236 @@
             @Override
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                final Collection<OsmPrimitive> selection = getSelectedPrimitives();
-                if (!selection.isEmpty()) {
-                    selection.iterator().next().visitKeys((primitive, key, value) -> addLinks(popupMenu, key, value));
-                }
+                getSelectedPrimitives().forEach(primitive ->
+                        primitive.visitKeys((p, key, value) -> addLinks(popupMenu, key, value)));
             }
         });

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

@@ -28 +28 @@
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -65 +66 @@
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.IRelationMember;
+import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmData;
@@ -396 +398 @@
             @Override
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                final IRelation<?> relation = getSelectedMembershipRelation();
-                if (relation != null) {
-                    relation.visitKeys((primitive, key, value) -> addLinks(membershipMenu, key, value));
-                }
+                getSelectedMembershipRelations().forEach(relation ->
+                        relation.visitKeys((primitive, key, value) -> addLinks(membershipMenu, key, value)));
             }
         });
@@ -457 +457 @@
             @Override
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                final Tags tags = getSelectedProperties();
-                if (tags != null) {
-                    tags.getValues().forEach(value -> addLinks(tagMenu, tags.getKey(), value));
-                }
+                visitSelectedProperties((primitive, key, value) -> addLinks(tagMenu, key, value));
             }
         });
@@ -804 +801 @@
 
     /**
+     * Visits all combinations of the selected keys/values.
+     * @param visitor the visitor
+     * @since 15707
+     */
+    public void visitSelectedProperties(KeyValueVisitor visitor) {
+        for (int row : tagTable.getSelectedRows()) {
+            final String key = editHelper.getDataKey(row);
+            Set<String> values = editHelper.getDataValues(row).keySet();
+            values.forEach(value -> visitor.visitKeyValue(null, key, value));
+        }
+    }
+
+    /**
      * Replies the membership popup menu handler.
      * @return The membership popup menu handler
@@ -818 +828 @@
         int row = membershipTable.getSelectedRow();
         return row > -1 ? (IRelation<?>) membershipData.getValueAt(row, 0) : null;
+    }
+
+    /**
+     * Returns all selected relation memberships.
+     * @return The selected relation memberships
+     * @since 15707
+     */
+    public Collection<IRelation<?>> getSelectedMembershipRelations() {
+        return Arrays.stream(membershipTable.getSelectedRows())
+                .mapToObj(row -> (IRelation<?>) membershipData.getValueAt(row, 0))
+                .collect(Collectors.toList());
     }