Changeset 15717 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2020-01-18T14:14:01+01:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Collectors.joining

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MapPaintStyles.java (modified) (2 diffs)
• mapcss/Functions.java (modified) (1 diff)
• mapcss/MapCSSRule.java (modified) (2 diffs)
• mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• mapcss/Selector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -7 +7 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 
 import javax.swing.ImageIcon;
@@ -347 +345 @@
             return (MapCSSStyleSource) entry;
         }
-        Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
-        try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
+        try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES)) {
             String zipEntryPath = cf.findZipEntryPath("mapcss", "style");
             if (zipEntryPath != null) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -307 +307 @@
      * @param args arguments
      * @return assembled string
-     * @see Utils#join
+     * @see Collectors#joining
      */
     @NullableArguments
     public static String concat(Object... args) { // NO_UCD (unused code)
-        return Utils.join("", Arrays.asList(args));
+        return Arrays.stream(args).map(String::valueOf).collect(Collectors.joining());
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java

@@ -4 +4 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -109 +109 @@
     @Override
     public String toString() {
-        return selector + " {\n  " + Utils.join("\n  ", declaration.instructions) + "\n}";
+        return selector + declaration.instructions.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining("\n  ", " {\n  ", "\n}"));
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -29 +29 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -811 +812 @@
     @Override
     public String toString() {
-        return Utils.join("\n", rules);
+        return rules.stream().map(MapCSSRule::toString).collect(Collectors.joining("\n"));
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -14 +14 @@
 import java.util.function.IntSupplier;
 import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.INode;
@@ -783 +784 @@
         @Override
         public String toString() {
-            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + (conds != null ? Utils.join("", conds) : "")
+            return base
+                    + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range)
+                    + (conds != null ? conds.stream().map(String::valueOf).collect(Collectors.joining("")) : "")
                     + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? ("::" + subpart) : "");
         }