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

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WayData;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -44 +43 @@
 
     protected final ConflictCollection purgedConflicts = new ConflictCollection();
-
-    /**
-     * Constructs a new {@code PurgeCommand} (handles conflicts).
-     * This command relies on a number of consistency conditions:
-     *  - makeIncomplete must be a subset of toPurge.
-     *  - Each primitive, that is in toPurge but not in makeIncomplete, must have all its referrers in toPurge.
-     *  - Each element of makeIncomplete must not be new and must have only referrers that are either a relation or included in toPurge.
-     * @param layer OSM data layer
-     * @param toPurge primitives to purge
-     * @param makeIncomplete primitives to make incomplete
-     * @deprecated to be removed end of 2017. Use {@link #PurgeCommand(DataSet, Collection, Collection)} instead
-     */
-    @Deprecated
-    public PurgeCommand(OsmDataLayer layer, Collection<OsmPrimitive> toPurge, Collection<OsmPrimitive> makeIncomplete) {
-        super(layer);
-        init(toPurge, makeIncomplete);
-    }
 
     /**
@@ -316 +298 @@
     /**
      * Creates a new {@code PurgeCommand} to purge selected OSM primitives.
-     * @param layer optional osm data layer, can be null
-     * @param sel selected OSM primitives
-     * @param toPurgeAdditionally optional list that will be filled with primitives to be purged that have not been in the selection
-     * @return command to purge selected OSM primitives
-     * @since 12688
-     * @deprecated to be removed end of 2017. Use {@link #build(Collection, List)} instead
-     */
-    @Deprecated
-    public static PurgeCommand build(OsmDataLayer layer, Collection<OsmPrimitive> sel, List<OsmPrimitive> toPurgeAdditionally) {
-        return build(sel, toPurgeAdditionally);
-    }
-
-    /**
-     * Creates a new {@code PurgeCommand} to purge selected OSM primitives.
      * @param sel selected OSM primitives
      * @param toPurgeAdditionally optional list that will be filled with primitives to be purged that have not been in the selection