Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2017-08-24T00:15:51+02:00 (7 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:

• ConflictAddCommand.java (modified) (2 diffs)
• ConflictResolveCommand.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -64 +65 @@
     @Override
     public void undoCommand() {
-        if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
+        if (MainApplication.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
             Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Logging;
@@ -71 +72 @@
         super.undoCommand();
 
-        if (Main.isDisplayingMapView()) {
+        if (MainApplication.isDisplayingMapView()) {
             if (!Main.getLayerManager().containsLayer(getLayer())) {
                 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",