Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.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/WayNodesConflictResolverCommand.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -60 +60 @@
         for (Node n:mergedNodeList) {
             if (!getAffectedDataSet().getNodes().contains(n)) {
-                Main.warn(tr("Main dataset does not include node {0}", n.toString()));
+                Logging.warn(tr("Main dataset does not include node {0}", n.toString()));
             }
         }