Changeset 16557 in josm

Timestamp:

2020-06-07T15:42:48+02:00 (5 years ago)

Author:

GerdP

Message:

fix #19346: Automatically select newly created multipolygons

• if a new multipolygon relation is created, select the multipolygon only, but if preference multipoly.show-relation-editor is set to true keep the ways selected.
• if Update multipolygon (Ctrl+Shift+B) is used, don't change the selection, but if preference multipoly.show-relation-editor is set to true remove the updated relation from the selection before opening the relation editor.

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -115 +115 @@
             // to avoid EDT violations
             SwingUtilities.invokeLater(() -> {
-                    UndoRedoHandler.getInstance().add(command);
+                UndoRedoHandler.getInstance().add(command);
                 final Relation relation = (Relation) MainApplication.getLayerManager().getEditDataSet()
                         .getPrimitiveById(commandAndRelation.b);
+                if (relation == null || relation.getDataSet() == null)
+                    return; // should not happen
 
                 // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog
@@ -127 +129 @@
                     if (Config.getPref().getBoolean("multipoly.show-relation-editor", false)) {
                         //Open relation edit window, if set up in preferences
+                        // see #19346 un-select updated multipolygon
+                        MainApplication.getLayerManager().getEditDataSet().clearSelection(relation);
                         RelationEditor editor = RelationEditor
                                 .getEditor(MainApplication.getLayerManager().getEditLayer(), relation, null);
@@ -133 +137 @@
                     } else {
                         MainApplication.getLayerManager().getEditLayer().setRecentRelation(relation);
+                        if (multipolygonRelation == null) {
+                            // see #19346 select new multipolygon
+                            MainApplication.getLayerManager().getEditDataSet().setSelected(relation);
+                        }
                     }
                 });