Changeset 35409 in osm for applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java
- Timestamp:
- 2020-04-04T07:40:00+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java
r35407 r35409 15 15 16 16 import org.openstreetmap.josm.command.Command; 17 import org.openstreetmap.josm.command.SequenceCommand;18 17 import org.openstreetmap.josm.command.conflict.ConflictAddCommand; 19 18 import org.openstreetmap.josm.data.UndoRedoHandler; … … 99 98 newLayer = false; // reuse layer for subsequent reverts 100 99 } catch (OsmTransferException e) { 101 Logging.error(e); 100 if (!allcmds.isEmpty()) { 101 GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size())); 102 } 103 Logging.error(e); 102 104 throw e; 103 105 } catch (UserCancelException e) { 106 if (!allcmds.isEmpty()) { 107 GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size())); 108 } 104 109 Logging.warn("Revert canceled"); 105 110 Logging.trace(e); … … 108 113 } 109 114 if (!allcmds.isEmpty()) { 110 Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new SequenceCommand(tr("Revert changesets"), allcmds);115 Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new RevertChangesetCommand(tr("Revert changesets"), allcmds); 111 116 GuiHelper.runInEDT(() -> { 112 UndoRedoHandler.getInstance().add(cmd );117 UndoRedoHandler.getInstance().add(cmd, false); 113 118 if (numberOfConflicts > 0) { 114 119 MainApplication.getMap().conflictDialog.warnNumNewConflicts(numberOfConflicts); … … 169 174 numberOfConflicts++; 170 175 } 176 c.executeCommand(); 171 177 } 172 178 final String desc;
Note:
See TracChangeset
for help on using the changeset viewer.