Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2020-05-17T12:08:17+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (1 diff)
• AutosaveTask.java (modified) (1 diff)
• gpx/ChooseTrackVisibilityAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1701 +1701 @@
      */
     private List<Action> getMenuAdditions() {
-        final LinkedList<Action> menuAdds = new LinkedList<>();
-        for (MenuAddition menuAdd: menuAdditions) {
-            if (menuAdd.clazz.isInstance(this)) {
-                menuAdds.add(menuAdd.addition);
-            }
-        }
+        final LinkedList<Action> menuAdds = menuAdditions.stream()
+                .filter(menuAdd -> menuAdd.clazz.isInstance(this))
+                .map(menuAdd -> menuAdd.addition)
+                .collect(Collectors.toCollection(LinkedList::new));
         if (!menuAdds.isEmpty()) {
             menuAdds.addFirst(SeparatorLayerAction.INSTANCE);

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -178 +178 @@
         while (true) {
             String filename = getFileName(layer.layer.getName(), index);
-            boolean foundTheSame = false;
-            for (AutosaveLayerInfo<?> info: layersInfo) {
-                if (info != layer && filename.equals(info.layerFileName)) {
-                    foundTheSame = true;
-                    break;
-                }
-            }
-
+            boolean foundTheSame = layersInfo.stream().anyMatch(info -> info != layer && filename.equals(info.layerFileName));
             if (!foundTheSame) {
                 layer.layerFileName = filename;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -14 +14 @@
 import java.awt.event.MouseListener;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -21 +20 @@
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -297 +297 @@
             protected void buttonAction(int buttonIndex, ActionEvent evt) {
                 if (buttonIndex == 0) {
-                    List<IGpxTrack> trks = new ArrayList<>();
-                    for (int i : table.getSelectedRows()) {
-                        Object trk = content[i][5];
-                        if (trk != null && trk instanceof IGpxTrack) {
-                            trks.add((IGpxTrack) trk);
-                        }
-                    }
+                    List<IGpxTrack> trks = Arrays.stream(table.getSelectedRows())
+                            .mapToObj(i -> content[i][5])
+                            .filter(trk -> trk instanceof IGpxTrack)
+                            .map(IGpxTrack.class::cast)
+                            .collect(Collectors.toList());
                     showColorDialog(trks);
                 } else {