Changeset 15736 in josm

Timestamp:

2020-01-19T23:02:13+01:00 (5 years ago)

Author:

simon04

Message:

Java 8: simplify Stream API usage

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -412 +412 @@
             }
             if (!i.serverProjections.isEmpty()) {
-                projections = i.serverProjections.stream().collect(Collectors.joining(","));
+                projections = String.join(",", i.serverProjections);
             }
             if (i.noTileHeaders != null && !i.noTileHeaders.isEmpty()) {

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -7 +7 @@
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
@@ -170 +171 @@
         Matcher m = PATTERN_PARAM.matcher(url);
         while (m.find()) {
-            boolean isSupportedPattern = false;
-            for (Pattern pattern : ALL_PATTERNS) {
-                if (pattern.matcher(m.group()).matches()) {
-                    isSupportedPattern = true;
-                    break;
-                }
-            }
+            boolean isSupportedPattern = Arrays.stream(ALL_PATTERNS)
+                    .anyMatch(pattern -> pattern.matcher(m.group()).matches());
             if (!isSupportedPattern) {
                 throw new IllegalArgumentException(

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -92 +92 @@
                 + "<p><strong>" + tr("Examples") + "</strong></p>"
                 + "<ul>"
-                + String.join("", getExamples().stream().map(
-                        s -> "<li><a href=\""+s+"\">"+s+"</a></li>").collect(Collectors.toList()))
+                + getExamples().stream()
+                        .map(s -> "<li><a href=\""+s+"\">"+s+"</a></li>")
+                        .collect(Collectors.joining(""))
                 + "</ul>"
                 + tr("Note that changeset queries are currently always submitted to ''{0}'', regardless of the "

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

@@ -305 +305 @@
         if (Logging.isDebugEnabled() && !data.getLayerPrefs().isEmpty()) {
             info.append("<br><br>")
-                .append(String.join("<br>", data.getLayerPrefs().entrySet().stream()
-                        .map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.toList())));
+                .append(data.getLayerPrefs().entrySet().stream()
+                        .map(e -> e.getKey() + "=" + e.getValue())
+                        .collect(Collectors.joining("<br>")));
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -16 +16 @@
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -347 +346 @@
 
     private static List<AutoCompletionItem> setToList(AutoCompletionSet set, Comparator<AutoCompletionItem> comparator) {
-        List<AutoCompletionItem> list = set.stream().collect(Collectors.toList());
+        List<AutoCompletionItem> list = new ArrayList<>(set);
         list.sort(comparator);
         return list;

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -397 +397 @@
                 // but otherwise the file is invalid and can't even be parsed by SAX anymore
                 String k = (e.getPrefix().isEmpty() ? "" : e.getPrefix() + ":") + e.getKey();
-                String attr = String.join(" ", e.getAttributes().entrySet().stream()
-                        .map(a -> encode(a.getKey()) + "=\"" + encode(a.getValue().toString()) + "\"").sorted().collect(Collectors.toList()));
+                String attr = e.getAttributes().entrySet().stream()
+                        .map(a -> encode(a.getKey()) + "=\"" + encode(a.getValue().toString()) + "\"")
+                        .sorted()
+                        .collect(Collectors.joining(" "));
                 if (e.getValue() == null && e.getExtensions().isEmpty()) {
                     inline(k, attr);

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -129 +129 @@
                 assertEquals(24, primitives.size());
                 assertTrue(primitives.stream()
-                        .filter(it -> areEqualNodes(it, new Node(new LatLon(52.5840213, 13.1724145))))
-                        .findAny().isPresent());
+                        .anyMatch(it -> areEqualNodes(it, new Node(new LatLon(52.5840213, 13.1724145)))));
         }
     }