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

Timestamp:

2020-09-02T22:23:24+02:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CreateMultipolygonAction.java (modified) (1 diff)
• MergeLayerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -308 +308 @@
     private static void showErrors(List<TestError> errors) {
         if (!errors.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            Set<String> errorMessages = new LinkedHashSet<>();
-            errors.forEach(e-> errorMessages.add(e.getMessage()));
-            Iterator<String> iter = errorMessages.iterator();
-            while (iter.hasNext()) {
-                sb.append(iter.next());
-                if (iter.hasNext())
-                    sb.append('\n');
-            }
-            GuiHelper.runInEDT(() -> new Notification(sb.toString()).setIcon(JOptionPane.INFORMATION_MESSAGE).show());
+            String errorMessages = errors.stream()
+                    .map(TestError::getMessage)
+                    .distinct()
+                    .collect(Collectors.joining("\n"));
+            GuiHelper.runInEDT(() -> new Notification(errorMessages).setIcon(JOptionPane.INFORMATION_MESSAGE).show());
         }
     }

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -53 +53 @@
      */
     protected Future<?> doMerge(List<? extends Layer> targetLayers, final Collection<? extends Layer> sourceLayers) {
-        final boolean onlygpx = targetLayers.stream().noneMatch(l -> !(l instanceof GpxLayer));
+        final boolean onlygpx = targetLayers.stream().allMatch(l -> l instanceof GpxLayer);
         final TargetLayerDialogResult<Layer> res = askTargetLayer(targetLayers, onlygpx,
                 tr("Cut timewise overlapping parts of tracks"),