Changeset 10658 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2016-07-27T02:16:37+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates (forgot some)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -26 +26 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import javax.swing.ButtonGroup;
@@ -54 +55 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -689 +689 @@
                             ++foundMatches;
                         }
-                    } else if (setting.mode == SearchMode.add && !predicate.evaluate(osm) && matcher.match(osm)) {
+                    } else if (setting.mode == SearchMode.add && !predicate.test(osm) && matcher.match(osm)) {
                         selection.add(osm);
                         ++foundMatches;
-                    } else if (setting.mode == SearchMode.remove && predicate.evaluate(osm) && matcher.match(osm)) {
+                    } else if (setting.mode == SearchMode.remove && predicate.test(osm) && matcher.match(osm)) {
                         selection.remove(osm);
                         ++foundMatches;
-                    } else if (setting.mode == SearchMode.in_selection && predicate.evaluate(osm) && !matcher.match(osm)) {
+                    } else if (setting.mode == SearchMode.in_selection && predicate.test(osm) && !matcher.match(osm)) {
                         selection.remove(osm);
                         --foundMatches;