Changeset 16463 in josm for trunk

Timestamp:

2020-05-19T06:46:41+02:00 (4 years ago)

Author:

GerdP

Message:

remove dead deprecated code

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.awt.geom.Area;
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.TreeSet;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -18 +15 @@
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -350 +346 @@
     }
 
-    /**
-     * Tests whether {@code this} node is connected to {@code otherNode} via at most {@code hops} nodes
-     * matching the {@code predicate} (which may be {@code null} to consider all nodes).
-     * @param otherNodes other nodes
-     * @param hops number of hops
-     * @param predicate predicate to match
-     * @return {@code true} if {@code this} node mets the conditions
-     * @deprecated Was used by UnconnectedWays test
-     */
-    @Deprecated
-    public boolean isConnectedTo(final Collection<Node> otherNodes, final int hops, Predicate<Node> predicate) {
-        CheckParameterUtil.ensureParameterNotNull(otherNodes);
-        CheckParameterUtil.ensureThat(!otherNodes.isEmpty(), "otherNodes must not be empty!");
-        CheckParameterUtil.ensureThat(hops >= 0, "hops must be non-negative!");
-        return hops == 0
-                ? isConnectedTo(otherNodes, hops, predicate, null)
-                : isConnectedTo(otherNodes, hops, predicate, new TreeSet<>());
-    }
-
-    @Deprecated
-    private boolean isConnectedTo(final Collection<Node> otherNodes, final int hops, Predicate<Node> predicate, Set<Node> visited) {
-        if (otherNodes.contains(this)) {
-            return true;
-        }
-        if (hops > 0 && visited != null) {
-            visited.add(this);
-            for (final Way w : getParentWays()) {
-                for (final Node n : w.getNodes()) {
-                    final boolean containsN = visited.contains(n);
-                    if (!containsN && (predicate == null || predicate.test(n))
-                            && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
     @Override
     public boolean isOutsideDownloadArea() {