Ignore:
Timestamp:
2018-02-18T05:02:23+01:00 (21 months ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm/command/conflict
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r13173 r13434  
    7272            }
    7373
    74             Main.main.setEditDataSet(ds);
     74            Main.main.setActiveDataSet(ds);
    7575        }
    7676        reconstituteConflicts();
  • trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

    r12726 r13434  
    7272    @Override
    7373    public void undoCommand() {
    74         DataSet editDs = getAffectedDataSet();
    75         if (!Main.main.containsDataSet(editDs)) {
     74        DataSet ds = getAffectedDataSet();
     75        if (!Main.main.containsDataSet(ds)) {
    7676            Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    7777                    this.toString(),
    78                     editDs.getName()
     78                    ds.getName()
    7979            ));
    8080            return;
    8181        }
    8282
    83         Main.main.setEditDataSet(editDs);
     83        Main.main.setActiveDataSet(ds);
    8484
    8585        // restore the former state
     
    8989        // restore a conflict if necessary
    9090        //
    91         if (!editDs.getConflicts().hasConflictForMy(conflict.getMy())) {
    92             editDs.getConflicts().add(conflict);
     91        if (!ds.getConflicts().hasConflictForMy(conflict.getMy())) {
     92            ds.getConflicts().add(conflict);
    9393        }
    9494    }
Note: See TracChangeset for help on using the changeset viewer.