Changeset 10601 in josm for trunk/src/org/openstreetmap/josm/actions/relation

Timestamp:

2016-07-23T04:10:39+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

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AddSelectionToRelations.java (modified) (1 diff)
• DownloadMembersAction.java (modified) (2 diffs)
• DownloadSelectedIncompleteMembersAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -63 +63 @@
     @Override
     public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                setEnabled(newSelection != null && !newSelection.isEmpty());
-            }
-        });
+        GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty()));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -42 +40 @@
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // selected non-new relations
-        this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>() {
-            @Override
-            public boolean evaluate(Relation r) {
-                return !r.isNew();
-            }
-        });
+        this.relations = Utils.filter(getRelations(primitives), r -> !r.isNew());
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -43 +42 @@
         Set<OsmPrimitive> ret = new HashSet<>();
         for (Relation r : rels) {
-            ret.addAll(Utils.filter(r.getIncompleteMembers(), new Predicate<OsmPrimitive>() {
-                @Override
-                public boolean evaluate(OsmPrimitive osm) {
-                    return !osm.isNew();
-                }
-            }));
+            ret.addAll(Utils.filter(r.getIncompleteMembers(), osm -> !osm.isNew()));
         }
         return ret;
@@ -65 +59 @@
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // selected relations with incomplete members
-        this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>() {
-            @Override
-            public boolean evaluate(Relation r) {
-                return r.hasIncompleteMembers();
-            }
-        });
+        this.relations = Utils.filter(getRelations(primitives), r -> r.hasIncompleteMembers());
         this.incompleteMembers = buildSetOfIncompleteMembers(relations);
         updateEnabledState();