Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.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/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -318 +319 @@
     @Override
     public void onConflictsRemoved(ConflictCollection conflicts) {
-        Main.info("1 conflict has been resolved.");
+        Logging.info("1 conflict has been resolved.");
         refreshView();
     }