Changeset 10657 in josm for trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

Timestamp:

2016-07-27T02:08:34+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (7 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;
@@ -18 +19 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -52 +52 @@
 
         @Override
-        public boolean evaluate(Conflict<? extends OsmPrimitive> conflict) {
+        public boolean test(Conflict<? extends OsmPrimitive> conflict) {
             return conflict != null && c.isInstance(conflict.getMy());
         }
@@ -364 +364 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getNodeConflicts() {
-        return Utils.filter(conflicts, NODE_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, NODE_FILTER_PREDICATE);
     }
 
@@ -373 +373 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getWayConflicts() {
-        return Utils.filter(conflicts, WAY_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, WAY_FILTER_PREDICATE);
     }
 
@@ -382 +382 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getRelationConflicts() {
-        return Utils.filter(conflicts, RELATION_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, RELATION_FILTER_PREDICATE);
     }
 
@@ -396 +396 @@
         ConflictCollection conflicts1 = (ConflictCollection) obj;
         return Objects.equals(conflicts, conflicts1.conflicts) &&
-                Objects.equals(listeners, conflicts1.listeners);
+               Objects.equals(listeners, conflicts1.listeners);
     }
 }