Changeset 7945 in josm for trunk

Timestamp:

2015-01-09T11:35:10+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10953 - fix crash and EDT violation

File:

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

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

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -84 +85 @@
         private final Relation multipolygonRelation;
 
-        public CreateUpdateMultipolygonTask(Collection<Way> selectedWays, Relation multipolygonRelation) {
+        private CreateUpdateMultipolygonTask(Collection<Way> selectedWays, Relation multipolygonRelation) {
             this.selectedWays = selectedWays;
             this.multipolygonRelation = multipolygonRelation;
@@ -140 +141 @@
         final Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
 
-        if (selectedWays.size() < 1) {
+        if (selectedWays.isEmpty()) {
             // Sometimes it make sense creating multipoly of only one way (so it will form outer way)
             // and then splitting the way later (so there are multiple ways forming outer way)
@@ -156 +157 @@
 
         // download incomplete relation if necessary
-        if (multipolygonRelation != null && (multipolygonRelation.isIncomplete() || multipolygonRelation.hasIncompleteMembers())) {
+        if (multipolygonRelation != null && !multipolygonRelation.isNew()
+                && (multipolygonRelation.isIncomplete() || multipolygonRelation.hasIncompleteMembers())) {
             Main.worker.submit(new DownloadRelationTask(Collections.singleton(multipolygonRelation), Main.main.getEditLayer()));
         }
         // create/update multipolygon relation
         Main.worker.submit(new CreateUpdateMultipolygonTask(selectedWays, multipolygonRelation));
-
     }
 
@@ -172 +173 @@
             return selectedRelations.iterator().next();
         } else {
-            final HashSet<Relation> relatedRelations = new HashSet<>();
+            final Set<Relation> relatedRelations = new HashSet<>();
             for (final Way w : selectedWays) {
                 relatedRelations.addAll(Utils.filteredCollection(w.getReferrers(), Relation.class));
@@ -268 +269 @@
 
         MultipolygonBuilder pol = new MultipolygonBuilder();
-        String error = pol.makeFromWays(selectedWays);
+        final String error = pol.makeFromWays(selectedWays);
 
         if (error != null) {
             if (showNotif) {
-                new Notification(error)
+                GuiHelper.runInEDT(new Runnable() {
+                    @Override
+                    public void run() {
+                        new Notification(error)
                         .setIcon(JOptionPane.INFORMATION_MESSAGE)
                         .show();
+                    }
+                });
             }
             return null;
@@ -303 +309 @@
     private static void addMembers(JoinedPolygon polygon, Relation rel, String role) {
         final int count = rel.getMembersCount();
-        final HashSet<Way> ways = new HashSet<>(polygon.ways);
+        final Set<Way> ways = new HashSet<>(polygon.ways);
         for (int i = 0; i < count; i++) {
             final RelationMember m = rel.getMember(i);