Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

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

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -27 +26 @@
 public class ConflictAddCommand extends Command {
     private final Conflict<? extends OsmPrimitive> conflict;
-
-    /**
-     * Constructs a new {@code ConflictAddCommand}.
-     * @param layer the data layer. Must not be null.
-     * @param conflict the conflict to add
-     * @deprecated to be removed end of 2017. Use {@link #ConflictAddCommand(DataSet, Conflict)} instead
-     */
-    @Deprecated
-    public ConflictAddCommand(OsmDataLayer layer, Conflict<? extends OsmPrimitive> conflict) {
-        super(layer);
-        this.conflict = conflict;
-    }
 
     /**