Ignore:
Timestamp:
2017-08-22T22:26:32+02:00 (4 years ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm/command/conflict
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

    r11848 r12620  
    1717import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1818import org.openstreetmap.josm.tools.ImageProvider;
     19import org.openstreetmap.josm.tools.Logging;
    1920import org.openstreetmap.josm.tools.Utils;
    2021
     
    5556            getLayer().getConflicts().add(conflict);
    5657        } catch (IllegalStateException e) {
    57             Main.error(e);
     58            Logging.error(e);
    5859            warnBecauseOfDoubleConflict();
    5960        }
     
    6465    public void undoCommand() {
    6566        if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
    66             Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
     67            Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
    6768                    getLayer().getName(),
    6869                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r10364 r12620  
    1111import org.openstreetmap.josm.data.conflict.ConflictCollection;
    1212import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     13import org.openstreetmap.josm.tools.Logging;
    1314
    1415/**
     
    7273        if (Main.isDisplayingMapView()) {
    7374            if (!Main.getLayerManager().containsLayer(getLayer())) {
    74                 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
     75                Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    7576                        this.toString(),
    7677                        getLayer().toString()
  • trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

    r11318 r12620  
    1717import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1818import org.openstreetmap.josm.tools.ImageProvider;
     19import org.openstreetmap.josm.tools.Logging;
    1920
    2021/**
     
    7273        OsmDataLayer layer = getLayer();
    7374        if (!Main.getLayerManager().containsLayer(layer)) {
    74             Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
     75            Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    7576                    this.toString(),
    7677                    layer.toString()
  • trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java

    r10467 r12620  
    1010import javax.swing.Icon;
    1111
    12 import org.openstreetmap.josm.Main;
    1312import org.openstreetmap.josm.data.conflict.Conflict;
    1413import org.openstreetmap.josm.data.osm.Node;
     
    1615import org.openstreetmap.josm.data.osm.Way;
    1716import org.openstreetmap.josm.tools.ImageProvider;
     17import org.openstreetmap.josm.tools.Logging;
    1818
    1919/**
     
    6060        for (Node n:mergedNodeList) {
    6161            if (!getAffectedDataSet().getNodes().contains(n)) {
    62                 Main.warn(tr("Main dataset does not include node {0}", n.toString()));
     62                Logging.warn(tr("Main dataset does not include node {0}", n.toString()));
    6363            }
    6464        }
Note: See TracChangeset for help on using the changeset viewer.