From 158e6e610604c5a48177c94a1d74f16ac49730ab Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 20 Sep 2011 17:15:33 +0000 Subject: fixed svn props and scaladoc tags, did some cle... fixed svn props and scaladoc tags, did some cleanup --- .../scala/collection/generic/CanCombineFrom.scala | 20 ++++++----------- .../generic/ClassManifestTraversableFactory.scala | 12 ++++++++++- .../scala/collection/generic/GenMapFactory.scala | 2 -- .../GenericClassManifestTraversableTemplate.scala | 3 ++- .../generic/GenericOrderedCompanion.scala | 9 ++------ .../collection/generic/GenericParCompanion.scala | 4 +--- .../collection/generic/GenericParTemplate.scala | 17 ++------------- .../collection/generic/GenericSetTemplate.scala | 2 -- .../scala/collection/generic/HasNewCombiner.scala | 24 ++++----------------- .../scala/collection/generic/ParFactory.scala | 25 +++++++--------------- .../scala/collection/generic/ParMapFactory.scala | 7 ++++-- .../scala/collection/generic/ParSetFactory.scala | 19 +++++----------- src/library/scala/collection/generic/Sizing.scala | 8 +++++++ .../scala/collection/mutable/UnrolledBuffer.scala | 2 -- 14 files changed, 55 insertions(+), 99 deletions(-) (limited to 'src/library') diff --git a/src/library/scala/collection/generic/CanCombineFrom.scala b/src/library/scala/collection/generic/CanCombineFrom.scala index ad2381a571..676036cf90 100644 --- a/src/library/scala/collection/generic/CanCombineFrom.scala +++ b/src/library/scala/collection/generic/CanCombineFrom.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -11,22 +11,16 @@ package generic import scala.collection.parallel._ -/** - * A base trait for parallel builder factories. +/** A base trait for parallel builder factories. * - * @tparam From the type of the underlying collection that requests a builder to be created - * @tparam Elem the element type of the collection to be created - * @tparam To the type of the collection to be created + * @tparam From the type of the underlying collection that requests a + * builder to be created. + * @tparam Elem the element type of the collection to be created. + * @tparam To the type of the collection to be created. + * @since 2.8 */ trait CanCombineFrom[-From, -Elem, +To] extends CanBuildFrom[From, Elem, To] with Parallel { def apply(from: From): Combiner[Elem, To] def apply(): Combiner[Elem, To] } - - - - - - - diff --git a/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala b/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala index 82270d5728..e54ce9cdbf 100644 --- a/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala +++ b/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2006-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -9,6 +9,16 @@ package scala.collection package generic +/** A template for companion objects of `ClassManifestTraversable` and + * subclasses thereof. + * + * @define coll collection + * @define Coll Traversable + * @define genericCanBuildFromInfo + * The standard `CanBuildFrom` instance for $Coll objects. + * @author Aleksandar Prokopec + * @since 2.8 + */ abstract class ClassManifestTraversableFactory[CC[X] <: Traversable[X] with GenericClassManifestTraversableTemplate[X, CC]] extends GenericClassManifestCompanion[CC] { diff --git a/src/library/scala/collection/generic/GenMapFactory.scala b/src/library/scala/collection/generic/GenMapFactory.scala index f3537e8c6b..d6f6978ead 100644 --- a/src/library/scala/collection/generic/GenMapFactory.scala +++ b/src/library/scala/collection/generic/GenMapFactory.scala @@ -9,10 +9,8 @@ package scala.collection package generic - import mutable.{Builder, MapBuilder} - /** A template for companion objects of `Map` and subclasses thereof. * * @define coll map diff --git a/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala b/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala index 03d426946b..12b5a495f0 100644 --- a/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala +++ b/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -16,6 +16,7 @@ import annotation.unchecked.uncheckedVariance * manifests for their element types. * * @author Aleksandar Prokopec + * @since 2.8 */ trait GenericClassManifestTraversableTemplate[+A, +CC[X] <: Traversable[X]] extends HasNewBuilder[A, CC[A] @uncheckedVariance] { implicit protected[this] val manifest: ClassManifest[A] diff --git a/src/library/scala/collection/generic/GenericOrderedCompanion.scala b/src/library/scala/collection/generic/GenericOrderedCompanion.scala index c0656dd01a..c3baa28147 100644 --- a/src/library/scala/collection/generic/GenericOrderedCompanion.scala +++ b/src/library/scala/collection/generic/GenericOrderedCompanion.scala @@ -1,26 +1,21 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ - - package scala.collection package generic import mutable.Builder - - - - /** This class represents companions of classes which require the ordered trait * for their element types. * * @author Aleksandar Prokopec + * @since 2.8 */ abstract class GenericOrderedCompanion[+CC[X] <: Traversable[X]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/GenericParCompanion.scala b/src/library/scala/collection/generic/GenericParCompanion.scala index 783a4878f6..40fcfa31d0 100644 --- a/src/library/scala/collection/generic/GenericParCompanion.scala +++ b/src/library/scala/collection/generic/GenericParCompanion.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -33,5 +33,3 @@ trait GenericParMapCompanion[+CC[P, Q] <: ParMap[P, Q]] { def newCombiner[P, Q]: Combiner[(P, Q), CC[P, Q]] } - - diff --git a/src/library/scala/collection/generic/GenericParTemplate.scala b/src/library/scala/collection/generic/GenericParTemplate.scala index 1e3f7b5e40..430dcb9e29 100644 --- a/src/library/scala/collection/generic/GenericParTemplate.scala +++ b/src/library/scala/collection/generic/GenericParTemplate.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,27 +8,19 @@ package scala.collection.generic - - import scala.collection.parallel.Combiner import scala.collection.parallel.ParIterable import scala.collection.parallel.ParMap import scala.collection.parallel.TaskSupport - import annotation.unchecked.uncheckedVariance - - - - - /** A template trait for collections having a companion. * * @tparam A the element type of the collection * @tparam CC the type constructor representing the collection class + * @author Aleksandar Prokopec * @since 2.8 - * @author prokopec */ trait GenericParTemplate[+A, +CC[X] <: ParIterable[X]] extends GenericTraversableTemplate[A, CC] @@ -68,8 +60,3 @@ trait GenericParMapTemplate[K, +V, +CC[X, Y] <: ParMap[X, Y]] extends GenericPar } } - - - - - diff --git a/src/library/scala/collection/generic/GenericSetTemplate.scala b/src/library/scala/collection/generic/GenericSetTemplate.scala index 9e1a04179b..6af6a36981 100644 --- a/src/library/scala/collection/generic/GenericSetTemplate.scala +++ b/src/library/scala/collection/generic/GenericSetTemplate.scala @@ -6,8 +6,6 @@ ** |/ ** \* */ - - package scala.collection package generic diff --git a/src/library/scala/collection/generic/HasNewCombiner.scala b/src/library/scala/collection/generic/HasNewCombiner.scala index cc69faa270..a7a9ab9204 100644 --- a/src/library/scala/collection/generic/HasNewCombiner.scala +++ b/src/library/scala/collection/generic/HasNewCombiner.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,28 +8,12 @@ package scala.collection.generic - - import scala.collection.parallel.Combiner - - +/** + * @since 2.8 + */ trait HasNewCombiner[+T, +Repr] { protected[this] def newCombiner: Combiner[T, Repr] } - - - - - - - - - - - - - - - diff --git a/src/library/scala/collection/generic/ParFactory.scala b/src/library/scala/collection/generic/ParFactory.scala index 637a1dca6a..558024d45c 100644 --- a/src/library/scala/collection/generic/ParFactory.scala +++ b/src/library/scala/collection/generic/ParFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,17 +8,16 @@ package scala.collection.generic - import scala.collection.parallel.ParIterable import scala.collection.parallel.Combiner - - -/** A template class for companion objects of `ParIterable` and subclasses thereof. - * This class extends `TraversableFactory` and provides a set of operations to create `$Coll` objects. +/** A template class for companion objects of `ParIterable` and subclasses + * thereof. This class extends `TraversableFactory` and provides a set of + * operations to create `$Coll` objects. * * @define coll parallel collection * @define Coll ParIterable + * @since 2.8 */ abstract class ParFactory[CC[X] <: ParIterable[X] with GenericParTemplate[X, CC]] extends GenTraversableFactory[CC] @@ -26,10 +25,9 @@ extends GenTraversableFactory[CC] //type EPC[T, C] = collection.parallel.EnvironmentPassingCombiner[T, C] - /** - * A generic implementation of the `CanCombineFrom` trait, which forwards all calls to - * `apply(from)` to the `genericParBuilder` method of the $coll `from`, and calls to `apply()` - * to this factory. + /** A generic implementation of the `CanCombineFrom` trait, which forwards + * all calls to `apply(from)` to the `genericParBuilder` method of the $coll + * `from`, and calls to `apply()` to this factory. */ class GenericCanCombineFrom[A] extends GenericCanBuildFrom[A] with CanCombineFrom[CC[_], A, CC[A]] { override def apply(from: Coll) = from.genericCombiner @@ -41,10 +39,3 @@ extends GenTraversableFactory[CC] - - - - - - - diff --git a/src/library/scala/collection/generic/ParMapFactory.scala b/src/library/scala/collection/generic/ParMapFactory.scala index 06105c9756..2d89f79c13 100644 --- a/src/library/scala/collection/generic/ParMapFactory.scala +++ b/src/library/scala/collection/generic/ParMapFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -14,10 +14,13 @@ import scala.collection.parallel.Combiner import scala.collection.mutable.Builder /** A template class for companion objects of `ParMap` and subclasses thereof. - * This class extends `TraversableFactory` and provides a set of operations to create `$Coll` objects. + * This class extends `TraversableFactory` and provides a set of operations + * to create `$Coll` objects. * * @define coll parallel map * @define Coll ParMap + * @author Aleksandar Prokopec + * @since 2.8 */ abstract class ParMapFactory[CC[X, Y] <: ParMap[X, Y] with ParMapLike[X, Y, CC[X, Y], _]] extends GenMapFactory[CC] diff --git a/src/library/scala/collection/generic/ParSetFactory.scala b/src/library/scala/collection/generic/ParSetFactory.scala index 221e893593..c2cf971d73 100644 --- a/src/library/scala/collection/generic/ParSetFactory.scala +++ b/src/library/scala/collection/generic/ParSetFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,20 +8,15 @@ package scala.collection.generic - - - - import collection.mutable.Builder import collection.parallel.Combiner import collection.parallel.ParSet import collection.parallel.ParSetLike - - - - - +/** + * @author Aleksandar Prokopec + * @since 2.8 + */ abstract class ParSetFactory[CC[X] <: ParSet[X] with ParSetLike[X, CC[X], _] with GenericParTemplate[X, CC]] extends GenSetFactory[CC] with GenericParCompanion[CC] @@ -36,7 +31,3 @@ abstract class ParSetFactory[CC[X] <: ParSet[X] with ParSetLike[X, CC[X], _] wit } } - - - - diff --git a/src/library/scala/collection/generic/Sizing.scala b/src/library/scala/collection/generic/Sizing.scala index 17181dc9dd..f0a90a6466 100644 --- a/src/library/scala/collection/generic/Sizing.scala +++ b/src/library/scala/collection/generic/Sizing.scala @@ -1,3 +1,11 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + package scala.collection.generic /** A trait for objects which have a size. diff --git a/src/library/scala/collection/mutable/UnrolledBuffer.scala b/src/library/scala/collection/mutable/UnrolledBuffer.scala index 442d50c6ea..d4185b736d 100644 --- a/src/library/scala/collection/mutable/UnrolledBuffer.scala +++ b/src/library/scala/collection/mutable/UnrolledBuffer.scala @@ -6,8 +6,6 @@ ** |/ ** \* */ - - package scala.collection.mutable import collection.Iterator -- cgit v1.2.3