Changeset 10972 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-09-07T01:23:17+02:00 (8 years ago)

Author:

Don-vip

Message:

remove deprecated stuff - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (2 diffs)
• TagCollection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -94 +94 @@
  * @author imi
  */
-public final class DataSet implements Data, Cloneable, ProjectionChangeListener {
+public final class DataSet implements Data, ProjectionChangeListener {
 
     /**
@@ -919 +919 @@
             fireSelectionChanged();
         }
-    }
-
-    /**
-     * Return a copy of this dataset
-     * @deprecated Use the copy constructor instead. Remove in July 2016
-     */
-    @Deprecated
-    @Override
-    public DataSet clone() {
-        return new DataSet(this);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -19 +19 @@
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -196 +195 @@
         return ret;
     }
-
-    /**
-     * A predicate that filters primitives that are usable.
-     * @see OsmPrimitive#isUsable()
-     * @deprecated Use {@code OsmPrimitive::isUsable} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> isUsablePredicate = OsmPrimitive::isUsable;
-
-    /**
-     * A predicate filtering primitives that are selectable.
-     * @deprecated Use {@code OsmPrimitive::isSelectable} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> isSelectablePredicate = OsmPrimitive::isSelectable;
-
-    /**
-     * A predicate filtering primitives that are not deleted.
-     * @deprecated Use {@code p -> !p.isDeleted()} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedPredicate = p -> !p.isDeleted();
-
-    /**
-     * A predicate filtering primitives that are not deleted and not incomplete.
-     * @deprecated use lambda instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedCompletePredicate =
-            primitive -> !primitive.isDeleted() && !primitive.isIncomplete();
-
-    /**
-     * A predicate filtering primitives that are not deleted and not incomplete and that are not a relation.
-     * @deprecated use lambda instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedPhysicalPredicate =
-            primitive -> !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation);
-
-    /**
-     * A predicate filtering primitives that are modified
-     * @deprecated Use {@code OsmPrimitive::isModified} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> modifiedPredicate = OsmPrimitive::isModified;
-
-    /**
-     * A predicate filtering nodes.
-     * @deprecated Use {@code Node.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nodePredicate = Node.class::isInstance;
-
-    /**
-     * A predicate filtering ways.
-     * @deprecated Use {@code Way.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> wayPredicate = Way.class::isInstance;
-
-    /**
-     * A predicate filtering relations.
-     * @deprecated Use {@code Relation.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> relationPredicate = Relation.class::isInstance;
-
-    /**
-     * A predicate filtering multipolygon relations.
-     * @deprecated Use {@code OsmPrimitive::isMultipolygon} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> multipolygonPredicate = OsmPrimitive::isMultipolygon;
-
-    /**
-     * This matches all ways that have a direction
-     *
-     * @see #FLAG_HAS_DIRECTIONS
-     * @deprecated use {@code directionKeys::match}
-     */
-    @Deprecated
-    public static final Predicate<Tag> directionalKeyPredicate = directionKeys::match;
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -324 +324 @@
 
     /**
-     * Replies true if this tag collection contains at least one tag with key <code>key</code>.
-     *
-     * @param key the key to look up
-     * @return true if this tag collection contains at least one tag with key <code>key</code>; false, otherwise
-     * @deprecated Use {@link #hasTagsFor(String)} instead.
-     */
-    @Deprecated
-    public boolean containsKey(String key) {
-        return generateStreamForKey(key).findAny().isPresent();
-    }
-
-    /**
      * Replies true if this tag collection contains all tags in <code>tags</code>. Replies
      * false, if tags is null.