Changeset 10715 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-08-03T15:01:43+02:00 (9 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate Predicates class

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/ConflictCollection.java (modified) (5 diffs)
• osm/DataSet.java (modified) (2 diffs)
• osm/OsmPrimitive.java (modified) (2 diffs)
• validation/tests/ConditionalKeys.java (modified) (2 diffs)
• validation/tests/OverlappingWays.java (modified) (2 diffs)
• validation/tests/WayConnectedToArea.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -12 +12 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Predicate;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -43 +42 @@
     private final CopyOnWriteArrayList<IConflictListener> listeners;
 
-    private static class FilterPredicate implements Predicate<Conflict<? extends OsmPrimitive>> {
-
-        private final Class<? extends OsmPrimitive> c;
-
-        FilterPredicate(Class<? extends OsmPrimitive> c) {
-            this.c = c;
-        }
-
-        @Override
-        public boolean test(Conflict<? extends OsmPrimitive> conflict) {
-            return conflict != null && c.isInstance(conflict.getMy());
-        }
-    }
-
-    private static final FilterPredicate NODE_FILTER_PREDICATE = new FilterPredicate(Node.class);
-    private static final FilterPredicate WAY_FILTER_PREDICATE = new FilterPredicate(Way.class);
-    private static final FilterPredicate RELATION_FILTER_PREDICATE = new FilterPredicate(Relation.class);
-
     /**
      * Constructs a new {@code ConflictCollection}.
@@ -364 +345 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getNodeConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, NODE_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Node);
     }
 
@@ -373 +354 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getWayConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, WAY_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Way);
     }
 
@@ -382 +363 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getRelationConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, RELATION_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Relation);
     }
 

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

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -458 +457 @@
      */
     public Collection<OsmPrimitive> allPrimitives() {
-        return getPrimitives(Predicates.alwaysTrue());
+        return getPrimitives(o -> true);
     }
 

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

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -234 +233 @@
      * A predicate filtering nodes.
      */
-    public static final Predicate<OsmPrimitive> nodePredicate = Predicates.<OsmPrimitive>isOfClass(Node.class);
+    public static final Predicate<OsmPrimitive> nodePredicate = Node.class::isInstance;
 
     /**
      * A predicate filtering ways.
      */
-    public static final Predicate<OsmPrimitive> wayPredicate = Predicates.<OsmPrimitive>isOfClass(Way.class);
+    public static final Predicate<OsmPrimitive> wayPredicate = Way.class::isInstance;
 
     /**
      * A predicate filtering relations.
      */
-    public static final Predicate<OsmPrimitive> relationPredicate = Predicates.<OsmPrimitive>isOfClass(Relation.class);
+    public static final Predicate<OsmPrimitive> relationPredicate = Relation.class::isInstance;
 
     /**

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.LanguageInfo;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -166 +165 @@
         final List<TestError> errors = new ArrayList<>();
         for (final String key : SubclassFilteredCollection.filter(p.keySet(),
-                Predicates.stringMatchesPattern(Pattern.compile(".*:conditional(:.*)?$")))) {
+                Pattern.compile(":conditional(:.*)?$").asPredicate())) {
             if (!isKeyValid(key)) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Wrong syntax in {0} key", key), 3201, p));

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -156 +155 @@
                 boolean ignore = false;
                 for (String ignoredKey : IGNORED_KEYS.get()) {
-                    if (error.getPrimitives().stream().anyMatch(Predicates.hasKey(ignoredKey))) {
+                    if (error.getPrimitives().stream().anyMatch(p -> p.hasKey(ignoredKey))) {
                         ignore = true;
                         break;

trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -67 +66 @@
         if (wayNode.isOutsideDownloadArea()) {
             return;
-        } else if (wayNode.getReferrers().stream().anyMatch(Predicates.hasTag("route", "ferry"))) {
+        } else if (wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
             return;
         } else if (isArea(p)) {