Changeset 3449 in josm for trunk/src/org

Timestamp:

2010-08-20T13:07:55+02:00 (15 years ago)

Author:

bastiK

Message:

see #5179 (patch by viesturs) - Fixed "nothing changed" popup (Join overlapping areas produces bad results)

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (4 diffs)

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

@@ -19 +19 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 
 import javax.swing.Box;
@@ -209 +209 @@
         }
 
-        if (checkForTagConflicts(ways.getFirst(), ways.getLast())) {
-            //do nothing. //FIXME: abort?
-        }
+        if (checkForTagConflicts(ways.getFirst(), ways.getLast()))
+            //there was conflicts and user canceled abort the action.
+            return;
+
 
         JoinAreasResult result = joinAreas(ways.getFirst(), ways.getLast());
@@ -306 +307 @@
         }
 
+        result.hasChanges = true;
         result.mergeSuccessful = true;
         result.outerWay = outerWay;
@@ -742 +744 @@
             if (bestWay == null)
                 throw new RuntimeException();
-            else if (outerWays.contains(bestWay))
+            else if (outerWays.contains(bestWay)) {
                 break; //full circle reached, terminate.
-            else {
+            } else {
                 //add to outer ways, repeat.
                 outerWays.add(bestWay);