Merge branch 'master' into 2.10.x

Conflicts:
	core/src/main/scala/scalax/io/LongTraversableLike.scala
	core/src/main/scala/scalax/io/traversable/ByteResourceTraversable.scala
	core/src/main/scala/scalax/io/traversable/Sliceable.scala
	project/Build.scala

core/exception-handling.scala

@@ -48,12 +48,12 @@ object ExceptionHandling {
    * is also known so a default value can be provided.
    * </p><p>
    * This pattern can be quite tricky because the internals of how Scala-IO works needs to be known.
-   * For example if providing a default for slurpString then one must know that bytes must be 
-   * returned as the default rather than a string.  
+   * For example if providing a default for slurpString then one must know that bytes must be
+   * returned as the default rather than a string.
    * </p>
    * <p>
    * Also if the scala-io implementation changes the code could break.  Defaults work better when
-   * working with acquireAndGet or acquireFor  
+   * working with acquireAndGet or acquireFor
    * </p>
    */
   def returnDefaultValueOnFailure {
@@ -113,15 +113,15 @@ object ExceptionHandling {
       override def openErrorHandler[A, U](f: A => U, openException: Throwable): Option[U] = {
         f match {
           case f: FunctionWithDefault[_, U] =>
-            // perform logging 
+            // perform logging
             Some(f.defaultValue)
           case _ => super.openErrorHandler(f, openException)
         }
       }
       override def errorHandler[A, U](f: A => U, accessResult: Either[Throwable, U], closingExceptions: List[Throwable]): U = {
         f match {
           case f: FunctionWithDefault[_, U] =>
-            // perform logging 
+            // perform logging
             f.defaultValue
           case _ => super.errorHandler(f, accessResult, closingExceptions)
         }

core/src/main/scala/scalax/io/ByteBlock.scala

@@ -5,14 +5,14 @@ trait ByteBlock {
   def apply(i: Int): Byte
   def size: Int
   def force:ByteBlock = new ByteBlock {
-    val data = self.toSeq 
+    val data = self.toSeq
     override val force = this
     override val toSeq = data
     override val toIterator = data.toIterator
     val size = data.size
     def apply(i:Int) = data(i)
   }
-  
+
   def toSeq = toIterator.foldLeft(Seq[Byte]())((acc,next) => acc :+ next)
   def toIterator = new Iterator[Byte] {
       private[this] val _size = self.size
@@ -21,7 +21,7 @@ trait ByteBlock {
         pos += 1
         self.apply(pos - 1)
       }
-      def hasNext = 
+      def hasNext =
         pos < _size
   }
-}
+}

core/src/main/scala/scalax/io/CloseAction.scala

@@ -73,7 +73,7 @@ trait CloseAction[-A] {
    * @param other an action to ''prepend'' to this action
    * @return an action consisting of first executing ''other'' then ''this''
    */
-	def +:[B <: A](other:CloseAction[B]):CloseAction[B] = other match {
+  def +:[B <: A](other:CloseAction[B]):CloseAction[B] = other match {
     case Noop => this
     case _ => new Prepend(other,this)
   }
@@ -83,7 +83,7 @@ trait CloseAction[-A] {
    * @param other an action to ''append'' to this action
    * @return an action consisting of first executing ''this'' then ''other''
    */
-	def :+[B <: A](other:CloseAction[B]):CloseAction[B] = other match {
+  def :+[B <: A](other:CloseAction[B]):CloseAction[B] = other match {
     case Noop => this
     case _ => new Append(other,this)
   }

core/src/main/scala/scalax/io/CloseableIterator.scala

@@ -187,4 +187,4 @@ private[io] class InitIterator[@specialized(Byte) +A](iter:CloseableIterator[A])
     }
 
     def doClose = iter.close()
-}
+}

core/src/main/scala/scalax/io/Codec.scala

@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar             **
+**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar          **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **

core/src/main/scala/scalax/io/CompositeIterable.scala

@@ -25,4 +25,4 @@ class CompositeIterable[A](builderIterators: Seq[() => Iterator[A]]) {
       }
     }
   }
-}
+}

core/src/main/scala/scalax/io/Input.scala

@@ -36,7 +36,7 @@ import java.io.{InputStream, File}
 trait Input {
   /**
    * Get the Resource context that configures how the underlying resource is accessed
-   * 
+   *
    * @return the associated ResourceContext
    */
   def context:ResourceContext
@@ -54,19 +54,19 @@ trait Input {
   * @return an non-strict traversable over all the bytes
   */
   def bytes : LongTraversable[Byte]
-  
+
   /**
    * Read the input as blocks of bytes.  This method should be avoided unless the maximum performance is
    * absolutely required because bytes provides very good performance and is a better API for most applications.
-   * 
+   *
    * However since it better reflects how data is read with most input sources (like InputStreams and ReadableByteChannels);
    * blocks is slightly more performance than bytes and therefore
    * can be used when performance is the most important consideration.
-   * 
+   *
    * @param blockSize block size can optionally be specified but the default is normally acceptable.
    */
   def blocks(blockSize: Option[Int] = None): LongTraversable[ByteBlock]
-  
+
   /**
   * Obtains a Traversable for conveniently processing the file as Ints.
   *
@@ -134,5 +134,5 @@ trait Input {
    *          The codec representing the desired encoding of the characters
    */
   def slurpString(implicit codec: Codec = Codec.default) = new String(byteArray, codec.name)
-  
+
 }

core/src/main/scala/scalax/io/JavaConverters.scala

@@ -142,7 +142,7 @@ object JavaConverters {
    */
   implicit def asOutputConverter[B](src:B)(implicit converter:AsOutputConverter[B]) =
     new AsOutput(converter.toOutput(src))
-    
+
   /**
    * Used by the [[scalax.io.Output]] object for converting an arbitrary object to an Output Object
    *
@@ -151,13 +151,13 @@ object JavaConverters {
   trait AsOutputConverter[-A] {
     def toOutput(t:A) : Output
   }
-  
+
   /**
    * contains several implementations of [[scalax.io.AsOutputConverter]].  They will be implicitly resolved allowing
    * a user of the library to simple call A.asOutput and the converter will be found without the user needing to look up these classes
    */
   object AsOutputConverter {
-  
+
     /**
      * Converts a File to an Output object
      */
@@ -175,10 +175,10 @@ object JavaConverters {
    * Converts a WritableByteChannel to an Output object
    */
   implicit object WritableByteChannelConverter extends AsOutputConverter[WritableByteChannel]{
-	  def toOutput(chan: WritableByteChannel) = Resource.fromWritableByteChannel(chan)
+    def toOutput(chan: WritableByteChannel) = Resource.fromWritableByteChannel(chan)
   }
 }
-  
+
   class AsBinaryReadChars(op: Codec => ReadChars) {
     /** An object to an ReadChars object */
     def asBinaryReadChars(implicit codec:Codec = Codec.default): ReadChars = op(codec)
@@ -192,7 +192,7 @@ object JavaConverters {
   implicit def asReadCharsConverter[B](src:B)(implicit converter:AsBinaryReadCharsConverter[B]) =
     new AsBinaryReadChars(codec => converter.toReadChars(src,codec))
 
-      
+
   /**
    * Used by the [[scalax.io.ReadChars]] object for converting an arbitrary object to an ReadChars Object
    *
@@ -201,7 +201,7 @@ object JavaConverters {
   trait AsBinaryReadCharsConverter[-A] {
     def toReadChars(t:A,codec:Codec) : ReadChars
   }
-  
+
   /**
    * contains several implementations of [[scalax.io.AsReadCharsConverterFromBinary]].  They will be implicitly resolved allowing
    * a user of the library to simple call A.asBinaryReadChars and the converter will be found without the user needing to look up these classes
@@ -297,7 +297,7 @@ object JavaConverters {
   implicit def asSeekableConverter[B](src:B)(implicit converter:AsSeekableConverter[B]) =
     new AsSeekable(converter.toSeekable(src))
 
-    
+
   /**
    * Used by the [[scalax.io.Seekable]] object for converting an arbitrary object to an Seekable Object
    *
@@ -306,13 +306,13 @@ object JavaConverters {
   trait AsSeekableConverter[-A] {
     def toSeekable(t:A) : Seekable
   }
-  
+
   /**
    * contains several implementations of [[scalax.io.AsSeekableConverter]].  They will be implicitly resolved allowing
    * a user of the library to simple call A.asSeekable and the converter will be found without the user needing to look up these classes
    */
   object AsSeekableConverter {
-  
+
     /**
      * Converts a File to an Seekable object
      */
@@ -351,7 +351,7 @@ object JavaConverters {
    */
   implicit def asWriteCharsConverter[B](src:B)(implicit converter:AsBinaryWriteCharsConverter[B]) =
     new AsBinaryWriteChars(codec => converter.toWriteChars(src,codec))
-    
+
   /**
    * Used by the [[scalax.io.WriteChars]] object for converting an arbitrary object to an WriteChars Object
    *
@@ -360,13 +360,13 @@ object JavaConverters {
   trait AsBinaryWriteCharsConverter[-A] {
     def toWriteChars(t:A,codec:Codec) : WriteChars
   }
-  
+
   /**
    * contains several implementations of [[scalax.io.AsWriteCharsConverter]].  They will be implicitly resolved allowing
    * a user of the library to simple call A.asWriteChars and the converter will be found without the user needing to look up these classes
    */
   object AsBinaryWriteCharsConverter {
-  
+
     /**
      * Converts a File to an WriteChars object
      */
@@ -573,7 +573,7 @@ object JavaConverters {
       def toUnmanagedReadChars(reader: Reader) = new unmanaged.ReaderResource(reader)
     }
   }
-  
+
   class AsUnmanagedBinaryWriteChars(op: (Codec) => WriteChars) {
     /** An object to an WriteChars object */
     def asUnmanagedBinaryWriteChars(implicit codec:Codec = Codec.default): WriteChars = op(codec)
@@ -644,4 +644,4 @@ object JavaConverters {
       def toUnmanagedWriteChars(writer: Writer) = new unmanaged.WriterResource(writer)
     }
   }
-}
+}

core/src/main/scala/scalax/io/Line.scala

@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar             **
+**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar          **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -25,7 +25,7 @@ object Line {
      * It can detect N,R and RN line terminators
      */
     case object Auto extends Terminator
-    
+
     abstract class SimpleTerminator(val sep:String) extends Terminator
     /*
      * The \n line terminator

core/src/main/scala/scalax/io/LineTraversable.scala

@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar             **
+**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar          **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -24,13 +24,13 @@ class LineTraversable(source: => CloseableIterator[Char], terminator: Terminator
   def context = resourceContext
   protected[io] def iterator = terminator match {
     case Auto => new AutoCharIter(source,includeTerminator)
-    case t:SimpleTerminator if t.sep.size == 1 => new SingleCharIter(source, t.sep.head, includeTerminator) 
-    case t:SimpleTerminator => new MultiCharIter(source, t.sep, includeTerminator) 
+    case t:SimpleTerminator if t.sep.size == 1 => new SingleCharIter(source, t.sep.head, includeTerminator)
+    case t:SimpleTerminator => new MultiCharIter(source, t.sep, includeTerminator)
   }
 }
 
-private[io] class SingleCharIter(private[this] val sourceIter: CloseableIterator[Char], 
-                                 private[this] val term:Char, 
+private[io] class SingleCharIter(private[this] val sourceIter: CloseableIterator[Char],
+                                 private[this] val term:Char,
                                  private[this] val includeTerm:Boolean) extends CloseableIterator[String] {
   private[this] val sb = new StringBuilder
 
@@ -50,12 +50,12 @@ private[io] class SingleCharIter(private[this] val sourceIter: CloseableIterator
     if(includeTerm) sb append term
     sb.toString
   }
-  
+
   def doClose = sourceIter.close()
 }
 
-private[io] class MultiCharIter(private[this] val sourceIter: CloseableIterator[Char], 
-                                private[this] val term:String, 
+private[io] class MultiCharIter(private[this] val sourceIter: CloseableIterator[Char],
+                                private[this] val term:String,
                                 private[this] val includeTerm:Boolean) extends CloseableIterator[String] {
   private[this] val sb = new StringBuilder
 
@@ -79,12 +79,12 @@ private[io] class MultiCharIter(private[this] val sourceIter: CloseableIterator[
   def doClose = sourceIter.close()
 }
 
-private[io] class AutoCharIter(private[this] val sourceIter: CloseableIterator[Char], 
+private[io] class AutoCharIter(private[this] val sourceIter: CloseableIterator[Char],
                                private[this] val includeTerm:Boolean) extends CloseableIterator[String] {
 
   private[this] val sb = new StringBuilder
-  private[this] val iter = new CharBufferedIterator(sourceIter) 
-  
+  private[this] val iter = new CharBufferedIterator(sourceIter)
+
   @inline
   private[this] final def getc() = {
     if(iter.hasNext) {
@@ -95,7 +95,7 @@ private[io] class AutoCharIter(private[this] val sourceIter: CloseableIterator[C
             iter.next
             "\r\n"
           } else {
-            "\r"        
+            "\r"
           }
         }
         else {
@@ -139,4 +139,4 @@ private class CharBufferedIterator(private[this] val sourceIter: CloseableIterat
       hdDefined = false
       hd
     } else sourceIter.next()
-}
+}

core/src/main/scala/scalax/io/LongTraversable.scala

@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar             **
+**    / __/ __// _ | / /  / _ |    (c) 2009-2010, Jesse Eichar          **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **