Changeset 10716 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2016-08-03T15:30:04+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate predicates in OsmPrimitive class

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
-import static org.openstreetmap.josm.data.osm.OsmPrimitive.isSelectablePredicate;
-import static org.openstreetmap.josm.data.osm.OsmPrimitive.isUsablePredicate;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -293 +291 @@
                     // display them if the middle mouse button is pressed and keep them until the mouse is moved
                     if (middleMouseDown || isAtOldPosition) {
-                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos,
-                                o -> isUsablePredicate.test(o) && isSelectablePredicate.test(o));
+                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, OsmPrimitive::isSelectable);
 
                         final JPanel c = new JPanel(new GridBagLayout());
@@ -441 +438 @@
          */
         private void statusBarElementUpdate(MouseState ms) {
-            final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, isUsablePredicate, false);
+            final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, OsmPrimitive::isUsable, false);
             if (osmNearest != null) {
                 nameText.setText(osmNearest.getDisplayName(DefaultNameFormatter.getInstance()));