Changeset 6569 in josm for trunk/src

Timestamp:

2013-12-31T00:13:23+01:00 (11 years ago)

Author:

simon04

Message:

see #9492 - Tools>"Update Multipolygon": check that relation is loaded completely

File:

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

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

@@ -93 +93 @@
         }
 
+        final Relation multipolygonRelation = getSelectedMultipolygonRelation(selectedRelations);
+        if (multipolygonRelation != null && (multipolygonRelation.isIncomplete() || multipolygonRelation.hasIncompleteMembers())) {
+            new Notification(
+                    tr("Cannot update multipolygon since relation is incomplete."))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .setDuration(Notification.TIME_DEFAULT)
+                    .show();
+            return;
+        }
+
         final Pair<SequenceCommand, Relation> commandAndRelation = createMultipolygonCommand(selectedWays, selectedRelations);
+        if (commandAndRelation == null) {
+            return;
+        }
         final Command command = commandAndRelation.a;
         final Relation relation = commandAndRelation.b;
-        if (command == null) {
-            return;
-        }
         Main.main.undoRedo.add(command);