Changeset 11590 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-02-21T01:04:28+01:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - remove workarounds for jdk9 compilation problems with diamond operator - sounds a lot like JDK-8075793 (solved in b150)

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)

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

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

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

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

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

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

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

@@ -669 +669 @@
         // add multipolygon in order to let user select something and fix the error
         if (!primitives.contains(r)) {
-            // Diamond operator does not work with Java 9 here
-            @SuppressWarnings("unused")
-            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
+            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitives);
             newPrimitives.add(0, r);
             return newPrimitives;