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

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

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

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -72 +73 @@
         if (Main.isDisplayingMapView()) {
             if (!Main.getLayerManager().containsLayer(getLayer())) {
-                Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+                Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                         this.toString(),
                         getLayer().toString()