8 files changed, 26 insertions, 42 deletions
diff --git a/src/library/scala/collection/generic/CanBuildFromParallel.scala b/src/library/scala/collection/generic/CanCombineFrom.scala
index fcbcd6295e..b56dab9794 100644
--- a/src/library/scala/collection/generic/CanBuildFromParallel.scala
+++ b/src/library/scala/collection/generic/CanCombineFrom.scala
@@ -1,13 +1,8 @@
 package scala.collection
 package generic
 
-
-
 import scala.collection.parallel._
 
-
-
-
 /**
  * A base trait for parallel builder factories.
  *
diff --git a/src/library/scala/collection/generic/ParallelFactory.scala b/src/library/scala/collection/generic/ParallelFactory.scala
index 0b9e92aa10..fd33631640 100644
--- a/src/library/scala/collection/generic/ParallelFactory.scala
+++ b/src/library/scala/collection/generic/ParallelFactory.scala
@@ -19,7 +19,7 @@ extends TraversableFactory[CC]
   type EPC[T, C] = collection.parallel.EnvironmentPassingCombiner[T, C]
 
   /**
-   * A generic implementation of the `CanBuildFromParallel` trait, which forwards all calls to
+   * A generic implementation of the `CanCombineFrom` trait, which forwards all calls to
    * `apply(from)` to the `genericParallelBuilder` method of the $coll `from`, and calls to `apply()`
    * to this factory.
    */
diff --git a/src/library/scala/collection/parallel/Combiners.scala b/src/library/scala/collection/parallel/Combiner.scala
index a37f642d42..a37f642d42 100644
--- a/src/library/scala/collection/parallel/Combiners.scala
+++ b/src/library/scala/collection/parallel/Combiner.scala
diff --git a/src/library/scala/collection/parallel/Iterators.scala b/src/library/scala/collection/parallel/RemainsIterator.scala
index bfebff994c..6ed6d235d2 100644
--- a/src/library/scala/collection/parallel/Iterators.scala
+++ b/src/library/scala/collection/parallel/RemainsIterator.scala
@@ -9,11 +9,6 @@ import scala.collection.generic.CanCombineFrom
 import scala.collection.mutable.Builder
 import scala.collection.Iterator.empty
 
-
-
-
-
-
 trait RemainsIterator[+T] extends Iterator[T] {
   /** The number of elements this iterator has yet to iterate.
    *  This method doesn't change the state of the iterator.
diff --git a/src/library/scala/collection/parallel/Splitters.scala b/src/library/scala/collection/parallel/Splitter.scala
index b3cad6d67a..b3cad6d67a 100644
--- a/src/library/scala/collection/parallel/Splitters.scala
+++ b/src/library/scala/collection/parallel/Splitter.scala
diff --git a/src/library/scala/collection/parallel/immutable/ParallelIterable.scala b/src/library/scala/collection/parallel/immutable/ParallelIterable.scala.disabled
index 92bf5ab706..25a3217258 100644
--- a/src/library/scala/collection/parallel/immutable/ParallelIterable.scala
+++ b/src/library/scala/collection/parallel/immutable/ParallelIterable.scala.disabled
@@ -7,19 +7,16 @@ import scala.collection.parallel.ParallelIterableLike
 import scala.collection.parallel.Combiner
 
 
-
-
-
 // TODO uncomment when we add parallel vectors
 
 ///** A template trait for immutable parallel iterable collections.
-// *
+// *  
 // *  $paralleliterableinfo
-// *
+// *  
 // *  $sideeffects
-// *
+// *  
 // *  @tparam A    the element type of the collection
-// *
+// *  
 // *  @author prokopec
 // *  @since 2.8
 // */
@@ -35,9 +32,9 @@ import scala.collection.parallel.Combiner
 //object ParallelIterable extends ParallelFactory[ParallelIterable] {
 //  implicit def canBuildFrom[A]: CanBuildFromParallel[Coll, A, ParallelIterable[A]] =
 //    new GenericCanBuildFromParallel[A]
-//
+//  
 //  def newBuilder[A]: Combiner[A, ParallelIterable[A]] = null // TODO
-//
+//    
 //  def newCombiner[A]: Combiner[A, ParallelIterable[A]] = null // TODO
 //}
 
diff --git a/src/library/scala/collection/parallel/immutable/ParallelSeq.scala b/src/library/scala/collection/parallel/immutable/ParallelSeq.scala.disabled
index ceb0dcc13d..ddae095f0d 100644
--- a/src/library/scala/collection/parallel/immutable/ParallelSeq.scala
+++ b/src/library/scala/collection/parallel/immutable/ParallelSeq.scala.disabled
@@ -11,13 +11,10 @@ import scala.collection.parallel.Combiner
 
 
 
-
-
-
 // TODO uncomment when we add parallel vectors
 
 ///** An immutable variant of `ParallelSeq`.
-// *
+// *  
 // *  @define Coll mutable.ParallelSeq
 // *  @define coll mutable parallel sequence
 // */
@@ -27,7 +24,7 @@ import scala.collection.parallel.Combiner
 //                        with GenericParallelTemplate[A, ParallelSeq]
 //                        with ParallelSeqLike[A, ParallelSeq[A], Seq[A]] {
 //  override def companion: GenericCompanion[ParallelSeq] with GenericParallelCompanion[ParallelSeq] = ParallelSeq
-//
+//  
 //}
 //
 //
@@ -37,9 +34,9 @@ import scala.collection.parallel.Combiner
 // */
 //object ParallelSeq extends ParallelFactory[ParallelSeq] {
 //  implicit def canBuildFrom[T]: CanBuildFromParallel[Coll, T, ParallelSeq[T]] = new GenericCanBuildFromParallel[T]
-//
+//  
 //  def newBuilder[A]: Combiner[A, ParallelSeq[A]] = null // TODO
-//
+//  
 //  def newCombiner[A]: Combiner[A, ParallelSeq[A]] = null // TODO
 //}
 
diff --git a/src/swing/scala/swing/Font.scala b/src/swing/scala/swing/Font.scala.disabled
index a58c8967d7..6eebd667bd 100644
--- a/src/swing/scala/swing/Font.scala
+++ b/src/swing/scala/swing/Font.scala.disabled
@@ -1,36 +1,36 @@
 package scala.swing
 
-/*object Font {
-  def apply(fontFormat: Int, fontFile: java.io.File) = java.awt.Font.createFont(fontFormat, fontFile)
-  def apply(fontFormat: Int, fontStream: java.io.InputStream) = java.awt.Font.createFont(fontFormat, fontStream)
+/*object Font {  
+  def apply(fontFormat: Int, fontFile: java.io.File) = java.awt.Font.createFont(fontFormat, fontFile) 
+  def apply(fontFormat: Int, fontStream: java.io.InputStream) = java.awt.Font.createFont(fontFormat, fontStream) 
   def decode(str: String) = java.awt.Font.decode(str)
-
+  
   /* TODO: finish implementation
   /**
    * See [java.awt.Font.getFont].
    */
-  def get(attributes: Map[_ <: java.text.AttributedCharacterIterator.Attribute, _]) =
+  def get(attributes: Map[_ <: java.text.AttributedCharacterIterator.Attribute, _]) = 
     java.awt.Font.getFont(ImmutableMapWrapper(attributes))
-
+    
   import java.{util => ju}
   private case class ImmutableMapWrapper[A, B](underlying : Map[A, B])(m : ClassManifest[A]) extends ju.AbstractMap[A, B] {
     self =>
     override def size = underlying.size
 
-    override def put(k : A, v : B) =
+    override def put(k : A, v : B) = 
       throw new UnsupportedOperationException("This is a wrapper that does not support mutation")
-    override def remove(k : AnyRef) =
+    override def remove(k : AnyRef) = 
       throw new UnsupportedOperationException("This is a wrapper that does not support mutation")
-
+    
     override def entrySet : ju.Set[ju.Map.Entry[A, B]] = new ju.AbstractSet[ju.Map.Entry[A, B]] {
       def size = self.size
 
       def iterator = new ju.Iterator[ju.Map.Entry[A, B]] {
         val ui = underlying.iterator
         var prev : Option[A] = None
-
+        
         def hasNext = ui.hasNext
-
+      
         def next = {
           val (k, v) = ui.next
           prev = Some(k)
@@ -44,7 +44,7 @@ package scala.swing
             }
           }
         }
-
+        
         def remove = prev match {
           case Some(k) => val v = self.remove(k.asInstanceOf[AnyRef]) ; prev = None ; v
           case _ => throw new IllegalStateException("next must be called at least once before remove")
@@ -53,7 +53,7 @@ package scala.swing
     }
   }
   */
-
+  
   /**
    * See [java.awt.Font.getFont].
    */
@@ -62,9 +62,9 @@ package scala.swing
    * See [java.awt.Font.getFont].
    */
   def get(nm: String, font: Font) = java.awt.Font.getFont(nm, font)
-
+  
   def Insets(x: Int, y: Int, width: Int, height: Int) = new Insets(x, y, width, height)
   def Rectangle(x: Int, y: Int, width: Int, height: Int) = new Insets(x, y, width, height)
   def Point(x: Int, y: Int) = new Point(x, y)
-  def Dimension(x: Int, y: Int) = new Dimension(x, y)
+  def Dimension(x: Int, y: Int) = new Dimension(x, y) 
 }*/
 \ No newline at end of file