Changeset 9072 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/AbstractRelationAction.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (1 diff)
• data/validation/tests/DuplicateNode.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• tools/Utils.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);
         }
     }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -368 +368 @@
             return null;
 
-        Set<OsmPrimitive> primitivesToDelete = new HashSet<>(selection);
+        // Diamond operator does not work with Java 9 here
+        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
 
         Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class);

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

@@ -382 +382 @@
     public Command fixError(TestError testError) {
         if (!isFixable(testError)) return null;
-        Collection<OsmPrimitive> sel = new LinkedList<>(testError.getPrimitives());
+        // Diamond operator does not work with Java 9 here
+        Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
         Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
 

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

@@ -302 +302 @@
                 }
             }
-            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitives);
+            // Diamond operator does not work with Java 9 here
+            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
             newPrimitives.add(0, r);
             error.setPrimitives(newPrimitives);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -141 +141 @@
 
     public static <T> Collection<T> filter(Collection<? extends T> collection, Predicate<? super T> predicate) {
-        return new FilteredCollection<>(collection, predicate);
+        // Diamond operator does not work with Java 9 here
+        return new FilteredCollection<T>(collection, predicate);
     }