Changeset 10657 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2016-07-27T02:08:34+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -14 +14 @@
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.function.Predicate;
 
 import javax.swing.JOptionPane;
@@ -26 +27 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.WindowGeometry;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
@@ -177 +177 @@
      */
     public void showHistory(final Collection<? extends PrimitiveId> primitives) {
-        final Collection<? extends PrimitiveId> notNewPrimitives = Utils.filter(primitives, notNewPredicate);
+        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(primitives, notNewPredicate);
         if (notNewPrimitives.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -187 +187 @@
         }
 
-        Collection<? extends PrimitiveId> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
+        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(primitives, unloadedHistoryPredicate);
         if (!toLoad.isEmpty()) {
             HistoryLoadTask task = new HistoryLoadTask();
@@ -217 +217 @@
 
         @Override
-        public boolean evaluate(PrimitiveId p) {
+        public boolean test(PrimitiveId p) {
             History h = hds.getHistory(p);
             if (h == null)