Changeset 35464 in osm for applications/editors/josm
- Timestamp:
- 2020-05-21T06:51:56+02:00 (4 years ago)
- Location:
- applications/editors/josm/plugins/reverter/src/reverter
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java
r35409 r35464 53 53 54 54 private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) { 55 56 57 55 if (!target.hasEqualSemanticAttributes(newTarget) || target.isDeleted() != newTarget.isDeleted() 56 || target.isVisible() != newTarget.isVisible() 57 || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) { 58 58 cmds.add(new ChangeCommand(target, newTarget)); 59 59 if (nominal) { -
applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java
r35409 r35464 98 98 newLayer = false; // reuse layer for subsequent reverts 99 99 } catch (OsmTransferException e) { 100 101 102 103 100 if (!allcmds.isEmpty()) { 101 GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size())); 102 } 103 Logging.error(e); 104 104 throw e; 105 105 } catch (UserCancelException e) { 106 107 108 106 if (!allcmds.isEmpty()) { 107 GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size())); 108 } 109 109 Logging.warn("Revert canceled"); 110 110 Logging.trace(e);
Note:
See TracChangeset
for help on using the changeset viewer.