Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -23 +23 @@
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import javax.swing.AbstractAction;
@@ -331 +333 @@
                     return requiresRestart;
             }
-            for (PluginInformation pi : model.getNewlyActivatedPlugins()) {
-                if (!pi.canloadatruntime)
-                    return true;
-            }
+            return model.getNewlyActivatedPlugins().stream().anyMatch(pi -> !pi.canloadatruntime);
         }
         return false;
@@ -436 +435 @@
                 if (pluginDownloadTask.isCanceled())
                     return;
-                boolean restartRequired = false;
-                for (PluginInformation pi : pluginDownloadTask.getDownloadedPlugins()) {
-                    if (!model.getNewlyActivatedPlugins().contains(pi) || !pi.canloadatruntime) {
-                        restartRequired = true;
-                        break;
-                    }
-                }
+                boolean restartRequired = pluginDownloadTask.getDownloadedPlugins().stream()
+                        .anyMatch(pi -> !(model.getNewlyActivatedPlugins().contains(pi) && pi.canloadatruntime));
                 notifyDownloadResults(pnlPluginPreferences, pluginDownloadTask, restartRequired);
                 model.refreshLocalPluginVersion(pluginDownloadTask.getDownloadedPlugins());
@@ -638 +632 @@
             if (model.getSize() == 0)
                 return Collections.emptyList();
-            List<String> ret = new ArrayList<>(model.getSize());
-            for (int i = 0; i < model.getSize(); i++) {
-                ret.add(model.get(i));
-            }
-            return ret;
+            return IntStream.range(0, model.getSize())
+                    .mapToObj(model::get)
+                    .collect(Collectors.toList());
         }
     }