Changeset 10364 in josm for trunk/src/org/openstreetmap/josm/command/conflict
- Timestamp:
- 2016-06-12T20:46:23+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command/conflict
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java
r9371 r10364 62 62 @Override 63 63 public void undoCommand() { 64 if (Main.isDisplayingMapView() && !Main. map.mapView.hasLayer(getLayer())) {64 if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) { 65 65 Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.", 66 66 getLayer().getName(), -
trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java
r9371 r10364 71 71 72 72 if (Main.isDisplayingMapView()) { 73 if (!Main. map.mapView.hasLayer(getLayer())) {73 if (!Main.getLayerManager().containsLayer(getLayer())) { 74 74 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 75 75 this.toString(), … … 79 79 } 80 80 81 Main. map.mapView.setActiveLayer(getLayer());81 Main.getLayerManager().setActiveLayer(getLayer()); 82 82 } 83 83 reconstituteConflicts(); -
trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
r9371 r10364 75 75 public void undoCommand() { 76 76 OsmDataLayer layer = getLayer(); 77 if (!Main. map.mapView.hasLayer(layer)) {77 if (!Main.getLayerManager().containsLayer(layer)) { 78 78 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 79 79 this.toString(), … … 83 83 } 84 84 85 Main. map.mapView.setActiveLayer(layer);85 Main.getLayerManager().setActiveLayer(layer); 86 86 OsmDataLayer editLayer = Main.main.getEditLayer(); 87 87
Note:
See TracChangeset
for help on using the changeset viewer.