Changeset 1001 in josm

Timestamp:

Sep 21, 2008 9:45:01 PM (5 years ago)

Author:

stoecker

Message:

fixed incomplete ckeckin

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ReverseWayAction.java (modified) (2 diffs)
• corrector/Correction.java (added)
• corrector/CorrectionTable.java (added)
• corrector/CorrectionTableModel.java (added)
• corrector/RoleCorrection.java (added)
• corrector/RoleCorrectionTable.java (added)
• corrector/RoleCorrectionTableModel.java (added)
• corrector/UserCancelException.java (added)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
+import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -65 +66 @@
                         Collections.reverse(wnew.nodes);
                         if (Main.pref.getBoolean("tag-correction.reverse-way", true)) {
-                                final Collection<ChangePropertyCommand> changePropertyCommands = reverseWayTagCorrector
-                                        .execute(wnew);
-                                propertiesUpdated = propertiesUpdated
-                                        || (changePropertyCommands != null && !changePropertyCommands
-                                                .isEmpty());
-                                c.addAll(changePropertyCommands);
+                                try
+                                {
+                                        final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(wnew);
+                                        propertiesUpdated = propertiesUpdated
+                                        || (changePropertyCommands != null && !changePropertyCommands.isEmpty());
+                                        c.addAll(changePropertyCommands);
+                                }
+                                catch(UserCancelException ex)
+                                {
+                                        return;
+                                }
                         }
                         c.add(new ChangeCommand(w, wnew));