Changeset 3230 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2010-05-11T08:41:44+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4995 - improve area joinging reliability

File:

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

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

@@ -103 +103 @@
     }
 
-    public void combineWays(Collection<Way> ways) {
+    public Way combineWays(Collection<Way> ways) {
 
         // prepare and clean the list of ways to combine
         //
         if (ways == null || ways.isEmpty())
-            return;
+            return null;
         ways.remove(null); // just in case -  remove all null ways from the collection
         ways = new HashSet<Way>(ways); // remove duplicates
@@ -119 +119 @@
         if (path == null) {
             warnCombiningImpossible();
-            return;
+            return null;
         }
         // check whether any ways have been reversed in the process
@@ -142 +142 @@
         }
         if ((reversedWays != null) && !reversedWays.isEmpty()) {
-            if (!confirmChangeDirectionOfWays()) return;
+            if (!confirmChangeDirectionOfWays()) return null;
             // filter out ways that have no direction-dependent tags
             unreversedWays = ReverseWayTagCorrector.irreversibleWays(unreversedWays);
@@ -167 +167 @@
                     }
                     catch(UserCancelException ex) {
-                        return;
+                        return null;
                     }
                 }
@@ -207 +207 @@
             dialog.setVisible(true);
             if (dialog.isCancelled())
-                return;
+                return null;
         }
 
@@ -218 +218 @@
         cmds.add(new DeleteCommand(deletedWays));
         final SequenceCommand sequenceCommand = new SequenceCommand(tr("Combine {0} ways", ways.size()), cmds);
-
-        // update gui
-        final Way selectedWay = targetWay;
-        Runnable guiTask = new Runnable() {
-            public void run() {
-                Main.main.undoRedo.add(sequenceCommand);
-                getCurrentDataSet().setSelected(selectedWay);
-            }
-        };
-        if (SwingUtilities.isEventDispatchThread()) {
-            guiTask.run();
-        } else {
-            SwingUtilities.invokeLater(guiTask);
-        }
+        Main.main.undoRedo.add(sequenceCommand);
+
+        return targetWay;
     }
 
@@ -248 +237 @@
             return;
         }
-        combineWays(selectedWays);
+        // combine and update gui
+        final Way selectedWay = combineWays(selectedWays);
+        if(selectedWay != null)
+        {
+            Runnable guiTask = new Runnable() {
+                public void run() {
+                    getCurrentDataSet().setSelected(selectedWay);
+                }
+            };
+            if (SwingUtilities.isEventDispatchThread()) {
+                guiTask.run();
+            } else {
+                SwingUtilities.invokeLater(guiTask);
+            }
+        }
     }