Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

Timestamp:

2017-08-24T22:53:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

File:

• trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (modified) (1 diff)

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

@@ -65 +65 @@
     @Override
     public void undoCommand() {
-        if (MainApplication.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
+        if (MainApplication.isDisplayingMapView() && !MainApplication.getLayerManager().containsLayer(getLayer())) {
             Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),