Reorganized namespaces for Stream compatibility.

Ichoran · Ichoran · commit 86370b046bdb · 2016-01-08T13:12:34.000-08:00
Basically, everything to do with conversion is in conversionImpl, while actual collection classes are in collectionImpl.

Most everything in here should be private[java8], but it probably isn't yet.
diff --git a/src/main/java/scala/compat/java8/ScalaStreaming.java b/src/main/java/scala/compat/java8/ScalaStreaming.java
@@ -1,6 +1,7 @@
 package scala.compat.java8;
 
-import scala.compat.java8.converterImpls.*;
+import scala.compat.java8.converterImpl.*;
+import scala.compat.java8.collectionImpl.*;
 import java.util.stream.*;
 import scala.compat.java8.runtime.CollectionInternals;
 
@@ -471,8 +472,8 @@ public static DoubleStream doubleFromAccumulatedValues(scala.collection.Map<?, D
      */
     public static IntStream intFrom(scala.collection.BitSet coll) {
         // Let the value class figure out the casting!
-        scala.compat.java8.converterImpls.RichBitSetCanStep rbscs = 
-          new scala.compat.java8.converterImpls.RichBitSetCanStep(coll);
+        scala.compat.java8.converterImpl.RichBitSetCanStep rbscs = 
+          new scala.compat.java8.converterImpl.RichBitSetCanStep(coll);
         return StreamSupport.intStream(rbscs.stepper(), false);
     }
 
@@ -485,7 +486,7 @@ public static IntStream intFrom(scala.collection.BitSet coll) {
      * @return     A IntStream view of the collection which, by default, executes sequentially.
      */
     public static IntStream intFrom(scala.collection.immutable.Range coll) {
-        return StreamSupport.intStream(new scala.compat.java8.converterImpls.StepsIntRange(coll, 0, coll.length()), false);
+        return StreamSupport.intStream(new scala.compat.java8.converterImpl.StepsIntRange(coll, 0, coll.length()), false);
     }
 
     /** 
diff --git a/src/main/scala/scala/compat/java8/StreamConverters.scala b/src/main/scala/scala/compat/java8/StreamConverters.scala
@@ -4,7 +4,7 @@ import language.implicitConversions
 
 import java.util.stream._
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.converterImpls._
+import scala.compat.java8.converterImpl._
 
 trait PrimitiveStreamAccumulator[S, AA] {
   def streamAccumulate(stream: S): AA
@@ -197,8 +197,8 @@ trait Priority1StreamConverters extends Priority2StreamConverters {
   */
 object StreamConverters
 extends Priority1StreamConverters
-with converterImpls.Priority1StepConverters
-with converterImpls.Priority1AccumulatorConverters
+with converterImpl.Priority1StepConverters
+with converterImpl.Priority1AccumulatorConverters
 {
   implicit class EnrichDoubleArrayWithStream(a: Array[Double]) {
     def seqStream: DoubleStream = java.util.Arrays.stream(a)
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala b/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala
@@ -42,7 +42,7 @@ trait Stepper[@specialized(Double, Int, Long) A] extends StepperLike[A, Stepper[
     *
     * Note: accumulation will occur sequentially.  To accumulate in parallel, use a `Stream` (i.e. `.parStream.accumulate`).
     */
-  def accumulate[Acc <: AccumulatorLike[A, Acc]](implicit accer: scala.compat.java8.converterImpls.AccumulatesFromStepper[A, Acc]) = accer(this)  
+  def accumulate[Acc <: AccumulatorLike[A, Acc]](implicit accer: scala.compat.java8.converterImpl.AccumulatesFromStepper[A, Acc]) = accer(this)  
 }
 
 /** An (optional) marker trait that indicates that a `Stepper` can call `substep` with
diff --git a/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala b/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/AccumulatorConverters.scala b/src/main/scala/scala/compat/java8/converterImpl/AccumulatorConverters.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala b/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala b/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala
@@ -1,4 +1,4 @@
-package scala.compat.java8.converterImpls
+package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala
@@ -1,7 +1,8 @@
-package scala.compat.java8.collectionImpl
+package scala.compat.java8.converterImpl
 
 import annotation.tailrec
 
+import scala.compat.java8.collectionImpl._
 import Stepper._
 
 /** Abstracts all the generic operations of stepping over a backing array
@@ -10,7 +11,7 @@ import Stepper._
   * is used as a signal to look for more entries in the array.  (This also
   * allows a subclass to traverse a sublist by updating `currentEntry`.)
   */
-abstract class AbstractStepsLikeGapped[Sub >: Null, Semi <: Sub](protected val underlying: Array[AnyRef], protected var i0: Int, protected var iN: Int) {
+private[java8] abstract class AbstractStepsLikeGapped[Sub >: Null, Semi <: Sub](protected val underlying: Array[AnyRef], protected var i0: Int, protected var iN: Int) {
   protected var currentEntry: AnyRef = null
   def semiclone(half: Int): Semi
   def characteristics(): Int = Ordered
@@ -33,7 +34,7 @@ abstract class AbstractStepsLikeGapped[Sub >: Null, Semi <: Sub](protected val u
 /** Abstracts the process of stepping through an incompletely filled array of `AnyRefs`
   * and interpreting the contents as the elements of a collection.
   */
-abstract class StepsLikeGapped[A, STA >: Null <: StepsLikeGapped[A, _]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
+private[java8] abstract class StepsLikeGapped[A, STA >: Null <: StepsLikeGapped[A, _]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
   extends AbstractStepsLikeGapped[AnyStepper[A], STA](_underlying, _i0, _iN)
   with AnyStepper[A]
   with EfficientSubstep
@@ -43,7 +44,7 @@ abstract class StepsLikeGapped[A, STA >: Null <: StepsLikeGapped[A, _]](_underly
   * and interpreting the contents as the elements of a collection of `Double`s.  Subclasses
   * are responsible for unboxing the `AnyRef` inside `nextDouble`.
   */
-abstract class StepsDoubleLikeGapped[STD >: Null <: StepsDoubleLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
+private[java8] abstract class StepsDoubleLikeGapped[STD >: Null <: StepsDoubleLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
   extends AbstractStepsLikeGapped[DoubleStepper, STD](_underlying, _i0, _iN)
   with DoubleStepper
   with EfficientSubstep
@@ -53,7 +54,7 @@ abstract class StepsDoubleLikeGapped[STD >: Null <: StepsDoubleLikeGapped[_]](_u
   * and interpreting the contents as the elements of a collection of `Int`s.  Subclasses
   * are responsible for unboxing the `AnyRef` inside `nextInt`.
   */
-abstract class StepsIntLikeGapped[STI >: Null <: StepsIntLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
+private[java8] abstract class StepsIntLikeGapped[STI >: Null <: StepsIntLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
   extends AbstractStepsLikeGapped[IntStepper, STI](_underlying, _i0, _iN)
   with IntStepper
   with EfficientSubstep
@@ -63,7 +64,7 @@ abstract class StepsIntLikeGapped[STI >: Null <: StepsIntLikeGapped[_]](_underly
   * and interpreting the contents as the elements of a collection of `Long`s.  Subclasses
   * are responsible for unboxing the `AnyRef` inside `nextLong`.
   */
-abstract class StepsLongLikeGapped[STL >: Null <: StepsLongLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
+private[java8] abstract class StepsLongLikeGapped[STL >: Null <: StepsLongLikeGapped[_]](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
   extends AbstractStepsLikeGapped[LongStepper, STL](_underlying, _i0, _iN)
   with LongStepper 
   with EfficientSubstep
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala
@@ -1,13 +1,15 @@
-package scala.compat.java8.collectionImpl
+package scala.compat.java8.converterImpl
 
 import java.util.Spliterator
+
+import scala.compat.java8.collectionImpl._
 import Stepper._
 
 /** Abstracts all the generic operations of stepping over an immutable HashMap by slicing it into pieces.
   * `next` must update `i` but not `i0` so that later splitting steps can keep track of whether the
   * collection needs some sort of modification before transmission to the subclass.
   */
-trait AbstractStepsLikeImmHashMap[K, V, A, Sub >: Null, Semi >: Null <: Sub with AbstractStepsLikeImmHashMap[K, V, A, Sub, _]]
+private[java8] trait AbstractStepsLikeImmHashMap[K, V, A, Sub >: Null, Semi >: Null <: Sub with AbstractStepsLikeImmHashMap[K, V, A, Sub, _]]
 extends AbstractStepsLikeSliced[collection.immutable.HashMap[K, V], Sub, Semi] {
   protected var theIterator: Iterator[A] = null
   protected def demiclone(u: collection.immutable.HashMap[K,V], j0: Int, jN: Int): Semi
@@ -32,22 +34,22 @@ extends AbstractStepsLikeSliced[collection.immutable.HashMap[K, V], Sub, Semi] {
     }
 }
 
-abstract class StepsLikeImmHashMap[K, V, A, SIHM >: Null <: StepsLikeImmHashMap[K, V, A, _]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
+private[java8] abstract class StepsLikeImmHashMap[K, V, A, SIHM >: Null <: StepsLikeImmHashMap[K, V, A, _]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
   extends StepsLikeSliced[A, collection.immutable.HashMap[K, V], SIHM](_underlying, _i0, _iN)
   with AbstractStepsLikeImmHashMap[K, V, A, AnyStepper[A], SIHM]
 {}
 
-abstract class StepsDoubleLikeImmHashMap[K, V, SIHM >: Null <: StepsDoubleLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
+private[java8] abstract class StepsDoubleLikeImmHashMap[K, V, SIHM >: Null <: StepsDoubleLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
   extends StepsDoubleLikeSliced[collection.immutable.HashMap[K, V], SIHM](_underlying, _i0, _iN)
   with AbstractStepsLikeImmHashMap[K, V, Double, DoubleStepper, SIHM]
 {}
 
-abstract class StepsIntLikeImmHashMap[K, V, SIHM >: Null <: StepsIntLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
+private[java8] abstract class StepsIntLikeImmHashMap[K, V, SIHM >: Null <: StepsIntLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
   extends StepsIntLikeSliced[collection.immutable.HashMap[K, V], SIHM](_underlying, _i0, _iN)
   with AbstractStepsLikeImmHashMap[K, V, Int, IntStepper, SIHM]
 {}
 
-abstract class StepsLongLikeImmHashMap[K, V, SIHM >: Null <: StepsLongLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
+private[java8] abstract class StepsLongLikeImmHashMap[K, V, SIHM >: Null <: StepsLongLikeImmHashMap[K, V, SIHM]](_underlying: collection.immutable.HashMap[K, V], _i0: Int, _iN: Int)
   extends StepsLongLikeSliced[collection.immutable.HashMap[K, V], SIHM](_underlying, _i0, _iN)
   with AbstractStepsLikeImmHashMap[K, V, Long, LongStepper, SIHM]
 {}
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala
@@ -1,10 +1,12 @@
-package scala.compat.java8.collectionImpl
+package scala.compat.java8.converterImpl
 
 import java.util.Spliterator
+
+import scala.compat.java8.collectionImpl._
 import Stepper._
 
 /** Abstracts all the generic operations of stepping over an indexable collection */
-abstract class AbstractStepsLikeIndexed[Sub >: Null, Semi <: Sub](protected var i0: Int, protected var iN: Int) {
+private[java8] abstract class AbstractStepsLikeIndexed[Sub >: Null, Semi <: Sub](protected var i0: Int, protected var iN: Int) {
   def semiclone(half: Int): Semi
   def characteristics(): Int = Ordered + Sized + SubSized
   def estimateSize(): Long = iN - i0
@@ -21,28 +23,28 @@ abstract class AbstractStepsLikeIndexed[Sub >: Null, Semi <: Sub](protected var
 }
 
 /** Abstracts the operation of stepping over a generic indexable collection */
-abstract class StepsLikeIndexed[A, STA >: Null <: StepsLikeIndexed[A, _]](_i0: Int, _iN: Int)
+private[java8] abstract class StepsLikeIndexed[A, STA >: Null <: StepsLikeIndexed[A, _]](_i0: Int, _iN: Int)
   extends AbstractStepsLikeIndexed[AnyStepper[A], STA](_i0, _iN)
   with AnyStepper[A]
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over an indexable collection of Doubles */
-abstract class StepsDoubleLikeIndexed[STD >: Null <: StepsDoubleLikeIndexed[_]](_i0: Int, _iN: Int)
+private[java8] abstract class StepsDoubleLikeIndexed[STD >: Null <: StepsDoubleLikeIndexed[_]](_i0: Int, _iN: Int)
   extends AbstractStepsLikeIndexed[DoubleStepper, STD](_i0, _iN)
   with DoubleStepper
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over an indexable collection of Ints */
-abstract class StepsIntLikeIndexed[STI >: Null <: StepsIntLikeIndexed[_]](_i0: Int, _iN: Int)
+private[java8] abstract class StepsIntLikeIndexed[STI >: Null <: StepsIntLikeIndexed[_]](_i0: Int, _iN: Int)
   extends AbstractStepsLikeIndexed[IntStepper, STI](_i0, _iN)
   with IntStepper
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over an indexable collection of Longs */
-abstract class StepsLongLikeIndexed[STL >: Null <: StepsLongLikeIndexed[_]](_i0: Int, _iN: Int)
+private[java8] abstract class StepsLongLikeIndexed[STL >: Null <: StepsLongLikeIndexed[_]](_i0: Int, _iN: Int)
   extends AbstractStepsLikeIndexed[LongStepper, STL](_i0, _iN)
   with LongStepper
   with EfficientSubstep
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala
@@ -1,10 +1,12 @@
-package scala.compat.java8.collectionImpl
+package scala.compat.java8.converterImpl
 
 import java.util.Spliterator
+
+import scala.compat.java8.collectionImpl._
 import Stepper._
 
 /** Common functionality for Steppers that step through an Iterator, caching the results as needed when a split is requested. */
-abstract class AbstractStepsLikeIterator[A, SP >: Null <: Stepper[A], Semi <: SP](final protected var underlying: Iterator[A]) {
+private[java8] abstract class AbstractStepsLikeIterator[A, SP >: Null <: Stepper[A], Semi <: SP](final protected var underlying: Iterator[A]) {
   final protected var nextChunkSize = 16
   final protected var proxied: SP = null
   def semiclone(): Semi        // Must initialize with null iterator!
@@ -14,7 +16,7 @@ abstract class AbstractStepsLikeIterator[A, SP >: Null <: Stepper[A], Semi <: SP
 }
 
 /** Abstracts the operation of stepping over an iterator (that needs to be cached when splitting) */
-abstract class StepsLikeIterator[A, SLI >: Null <: StepsLikeIterator[A, SLI] with AnyStepper[A]](_underlying: Iterator[A])
+private[java8] abstract class StepsLikeIterator[A, SLI >: Null <: StepsLikeIterator[A, SLI] with AnyStepper[A]](_underlying: Iterator[A])
   extends AbstractStepsLikeIterator[A, AnyStepper[A], SLI](_underlying)
   with AnyStepper[A]
 {
@@ -37,7 +39,7 @@ abstract class StepsLikeIterator[A, SLI >: Null <: StepsLikeIterator[A, SLI] wit
 }
 
 /** Abstracts the operation of stepping over an iterator of Doubles (needs caching when split) */
-abstract class StepsDoubleLikeIterator[SLI >: Null <: StepsDoubleLikeIterator[SLI] with DoubleStepper](_underlying: Iterator[Double])
+private[java8] abstract class StepsDoubleLikeIterator[SLI >: Null <: StepsDoubleLikeIterator[SLI] with DoubleStepper](_underlying: Iterator[Double])
   extends AbstractStepsLikeIterator[Double, DoubleStepper, SLI](_underlying)
   with DoubleStepper
 {
@@ -60,7 +62,7 @@ abstract class StepsDoubleLikeIterator[SLI >: Null <: StepsDoubleLikeIterator[SL
 }
 
 /** Abstracts the operation of stepping over an iterator of Ints (needs caching when split) */
-abstract class StepsIntLikeIterator[SLI >: Null <: StepsIntLikeIterator[SLI] with IntStepper](_underlying: Iterator[Int])
+private[java8] abstract class StepsIntLikeIterator[SLI >: Null <: StepsIntLikeIterator[SLI] with IntStepper](_underlying: Iterator[Int])
   extends AbstractStepsLikeIterator[Int, IntStepper, SLI](_underlying)
   with IntStepper
 {
@@ -83,7 +85,7 @@ abstract class StepsIntLikeIterator[SLI >: Null <: StepsIntLikeIterator[SLI] wit
 }
 
 /** Abstracts the operation of stepping over an iterator of Longs (needs caching when split) */
-abstract class StepsLongLikeIterator[SLI >: Null <: StepsLongLikeIterator[SLI] with LongStepper](_underlying: Iterator[Long])
+private[java8] abstract class StepsLongLikeIterator[SLI >: Null <: StepsLongLikeIterator[SLI] with LongStepper](_underlying: Iterator[Long])
   extends AbstractStepsLikeIterator[Long, LongStepper, SLI](_underlying)
   with LongStepper
 {
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala
@@ -1,13 +1,15 @@
-package scala.compat.java8.collectionImpl
+package scala.compat.java8.converterImpl
 
 import java.util.Spliterator
+
+import scala.compat.java8.collectionImpl._
 import Stepper._
 
 /** Abstracts all the generic operations of stepping over a collection that can be sliced into pieces.
   * `next` must update `i` but not `i0` so that later splitting steps can keep track of whether the
   * collection needs some sort of modification before transmission to the subclass.
   */
-abstract class AbstractStepsLikeSliced[Coll, Sub >: Null, Semi <: Sub](protected var underlying: Coll, protected var i: Int, protected var iN: Int) {
+private[java8] abstract class AbstractStepsLikeSliced[Coll, Sub >: Null, Semi <: Sub](protected var underlying: Coll, protected var i: Int, protected var iN: Int) {
   protected var i0: Int = i
   def semiclone(halfHint: Int): Semi  // Must really do all the work for both this and cloned collection!
   def characteristics(): Int = Ordered
@@ -16,28 +18,28 @@ abstract class AbstractStepsLikeSliced[Coll, Sub >: Null, Semi <: Sub](protected
 }
 
 /** Abstracts the operation of stepping over a generic collection that can be efficiently sliced or otherwise subdivided */
-abstract class StepsLikeSliced[A, AA, STA >: Null <: StepsLikeSliced[A, AA, _]](_underlying: AA, _i0: Int, _iN: Int)
+private[java8] abstract class StepsLikeSliced[A, AA, STA >: Null <: StepsLikeSliced[A, AA, _]](_underlying: AA, _i0: Int, _iN: Int)
   extends AbstractStepsLikeSliced[AA, AnyStepper[A], STA](_underlying, _i0, _iN)
   with AnyStepper[A]
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over a collection of Doubles that can be efficiently sliced or otherwise subdivided */
-abstract class StepsDoubleLikeSliced[AA, STA >: Null <: StepsDoubleLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
+private[java8] abstract class StepsDoubleLikeSliced[AA, STA >: Null <: StepsDoubleLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
   extends AbstractStepsLikeSliced[AA, DoubleStepper, STA](_underlying, _i0, _iN)
   with DoubleStepper
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over a collection of Ints that can be efficiently sliced or otherwise subdivided */
-abstract class StepsIntLikeSliced[AA, STA >: Null <: StepsIntLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
+private[java8] abstract class StepsIntLikeSliced[AA, STA >: Null <: StepsIntLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
   extends AbstractStepsLikeSliced[AA, IntStepper, STA](_underlying, _i0, _iN)
   with IntStepper
   with EfficientSubstep
 {}
 
 /** Abstracts the operation of stepping over a collection of Longs that can be efficiently sliced or otherwise subdivided */
-abstract class StepsLongLikeSliced[AA, STA >: Null <: StepsLongLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
+private[java8] abstract class StepsLongLikeSliced[AA, STA >: Null <: StepsLongLikeSliced[AA, STA]](_underlying: AA, _i0: Int, _iN: Int)
   extends AbstractStepsLikeSliced[AA, LongStepper, STA](_underlying, _i0, _iN)
   with LongStepper
   with EfficientSubstep
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala
diff --git a/src/test/scala/scala/compat/java8/StepConvertersTest.scala b/src/test/scala/scala/compat/java8/StepConvertersTest.scala

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ trait Stepper[@specialized(Double, Int, Long) A] extends StepperLike[A, Stepper[`
`42`	`42`	`*`
`43`	`43`	* Note: accumulation will occur sequentially. To accumulate in parallel, use a `Stream` (i.e. `.parStream.accumulate`).
`44`	`44`	`*/`
`45`		`- def accumulate[Acc <: AccumulatorLike[A, Acc]](implicit accer: scala.compat.java8.converterImpls.AccumulatesFromStepper[A, Acc]) = accer(this)`
	`45`	`+ def accumulate[Acc <: AccumulatorLike[A, Acc]](implicit accer: scala.compat.java8.converterImpl.AccumulatesFromStepper[A, Acc]) = accer(this)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	/** An (optional) marker trait that indicates that a `Stepper` can call `substep` with
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package scala.compat.java8.converterImpls`
	`1`	`+package scala.compat.java8.converterImpl`
`2`	`2`
`3`	`3`	`import language.implicitConversions`
`4`	`4`