[Freecol-developers] [PATCH 109/182] common: util: CollectionUtils: optimize dump() w/o streams and callbacks

[enrico . weigelt]

From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>

---
 .../sf/freecol/common/util/CollectionUtils.java    | 42 ++++------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java 
b/src/net/sf/freecol/common/util/CollectionUtils.java
index 03a7cf47c7f..f6a1e05bb11 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.common.util;
 
+import java.lang.Iterable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -668,49 +669,18 @@ public class CollectionUtils {
     }
 
     /**
-     * Dump an array to {@code System.err}.
-     *
-     * @param <T> The collection to dump
-     * @param header Optional informational string to print first.
-     * @param array The array to dump.
-     */
-    public static <T> void dump(String header, T[] array) {
-        dump_internal(header, Arrays.stream(array));
-    }
-
-    /**
-     * Dump a collection to {@code System.err}.
-     *
-     * @param header Optional informational string to print first.
-     * @param c The {@code Collection} to print.
-     */
-    public static void dump(String header, Collection<?> c) {
-        dump_internal(header, c.stream());
-    }
-
-    /**
-     * Dump a stream to {@code System.err}.
-     *
-     * @param header Optional informational string to print first.
-     * @param stream The {@code Stream} to print.
-     */
-    public static void dump(String header, Stream<?> stream) {
-        dump_internal(header, stream);
-    }
-
-    /**
      * Implement dump().
      *
      * @param header Optional informational string to print first.
      * @param stream The {@code Stream} to print.
      */
-    private static void dump_internal(String header, Stream<?> stream) {
+    private static <T> void dump(String header, Iterable<T> it) {
         if (header != null) System.err.print(header);
         System.err.print("[ ");
-        forEach(stream, (v) -> {
+        for (T v : it) {
                 System.err.print(v);
                 System.err.print(' ');
-            });
+        }
         System.err.println(']');
     }
 
@@ -723,12 +693,12 @@ public class CollectionUtils {
     public static void dump(String header, Map<?,?> map) {
         if (header != null) System.err.print(header);
         System.err.print("[ ");
-        forEachMapEntry(map, (e) -> {
+        for (Entry<?,?> e : map.entrySet()) {
                 System.err.print(e.getKey());
                 System.err.print(',');
                 System.err.print(e.getValue());
                 System.err.print(' ');
-            });
+        }
         System.err.println(']');
     }
 
-- 
2.11.0.rc0.7.gbe5a750


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers