Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

Timestamp:

2018-02-18T05:02:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

@@ -72 +72 @@
     @Override
     public void undoCommand() {
-        DataSet editDs = getAffectedDataSet();
-        if (!Main.main.containsDataSet(editDs)) {
+        DataSet ds = getAffectedDataSet();
+        if (!Main.main.containsDataSet(ds)) {
             Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
-                    editDs.getName()
+                    ds.getName()
             ));
             return;
         }
 
-        Main.main.setEditDataSet(editDs);
+        Main.main.setActiveDataSet(ds);
 
         // restore the former state
@@ -89 +89 @@
         // restore a conflict if necessary
         //
-        if (!editDs.getConflicts().hasConflictForMy(conflict.getMy())) {
-            editDs.getConflicts().add(conflict);
+        if (!ds.getConflicts().hasConflictForMy(conflict.getMy())) {
+            ds.getConflicts().add(conflict);
         }
     }