Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
- Timestamp:
- 2018-02-18T05:02:23+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
r12726 r13434 72 72 @Override 73 73 public void undoCommand() { 74 DataSet editDs = getAffectedDataSet();75 if (!Main.main.containsDataSet( editDs)) {74 DataSet ds = getAffectedDataSet(); 75 if (!Main.main.containsDataSet(ds)) { 76 76 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 77 77 this.toString(), 78 editDs.getName()78 ds.getName() 79 79 )); 80 80 return; 81 81 } 82 82 83 Main.main.set EditDataSet(editDs);83 Main.main.setActiveDataSet(ds); 84 84 85 85 // restore the former state … … 89 89 // restore a conflict if necessary 90 90 // 91 if (! editDs.getConflicts().hasConflictForMy(conflict.getMy())) {92 editDs.getConflicts().add(conflict);91 if (!ds.getConflicts().hasConflictForMy(conflict.getMy())) { 92 ds.getConflicts().add(conflict); 93 93 } 94 94 }
Note:
See TracChangeset
for help on using the changeset viewer.