Changeset 10611 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2016-07-23T18:46:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -9 +9 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31 +29 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.Main;
@@ -83 +79 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -162 +157 @@
         filter = setupFilter();
 
-        displaylist.addListSelectionListener(new ListSelectionListener() {
-            @Override
-            public void valueChanged(ListSelectionEvent e) {
-                updateActionsRelationLists();
-            }
-        });
+        displaylist.addListSelectionListener(e -> updateActionsRelationLists());
 
         // Setup popup menu handler
@@ -309 +299 @@
         f.setToolTipText(tr("Relation list filter"));
         final CompileSearchTextDecorator decorator = CompileSearchTextDecorator.decorate(f);
-        f.addPropertyChangeListener("filter", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                model.setFilter(decorator.getMatch());
-            }
-        });
+        f.addPropertyChangeListener("filter", evt -> model.setFilter(decorator.getMatch()));
         return f;
     }
@@ -506 +491 @@
         private void updateFilteredRelations() {
             if (filter != null) {
-                filteredRelations = new ArrayList<>(Utils.filter(relations, new Predicate<Relation>() {
-                    @Override
-                    public boolean evaluate(Relation r) {
-                        return filter.match(r);
-                    }
-                }));
+                filteredRelations = new ArrayList<>(Utils.filter(relations, filter::match));
             } else if (filteredRelations != null) {
                 filteredRelations = null;