Changeset 13938 in josm for trunk

Timestamp:

2018-06-15T23:15:15+02:00 (7 years ago)

Author:

Don-vip

Message:

workaround for following java compiler bugs:

• ​https://bugs.openjdk.java.net/browse/JDK-8141508
• ​https://bugs.openjdk.java.net/browse/JDK-8142476
• ​https://bugs.openjdk.java.net/browse/JDK-8191655

Bug revealed with r13926.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/SelectAllAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/SelectAllActionTest.java (added)
• test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -31 +30 @@
             return;
         OsmData<?, ?, ?, ?> ds = getLayerManager().getActiveData();
-        ds.setSelected(ds.getPrimitives(IPrimitive::isSelectable));
+        // Do not use method reference before the Java 11 migration
+        // Otherwise we face a compiler bug, see below:
+        // https://bugs.openjdk.java.net/browse/JDK-8141508
+        // https://bugs.openjdk.java.net/browse/JDK-8142476
+        // https://bugs.openjdk.java.net/browse/JDK-8191655
+        ds.setSelected(ds.getPrimitives(t -> t.isSelectable()));
     }
 

trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java

@@ -55 +55 @@
     }
 
-    private static Layer initDataSet() {
+    static Layer initDataSet() {
         DataSet ds = new DataSet();
         Node n1 = new Node(new EastNorth(1, 1));