Changeset 7657 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-10-27T21:21:47+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10678 - open edit relation dialog when double clicking on a relation in selection dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (1 diff)

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

@@ -201 +201 @@
                 OsmDataLayer layer = Main.main.getEditLayer();
                 if (layer == null) return;
-                layer.data.setSelected(Collections.singleton(model.getElementAt(idx)));
+                OsmPrimitive osm = model.getElementAt(idx);
+                Collection<OsmPrimitive> sel = layer.data.getSelected();
+                if (sel.size() != 1 || !sel.iterator().next().equals(osm)) {
+                    // Select primitive if it's not the whole current selection
+                    layer.data.setSelected(Collections.singleton(osm));
+                } else if (osm instanceof Relation) {
+                    // else open relation editor if applicable
+                    actEditRelationSelection.actionPerformed(null);
+                }
             } else if (highlightEnabled && Main.isDisplayingMapView()) {
                 if (helper.highlightOnly(model.getElementAt(idx))) {