Changeset 10638 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-25T21:19:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390, fix #13206 - Migrate Function interface to java 8 (patch by michael2402, modified) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• StreamUtils.java (modified) (3 diffs)
• Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/StreamUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.EnumSet;
 import java.util.Iterator;
+import java.util.Set;
 import java.util.Spliterator;
 import java.util.Spliterators;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -14 +21 @@
  */
 public final class StreamUtils {
+
+    private static final class HtmlListCollector implements Collector<String, StringBuilder, String> {
+        @Override
+        public Supplier<StringBuilder> supplier() {
+            return StringBuilder::new;
+        }
+
+        @Override
+        public BiConsumer<StringBuilder, String> accumulator() {
+            return (sb, item) -> sb.append("<li>").append(item).append("</li>");
+        }
+
+        @Override
+        public BinaryOperator<StringBuilder> combiner() {
+            return StringBuilder::append;
+        }
+
+        @Override
+        public Function<StringBuilder, String> finisher() {
+            return sb -> "<ul>" + sb.toString() + "</ul>";
+        }
+
+        @Override
+        public Set<Characteristics> characteristics() {
+            return EnumSet.of(Characteristics.CONCURRENT);
+        }
+    }
 
     /**
@@ -30 +64 @@
         return StreamSupport.stream(spliterator, false);
     }
+
+    /**
+     * Creates a new Collector that collects the items and returns them as HTML unordered list.
+     * @return The collector.
+     * @since 10638
+     */
+    public static Collector<String, ?, String> toHtmlList() {
+        return new HtmlListCollector();
+    }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -327 +327 @@
      */
     public static String joinAsHtmlUnorderedList(Iterable<?> values) {
-        StringBuilder sb = new StringBuilder(1024);
-        sb.append("<ul>");
-        for (Object i : values) {
-            sb.append("<li>").append(i).append("</li>");
-        }
-        sb.append("</ul>");
-        return sb.toString();
+        return StreamUtils.toStream(values.iterator()).map(x -> x.toString()).collect(StreamUtils.toHtmlList());
     }