Changeset 32950 in osm for applications/editors/josm/plugins/cadastre-fr/src

Timestamp:

2016-09-08T21:26:39+02:00 (8 years ago)

Author:

donvip

Message:

fix deprecation/checkstyle warning

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

@@ -94 +94 @@
         super(tr("Add address"), "buildings",
                 tr("Helping tool for tag address"),
+                // CHECKSTYLE.OFF: LineLength
                 Shortcut.registerShortcut("mapmode:cadastre-fr-buildings", tr("Mode: {0}", tr("CadastreFR - Buildings")), KeyEvent.VK_E, Shortcut.DIRECT),
+                // CHECKSTYLE.ON: LineLength
                 mapFrame, getCursor());
     }
@@ -130 +132 @@
         List<Way> mouseOnExistingWays = new ArrayList<>();
         List<Way> mouseOnExistingBuildingWays = new ArrayList<>();
-        Node currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+        Node currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive::isSelectable);
         if (currentMouseNode != null) {
             // click on existing node
@@ -184 +186 @@
             }
         } else {
-            List<WaySegment> wss = mv.getNearestWaySegments(mousePos, OsmPrimitive.isSelectablePredicate);
+            List<WaySegment> wss = mv.getNearestWaySegments(mousePos, OsmPrimitive::isSelectable);
             for (WaySegment ws : wss) {
                 if (ws.way.get(tagHighway) != null && ws.way.get(tagHighwayName) != null)
@@ -298 +300 @@
         Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
         cmds.add(new AddCommand(n));
-        List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive.isSelectablePredicate);
+        List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive::isSelectable);
         Map<Way, List<Integer>> insertPoints = new HashMap<>();
         for (WaySegment ws : wss) {