Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
r12620 r12636 10 10 import javax.swing.Icon; 11 11 12 import org.openstreetmap.josm.Main;13 12 import org.openstreetmap.josm.data.conflict.Conflict; 14 13 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 14 import org.openstreetmap.josm.data.osm.Relation; 16 15 import org.openstreetmap.josm.data.osm.RelationMember; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 18 18 import org.openstreetmap.josm.tools.ImageProvider; … … 72 72 public void undoCommand() { 73 73 OsmDataLayer layer = getLayer(); 74 if (!Main .getLayerManager().containsLayer(layer)) {74 if (!MainApplication.getLayerManager().containsLayer(layer)) { 75 75 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 76 76 this.toString(), … … 80 80 } 81 81 82 Main .getLayerManager().setActiveLayer(layer);83 OsmDataLayer editLayer = Main .getLayerManager().getEditLayer();82 MainApplication.getLayerManager().setActiveLayer(layer); 83 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer(); 84 84 85 85 // restore the former state
Note:
See TracChangeset
for help on using the changeset viewer.