Refactored all the zipper stuff into its own package

src/main/scala/com/codecommit/antixml/Group.scala

@@ -30,6 +30,7 @@ package com.codecommit
 package antixml
 
 import util._
+import zipper._
 
 import scala.annotation.unchecked.uncheckedVariance
 import scala.annotation.tailrec

src/main/scala/com/codecommit/antixml/Selectable.scala

@@ -29,10 +29,12 @@
 package com.codecommit
 package antixml
 
+import zipper._
+
 import scala.collection.generic.{CanBuildFrom, HasNewBuilder}
 import scala.collection.immutable.VectorBuilder
 
-import com.codecommit.antixml.CanBuildFromWithZipper.ElemsWithContextVisible
+import CanBuildFromWithZipper.ElemsWithContextVisible
 import com.codecommit.antixml.util.VectorCase
 
 trait Selectable[+A <: Node] {

src/main/scala/com/codecommit/antixml/zipper/Zipper.scala → src/main/scala/com/codecommit/antixml/Zipper.scala

@@ -28,6 +28,8 @@
 
 package com.codecommit.antixml
 
+import zipper._
+
 import com.codecommit.antixml.util.VectorCase
 import scala.annotation.tailrec
 import scala.collection.{immutable, mutable, IndexedSeqLike, GenTraversableOnce}

src/main/scala/com/codecommit/antixml/zipper/CanBuildFromWithZipper.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import scala.collection.GenTraversableOnce
 import scala.collection.mutable.Builder

src/main/scala/com/codecommit/antixml/PathCreator.scala → src/main/scala/com/codecommit/antixml/zipper/PathCreator.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import util.VectorCase
 

src/main/scala/com/codecommit/antixml/PathFetcher.scala → src/main/scala/com/codecommit/antixml/zipper/PathFetcher.scala

@@ -1,4 +1,6 @@
 package com.codecommit.antixml
+package zipper
+
 import scala.annotation.tailrec
 
 /**

src/main/scala/com/codecommit/antixml/PathTransformer.scala → src/main/scala/com/codecommit/antixml/zipper/PathTransformer.scala

@@ -1,7 +1,7 @@
 package com.codecommit.antixml
+package zipper
 
 import scala.annotation.tailrec
-import PathTransformer._
 import PathFetcher._
 
 /** Transforms [[com.codecommit.antixml.ZipperPath]]s with predefined functions.
@@ -13,6 +13,8 @@ import PathFetcher._
  *  @param source The source for the transformed paths.
  */
 private[antixml] case class PathTransformer(source: Group[Node]) {
+  import PathTransformer._
+
   //TODO this whole class is probably quite slow, ZipperPath is not optimized for modifications
 
 

src/main/scala/com/codecommit/antixml/zipper/ZipperAxes.scala

@@ -1,4 +1,6 @@
 package com.codecommit.antixml
+package zipper
+
 import scala.annotation.tailrec
 
 /**

src/main/scala/com/codecommit/antixml/zipper/ZipperGroupOverrides.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import Zipper._
 import CanBuildFromWithZipper.ElemsWithContextVisible

src/main/scala/com/codecommit/antixml/zipper/ZipperHoleMap.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import util.{VectorCase}
 import scala.annotation.tailrec

src/main/scala/com/codecommit/antixml/zipper/ZipperHoleMapper.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import Zipper._
 import ZipperHoleMapper._

src/main/scala/com/codecommit/antixml/zipper/ZipperHoleShifting.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import Zipper._
 import ZipperHoleShifting._

src/main/scala/com/codecommit/antixml/zipper/ZipperMergeContext.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import scala.collection.immutable.IndexedSeq
 

src/main/scala/com/codecommit/antixml/zipper/ZipperMergeStrategy.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import util.VectorCase
 import scala.collection.immutable.IndexedSeq

src/main/scala/com/codecommit/antixml/zipper/ZipperPath.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import scala.collection.{IndexedSeqOptimized,Seq, LinearSeq}
 import scala.collection.generic.CanBuildFrom

src/main/scala/com/codecommit/antixml/ZipperUnselection.scala → src/main/scala/com/codecommit/antixml/zipper/ZipperUnselection.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import Zipper._
 import ZipperHoleMapper._

src/test/scala/com/codecommit/antixml/performance/package.scala

@@ -31,6 +31,8 @@ package com.codecommit.antixml
 import scala.collection.generic.CanBuildFrom
 import scala.collection.mutable.Builder
 
+import zipper._
+
 package object performance {
 
   def simpleNameOf(n: org.w3c.dom.Node) = 

src/test/scala/com/codecommit/antixml/PathCreatorSpecs.scala → src/test/scala/com/codecommit/antixml/zipper/PathCreatorSpecs.scala

@@ -27,10 +27,11 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
-import com.codecommit.antixml.PathCreator._
-import com.codecommit.antixml.Zipper._
+import PathCreator._
+import Zipper._
 import XML._
 import scala.math.Ordering
 

src/test/scala/com/codecommit/antixml/PathFetcherSpecs.scala → src/test/scala/com/codecommit/antixml/zipper/PathFetcherSpecs.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import org.specs2.matcher.DataTables

src/test/scala/com/codecommit/antixml/PathTransformerSpecs.scala → src/test/scala/com/codecommit/antixml/zipper/PathTransformerSpecs.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import org.specs2.matcher.DataTables

src/test/scala/com/codecommit/antixml/zipper/ZipperAxesSpecs.scala

@@ -1,4 +1,5 @@
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import XML._

src/test/scala/com/codecommit/antixml/zipper/ZipperHoleMapSpecs.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import org.specs2.ScalaCheck

src/test/scala/com/codecommit/antixml/zipper/ZipperMergeStrategySpecs.scala

@@ -27,9 +27,10 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
-import com.codecommit.antixml.ZipperMergeStrategy._
+import ZipperMergeStrategy._
 import XML._
 
 class ZipperMergeStrategySpecs extends SpecificationWithJUnit {

src/test/scala/com/codecommit/antixml/zipper/ZipperPathSpecs.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import org.specs2.ScalaCheck

src/test/scala/com/codecommit/antixml/zipper/ZipperSpecs.scala

@@ -27,6 +27,7 @@
  */
 
 package com.codecommit.antixml
+package zipper
 
 import org.specs2.mutable._
 import org.specs2.ScalaCheck