Ignore:
Timestamp:
2017-08-24T00:15:51+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

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

Legend:

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

    r12620 r12630  
    1515import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1616import org.openstreetmap.josm.gui.DefaultNameFormatter;
     17import org.openstreetmap.josm.gui.MainApplication;
    1718import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1819import org.openstreetmap.josm.tools.ImageProvider;
     
    6465    @Override
    6566    public void undoCommand() {
    66         if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
     67        if (MainApplication.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
    6768            Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
    6869                    getLayer().getName(),
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r12620 r12630  
    1010import org.openstreetmap.josm.data.conflict.Conflict;
    1111import org.openstreetmap.josm.data.conflict.ConflictCollection;
     12import org.openstreetmap.josm.gui.MainApplication;
    1213import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1314import org.openstreetmap.josm.tools.Logging;
     
    7172        super.undoCommand();
    7273
    73         if (Main.isDisplayingMapView()) {
     74        if (MainApplication.isDisplayingMapView()) {
    7475            if (!Main.getLayerManager().containsLayer(getLayer())) {
    7576                Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
Note: See TracChangeset for help on using the changeset viewer.