Changeset 11298 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-11-23T23:39:40+01:00 (7 years ago)

Author:

simon04

Message:

Replace TestError#getSelectablePrimitives by Java 8 stream usage

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -3 +3 @@
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -381 +380 @@
 
     /**
-     * Gets the list of primitives affected by this error and are selectable
-     * @return the list of selectable primitives affected by this error
-     */
-    public Collection<? extends OsmPrimitive> getSelectablePrimitives() {
-        List<OsmPrimitive> selectablePrimitives = new ArrayList<>(primitives.size());
-        for (OsmPrimitive o : primitives) {
-            if (o.isSelectable()) {
-                selectablePrimitives.add(o);
-            }
-        }
-        return selectablePrimitives;
-    }
-
-    /**
      * Sets the list of primitives affected by this error
      * @param primitives the list of primitives affected by this error*

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

@@ -337 +337 @@
                 if (nodeInfo instanceof TestError) {
                     TestError error = (TestError) nodeInfo;
-                    sel.addAll(error.getSelectablePrimitives());
+                    error.getPrimitives().stream()
+                            .filter(OsmPrimitive::isSelectable)
+                            .forEach(sel::add);
                 }
             }
@@ -388 +390 @@
                 hasFixes = hasFixes || error.isFixable();
                 if (addSelected) {
-                    sel.addAll(error.getSelectablePrimitives());
+                    error.getPrimitives().stream()
+                            .filter(OsmPrimitive::isSelectable)
+                            .forEach(sel::add);
                 }
             }