SwingJS hack for Spliterator

BobHanson · BobHanson · commit 21ad6abcd6af · 2019-11-22T11:22:24.000-06:00
SwingJS cannot follow an interface call at runtime using captures.

Solution was to include tryAdvance(XxxConsumer) explicitly in
Spliterators.EmptySpliterator.ofXxx [Int,Long,Double]
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Spliterator.java b/sources/net.sf.j2s.java.core/src/java/util/Spliterator.java
@@ -596,10 +596,10 @@ default Comparator<? super T> getComparator() {
      * @see Spliterator.OfDouble
      * @since 1.8
      */
-    public interface OfPrimitive<T, T_CONS, T_SPLITR extends Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>>
+    public interface OfPrimitive<T, C, S extends Spliterator.OfPrimitive<T, C, S>>
             extends Spliterator<T> {
         @Override
-        T_SPLITR trySplit();
+        S trySplit();
 
         /**
          * If a remaining element exists, performs the given action on it,
@@ -614,7 +614,7 @@ public interface OfPrimitive<T, T_CONS, T_SPLITR extends Spliterator.OfPrimitive
          * @throws NullPointerException if the specified action is null
          */
         @SuppressWarnings("overloads")
-        boolean tryAdvance(T_CONS action);
+        boolean tryAdvance(C action);
 
         /**
          * Performs the given action for each remaining element, sequentially in
@@ -632,7 +632,7 @@ public interface OfPrimitive<T, T_CONS, T_SPLITR extends Spliterator.OfPrimitive
          * @throws NullPointerException if the specified action is null
          */
         @SuppressWarnings("overloads")
-        default void forEachRemaining(T_CONS action) {
+        default void forEachRemaining(C action) {
             do { } while (tryAdvance(action));
         }
     }
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Spliterators.java b/sources/net.sf.j2s.java.core/src/java/util/Spliterators.java
@@ -862,24 +862,58 @@ private static final class OfRef<T>
                 extends EmptySpliterator<T, Spliterator<T>, Consumer<? super T>>
                 implements Spliterator<T> {
             OfRef() { }
+            
         }
 
         private static final class OfInt
                 extends EmptySpliterator<Integer, Spliterator.OfInt, IntConsumer>
                 implements Spliterator.OfInt {
             OfInt() { }
+            
+            /**
+             * Was necessary for SwingJS
+             */
+            @Override
+			public boolean tryAdvance(IntConsumer consumer) {
+                Objects.requireNonNull(consumer);
+                return false;
+            }
+
+
         }
 
         private static final class OfLong
                 extends EmptySpliterator<Long, Spliterator.OfLong, LongConsumer>
                 implements Spliterator.OfLong {
             OfLong() { }
+            
+            /**
+             * Was necessary for SwingJS
+             */
+            @Override
+			public boolean tryAdvance(LongConsumer consumer) {
+                Objects.requireNonNull(consumer);
+                return false;
+            }
+
+
         }
 
         private static final class OfDouble
                 extends EmptySpliterator<Double, Spliterator.OfDouble, DoubleConsumer>
                 implements Spliterator.OfDouble {
             OfDouble() { }
+
+            /**
+             * Was necessary for SwingJS
+             */
+            @Override
+			public boolean tryAdvance(DoubleConsumer consumer) {
+                Objects.requireNonNull(consumer);
+                return false;
+            }
+
+
         }
     }
 
