Changeset 9439 in josm for trunk/src/org

Timestamp:

2016-01-14T12:52:35+01:00 (9 years ago)

Author:

simon04

Message:

fix #8041 - Relation change bypassing undo system during combine way

File:

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

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

@@ -124 +124 @@
         TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways);
 
+        final List<Command> reverseWayTagCommands = new LinkedList<>();
         List<Way> reversedWays = new LinkedList<>();
         List<Way> unreversedWays = new LinkedList<>();
@@ -158 +159 @@
                 ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector();
                 List<Way> reversedTagWays = new ArrayList<>(reversedWays.size());
-                Collection<Command> changePropertyCommands =  null;
                 for (Way w : reversedWays) {
                     Way wnew = new Way(w);
                     reversedTagWays.add(wnew);
-                    changePropertyCommands = reverseWayTagCorrector.execute(w, wnew);
-                }
-                if ((changePropertyCommands != null) && !changePropertyCommands.isEmpty()) {
-                    for (Command c : changePropertyCommands) {
-                        c.executeCommand();
-                    }
+                    reverseWayTagCommands.addAll(reverseWayTagCorrector.execute(w, wnew));
+                }
+                if (!reverseWayTagCommands.isEmpty()) {
+                    // commands need to be executed for CombinePrimitiveResolverDialog
+                    Main.main.undoRedo.add(new SequenceCommand(tr("Reverse Ways"), reverseWayTagCommands));
                 }
                 wayTags = TagCollection.unionOfAllPrimitives(reversedTagWays);
@@ -180 +179 @@
         modifiedTargetWay.setNodes(path);
 
-        List<Command> resolution = CombinePrimitiveResolverDialog.launchIfNecessary(wayTags, ways, Collections.singleton(targetWay));
+        final List<Command> resolution;
+        try {
+            resolution = CombinePrimitiveResolverDialog.launchIfNecessary(wayTags, ways, Collections.singleton(targetWay));
+        } finally {
+            if (!reverseWayTagCommands.isEmpty()) {
+                // undo reverseWayTagCorrector and merge into SequenceCommand below
+                Main.main.undoRedo.undo();
+            }
+        }
 
         List<Command> cmds = new LinkedList<>();
@@ -187 +194 @@
 
         cmds.add(new ChangeCommand(targetWay, modifiedTargetWay));
+        cmds.addAll(reverseWayTagCommands);
         cmds.addAll(resolution);
         cmds.add(new DeleteCommand(deletedWays));