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

Timestamp:

2020-06-07T15:04:13+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19355: NPE at org.openstreetmap.josm.gui.dialogs.relation.ReferringRelationsBrowserModel.canReload()

• don't use relation created by createMultipolygonCommand as it was not yet added to the dataset
• get the correct relation after command was executed

(maybe RelationEditor.getEditor() is the better place to do this, adding a null check in canReload() makes no sense as other methods also cannot handle a relation without dataset)

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (1 diff)

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

@@ -112 +112 @@
             }
             final Command command = commandAndRelation.a;
-            final Relation relation = commandAndRelation.b;
 
             // to avoid EDT violations
             SwingUtilities.invokeLater(() -> {
                     UndoRedoHandler.getInstance().add(command);
-
-                    // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog
-                    // knows about the new relation before we try to select it.
-                    // (Yes, we are already in event dispatch thread. But DatasetEventManager
-                    // uses 'SwingUtilities.invokeLater' to fire events so we have to do the same.)
-                    SwingUtilities.invokeLater(() -> {
-                            MainApplication.getMap().relationListDialog.selectRelation(relation);
-                            if (Config.getPref().getBoolean("multipoly.show-relation-editor", false)) {
-                                //Open relation edit window, if set up in preferences
-                                RelationEditor editor = RelationEditor.getEditor(
-                                        MainApplication.getLayerManager().getEditLayer(), relation, null);
-                                editor.setModal(true);
-                                editor.setVisible(true);
-                            } else {
-                                MainApplication.getLayerManager().getEditLayer().setRecentRelation(relation);
-                            }
-                    });
+                final Relation relation = (Relation) MainApplication.getLayerManager().getEditDataSet()
+                        .getPrimitiveById(commandAndRelation.b);
+
+                // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog
+                // knows about the new relation before we try to select it.
+                // (Yes, we are already in event dispatch thread. But DatasetEventManager
+                // uses 'SwingUtilities.invokeLater' to fire events so we have to do the same.)
+                SwingUtilities.invokeLater(() -> {
+                    MainApplication.getMap().relationListDialog.selectRelation(relation);
+                    if (Config.getPref().getBoolean("multipoly.show-relation-editor", false)) {
+                        //Open relation edit window, if set up in preferences
+                        RelationEditor editor = RelationEditor
+                                .getEditor(MainApplication.getLayerManager().getEditLayer(), relation, null);
+                        editor.setModal(true);
+                        editor.setVisible(true);
+                    } else {
+                        MainApplication.getLayerManager().getEditLayer().setRecentRelation(relation);
+                    }
+                });
             });
         }