Changeset 10364 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

Timestamp:

2016-06-12T20:46:23+02:00 (8 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage

File:

• trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (modified) (2 diffs)

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

@@ -71 +71 @@
 
         if (Main.isDisplayingMapView()) {
-            if (!Main.map.mapView.hasLayer(getLayer())) {
+            if (!Main.getLayerManager().containsLayer(getLayer())) {
                 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                         this.toString(),
@@ -79 +79 @@
             }
 
-            Main.map.mapView.setActiveLayer(getLayer());
+            Main.getLayerManager().setActiveLayer(getLayer());
         }
         reconstituteConflicts();