Ignore:
Timestamp:
2017-11-28T00:56:29+01:00 (4 years ago)
Author:
Don-vip
Message:

see #15310 - remove most of deprecated APIs

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

Legend:

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

    r12726 r13173  
    1616import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    1717import org.openstreetmap.josm.data.osm.OsmPrimitive;
    18 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1918import org.openstreetmap.josm.tools.ImageProvider;
    2019import org.openstreetmap.josm.tools.Logging;
     
    2726public class ConflictAddCommand extends Command {
    2827    private final Conflict<? extends OsmPrimitive> conflict;
    29 
    30     /**
    31      * Constructs a new {@code ConflictAddCommand}.
    32      * @param layer the data layer. Must not be null.
    33      * @param conflict the conflict to add
    34      * @deprecated to be removed end of 2017. Use {@link #ConflictAddCommand(DataSet, Conflict)} instead
    35      */
    36     @Deprecated
    37     public ConflictAddCommand(OsmDataLayer layer, Conflict<? extends OsmPrimitive> conflict) {
    38         super(layer);
    39         this.conflict = conflict;
    40     }
    4128
    4229    /**
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r12726 r13173  
    1111import org.openstreetmap.josm.data.conflict.ConflictCollection;
    1212import org.openstreetmap.josm.data.osm.DataSet;
    13 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1413import org.openstreetmap.josm.tools.Logging;
    1514
     
    2524    /** the list of resolved conflicts */
    2625    private final ConflictCollection resolvedConflicts = new ConflictCollection();
    27 
    28     /**
    29      * Constructs a new {@code ConflictResolveCommand} in the context of the current edit layer, if any.
    30      * @deprecated to be removed end of 2017. Use {@link #ConflictResolveCommand(DataSet)} instead
    31      */
    32     @Deprecated
    33     public ConflictResolveCommand() {
    34         this(Main.main.getEditDataSet());
    35     }
    36 
    37     /**
    38      * Constructs a new {@code ConflictResolveCommand} in the context of a given data layer.
    39      * @param layer the data layer. Must not be null.
    40      * @deprecated to be removed end of 2017. Use {@link #ConflictResolveCommand(DataSet)} instead
    41      */
    42     @Deprecated
    43     public ConflictResolveCommand(OsmDataLayer layer) {
    44         super(layer);
    45     }
    4626
    4727    /**
Note: See TracChangeset for help on using the changeset viewer.