Ignore:
Timestamp:
2016-07-27T02:08:34+02:00 (3 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

    r10611 r10657  
    1414import java.util.Map.Entry;
    1515import java.util.Objects;
     16import java.util.function.Predicate;
    1617
    1718import javax.swing.JOptionPane;
     
    2627import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
    2728import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
    28 import org.openstreetmap.josm.tools.Predicate;
    29 import org.openstreetmap.josm.tools.Utils;
     29import org.openstreetmap.josm.tools.SubclassFilteredCollection;
    3030import org.openstreetmap.josm.tools.WindowGeometry;
    3131import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
     
    177177     */
    178178    public void showHistory(final Collection<? extends PrimitiveId> primitives) {
    179         final Collection<? extends PrimitiveId> notNewPrimitives = Utils.filter(primitives, notNewPredicate);
     179        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(primitives, notNewPredicate);
    180180        if (notNewPrimitives.isEmpty()) {
    181181            JOptionPane.showMessageDialog(
     
    187187        }
    188188
    189         Collection<? extends PrimitiveId> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
     189        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(primitives, unloadedHistoryPredicate);
    190190        if (!toLoad.isEmpty()) {
    191191            HistoryLoadTask task = new HistoryLoadTask();
     
    217217
    218218        @Override
    219         public boolean evaluate(PrimitiveId p) {
     219        public boolean test(PrimitiveId p) {
    220220            History h = hds.getHistory(p);
    221221            if (h == null)
Note: See TracChangeset for help on using the changeset viewer.