Changeset 9072 in josm for trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

Timestamp:

2015-11-30T22:57:02+01:00 (8 years ago)

Author:

Don-vip

Message:

partial revert of r9070 - make build run with Java 9 again

File:

• trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -24 +24 @@
             return Collections.<Relation>emptySet();
         } else {
-            return new SubclassFilteredCollection<>(primitives, OsmPrimitive.relationPredicate);
+            // Diamond operator does not work with Java 9 here
+            return new SubclassFilteredCollection<OsmPrimitive, Relation>(
+                    primitives, OsmPrimitive.relationPredicate);
         }
     }