diff options
author | stepancheg <stepancheg@epfl.ch> | 2009-09-26 15:19:40 +0000 |
---|---|---|
committer | stepancheg <stepancheg@epfl.ch> | 2009-09-26 15:19:40 +0000 |
commit | cecae470906a19a0ad405940dd48e62fcbbdab49 (patch) | |
tree | dd605b6e5ea23142daaa496101e8775ae0fbfb89 /src | |
parent | 2a5664146d7fa932c09ae6ac035748ada269e54e (diff) | |
download | scala-cecae470906a19a0ad405940dd48e62fcbbdab49.tar.gz scala-cecae470906a19a0ad405940dd48e62fcbbdab49.tar.bz2 scala-cecae470906a19a0ad405940dd48e62fcbbdab49.zip |
more @since annotations
Diffstat (limited to 'src')
70 files changed, 129 insertions, 2 deletions
diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala index 0a3eefde9d..1f7e2d4e86 100644 --- a/src/library/scala/collection/BitSet.scala +++ b/src/library/scala/collection/BitSet.scala @@ -14,13 +14,18 @@ package scala.collection import generic._ /** common base class for mutable and immutable bit sets + * + * @since 1 */ trait BitSet extends Set[Int] with BitSetLike[BitSet] { override def empty: BitSet = BitSet.empty } -/** A factory object for bitsets */ +/** A factory object for bitsets + * + * @since 2.8 + */ object BitSet extends BitSetFactory[BitSet] { val empty: BitSet = immutable.BitSet.empty } diff --git a/src/library/scala/collection/BitSetLike.scala b/src/library/scala/collection/BitSetLike.scala index bc6fddbfea..bcd36cfd3d 100644 --- a/src/library/scala/collection/BitSetLike.scala +++ b/src/library/scala/collection/BitSetLike.scala @@ -15,6 +15,8 @@ import BitSetLike._ import generic._ /** common base class for mutable and immutable bit sets + * + * @since 2.8 */ trait BitSetLike[+This <: BitSetLike[This] with Set[Int]] extends SetLike[Int, This] { self => diff --git a/src/library/scala/collection/BufferedIterator.scala b/src/library/scala/collection/BufferedIterator.scala index 9dfca14866..76e426d9b4 100644 --- a/src/library/scala/collection/BufferedIterator.scala +++ b/src/library/scala/collection/BufferedIterator.scala @@ -16,6 +16,7 @@ package scala.collection * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait BufferedIterator[+A] extends Iterator[A] { diff --git a/src/library/scala/collection/DefaultMap.scala b/src/library/scala/collection/DefaultMap.scala index 4ca99b8613..87ae659a3b 100644 --- a/src/library/scala/collection/DefaultMap.scala +++ b/src/library/scala/collection/DefaultMap.scala @@ -28,6 +28,8 @@ import generic._ * It might also be advisable to override <code>foreach</code> or * <code>size</code> if efficient implementations can be found. * </p> + * + * @since 2.8 */ trait DefaultMap[A, +B] extends Map[A, B] { self => diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index 9998e626ee..6fbf980c19 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -40,6 +40,7 @@ import mutable.Builder * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait Iterable[+A] extends Traversable[A] with GenericTraversableTemplate[A, Iterable] diff --git a/src/library/scala/collection/IterableLike.scala b/src/library/scala/collection/IterableLike.scala index e0431c9868..7a00d7933e 100644 --- a/src/library/scala/collection/IterableLike.scala +++ b/src/library/scala/collection/IterableLike.scala @@ -39,6 +39,7 @@ import annotation.unchecked.uncheckedVariance * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableLike[+A, +Repr] extends Equals with TraversableLike[A, Repr] { self => diff --git a/src/library/scala/collection/IterableProxy.scala b/src/library/scala/collection/IterableProxy.scala index 8d4289b467..dce5d8dd2d 100644 --- a/src/library/scala/collection/IterableProxy.scala +++ b/src/library/scala/collection/IterableProxy.scala @@ -20,5 +20,6 @@ import generic._ * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableProxy[+A] extends Iterable[A] with IterableProxyLike[A, Iterable[A]] diff --git a/src/library/scala/collection/IterableProxyLike.scala b/src/library/scala/collection/IterableProxyLike.scala index 79ed050a8a..e19c168eb5 100644 --- a/src/library/scala/collection/IterableProxyLike.scala +++ b/src/library/scala/collection/IterableProxyLike.scala @@ -22,6 +22,7 @@ import mutable.Buffer * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableProxyLike[+A, +This <: IterableLike[A, This] with Iterable[A]] extends IterableLike[A, This] diff --git a/src/library/scala/collection/IterableView.scala b/src/library/scala/collection/IterableView.scala index ade1f294ca..b9c208fde3 100644 --- a/src/library/scala/collection/IterableView.scala +++ b/src/library/scala/collection/IterableView.scala @@ -18,6 +18,7 @@ import TraversableView.NoBuilder * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableView[+A, +Coll] extends IterableViewLike[A, Coll, IterableView[A, Coll]] diff --git a/src/library/scala/collection/IterableViewLike.scala b/src/library/scala/collection/IterableViewLike.scala index f76f55d1a6..5164cf62f1 100644 --- a/src/library/scala/collection/IterableViewLike.scala +++ b/src/library/scala/collection/IterableViewLike.scala @@ -18,6 +18,7 @@ import TraversableView.NoBuilder * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableViewLike[+A, +Coll, diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala index 9b1e56ba23..5b6d13d152 100644 --- a/src/library/scala/collection/Iterator.scala +++ b/src/library/scala/collection/Iterator.scala @@ -21,6 +21,7 @@ import annotation.{ tailrec, experimental } * @author Martin Odersky * @author Matthias Zenger * @version 2.8 + * @since 2.8 */ object Iterator { @@ -269,6 +270,7 @@ import Iterator.empty * * @author Martin Odersky, Matthias Zenger * @version 2.8 + * @since 2.8 */ trait Iterator[+A] { self => diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala index a3c5574a5b..dbac5a564c 100644 --- a/src/library/scala/collection/JavaConversions.scala +++ b/src/library/scala/collection/JavaConversions.scala @@ -49,6 +49,7 @@ package scala.collection * </p> * * @author Miles Sabin + * @since 2.8 */ object JavaConversions { import java.{ lang => jl, util => ju } diff --git a/src/library/scala/collection/LinearSequence.scala b/src/library/scala/collection/LinearSequence.scala index aa3910887d..fbd85ed544 100644 --- a/src/library/scala/collection/LinearSequence.scala +++ b/src/library/scala/collection/LinearSequence.scala @@ -26,6 +26,7 @@ import mutable.Builder * @author Martin Odersky * @author Matthias Zenger * @version 1.0, 16/07/2003 + * @since 2.8 */ trait LinearSequence[+A] extends Sequence[A] with GenericTraversableTemplate[A, LinearSequence] @@ -33,6 +34,9 @@ trait LinearSequence[+A] extends Sequence[A] override def companion: GenericCompanion[LinearSequence] = LinearSequence } +/** + * @since 2.8 + */ object LinearSequence extends SequenceFactory[LinearSequence] { implicit def builderFactory[A]: BuilderFactory[A, LinearSequence[A], Coll] = new VirtualBuilderFactory[A] def newBuilder[A]: Builder[A, LinearSequence[A]] = immutable.LinearSequence.newBuilder[A] diff --git a/src/library/scala/collection/LinearSequenceLike.scala b/src/library/scala/collection/LinearSequenceLike.scala index bbb8d2100e..131ce2624b 100644 --- a/src/library/scala/collection/LinearSequenceLike.scala +++ b/src/library/scala/collection/LinearSequenceLike.scala @@ -24,6 +24,7 @@ import scala.util.control.Breaks._ * @author Martin Odersky * @author Matthias Zenger * @version 1.0, 16/07/2003 + * @since 2.8 */ trait LinearSequenceLike[+A, +Repr <: LinearSequenceLike[A, Repr]] extends SequenceLike[A, Repr] { self: Repr => diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala index 309c529f6f..3da7a3fcac 100644 --- a/src/library/scala/collection/Map.scala +++ b/src/library/scala/collection/Map.scala @@ -37,12 +37,17 @@ import generic._ * * @note Of you additions and mutations return the same kind of map as the map * you are defining, you should inherit from <code>MapLike</code> as well. + * + * @since 1 */ trait Map[A, +B] extends Iterable[(A, B)] with MapLike[A, B, Map[A, B]] { def empty: Map[A, B] = Map.empty } -/* Factory object for `Map` class */ +/* Factory object for `Map` class + * + * @since 2.5 + */ object Map extends ImmutableMapFactory[immutable.Map] { def empty[A, B]: immutable.Map[A, B] = immutable.Map.empty implicit def builderFactory[A, B]: BuilderFactory[(A, B), Map[A, B], Coll] = new MapBuilderFactory[A, B] diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala index 82a70e0979..adf5dec6e0 100644 --- a/src/library/scala/collection/MapLike.scala +++ b/src/library/scala/collection/MapLike.scala @@ -39,6 +39,7 @@ import PartialFunction._ * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait MapLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]] extends PartialFunction[A, B] diff --git a/src/library/scala/collection/MapProxy.scala b/src/library/scala/collection/MapProxy.scala index e500646430..336613ac4d 100644 --- a/src/library/scala/collection/MapProxy.scala +++ b/src/library/scala/collection/MapProxy.scala @@ -18,5 +18,6 @@ package scala.collection * * @author Matthias Zenger * @version 1.0, 21/07/2003 + * @since 1 */ trait MapProxy[A, +B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala index 7a9b98bd97..699a876f15 100644 --- a/src/library/scala/collection/MapProxyLike.scala +++ b/src/library/scala/collection/MapProxyLike.scala @@ -17,6 +17,7 @@ import generic._ * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]] extends MapLike[A, B, This] diff --git a/src/library/scala/collection/RollbackIterator.scala.disabled b/src/library/scala/collection/RollbackIterator.scala.disabled index 2dc011deee..99573ab307 100644 --- a/src/library/scala/collection/RollbackIterator.scala.disabled +++ b/src/library/scala/collection/RollbackIterator.scala.disabled @@ -15,6 +15,7 @@ import scala.collection.mutable.{ArrayBuffer} /** Rollback iterators are buffered iterators which allow for unbounded rollbacks * * @author Sean McDirmid + * @since 2.5 */ class RollbackIterator[+A](underlying: Iterator[A]) extends BufferedIterator.Default[A] { private[this] var rollback: ArrayBuffer[A] = null diff --git a/src/library/scala/collection/SequenceLike.scala b/src/library/scala/collection/SequenceLike.scala index 5f3979bde1..20f0c20f57 100644 --- a/src/library/scala/collection/SequenceLike.scala +++ b/src/library/scala/collection/SequenceLike.scala @@ -19,6 +19,7 @@ import generic._ /** Contains a KMP implementation, based on the undoubtedly reliable wikipedia entry. * * @author paulp + * @since 2.8 */ object SequenceLike { @@ -105,6 +106,7 @@ object SequenceLike { * @author Martin Odersky * @author Matthias Zenger * @version 1.0, 16/07/2003 + * @since 2.8 */ trait SequenceLike[+A, +Repr] extends IterableLike[A, Repr] { self => diff --git a/src/library/scala/collection/SequenceProxy.scala b/src/library/scala/collection/SequenceProxy.scala index 911139c152..ffa956faf1 100644 --- a/src/library/scala/collection/SequenceProxy.scala +++ b/src/library/scala/collection/SequenceProxy.scala @@ -16,5 +16,6 @@ package scala.collection * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait SequenceProxy[+A] extends Sequence[A] with SequenceProxyLike[A, Sequence[A]] diff --git a/src/library/scala/collection/SequenceProxyLike.scala b/src/library/scala/collection/SequenceProxyLike.scala index 06d1701245..d2c846fb58 100644 --- a/src/library/scala/collection/SequenceProxyLike.scala +++ b/src/library/scala/collection/SequenceProxyLike.scala @@ -21,6 +21,7 @@ import generic._ * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait SequenceProxyLike[+A, +This <: SequenceLike[A, This] with Sequence[A]] extends SequenceLike[A, This] with IterableProxyLike[A, This] { override def length: Int = self.length diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala index 91df1e076b..f03f88261a 100644 --- a/src/library/scala/collection/Set.scala +++ b/src/library/scala/collection/Set.scala @@ -19,6 +19,7 @@ import generic._ * @author Matthias Zenger * @author Martin Odersky * @version 2.8 + * @since 1 */ trait Set[A] extends (A => Boolean) with Iterable[A] @@ -31,6 +32,7 @@ trait Set[A] extends (A => Boolean) * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ object Set extends SetFactory[Set] { override def empty[A]: Set[A] = immutable.Set.empty[A] diff --git a/src/library/scala/collection/SortedMap.scala b/src/library/scala/collection/SortedMap.scala index 5cfd450727..a5a0ff1b45 100644 --- a/src/library/scala/collection/SortedMap.scala +++ b/src/library/scala/collection/SortedMap.scala @@ -17,6 +17,7 @@ import mutable.Builder * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.4 */ trait SortedMap[A, +B] extends Map[A, B] with SortedMapLike[A, B, SortedMap[A, B]] { /** Needs to be overridden in subclasses. */ @@ -26,6 +27,9 @@ trait SortedMap[A, +B] extends Map[A, B] with SortedMapLike[A, B, SortedMap[A, B immutable.SortedMap.newBuilder[A, B] } +/** + * @since 2.8 + */ object SortedMap extends ImmutableSortedMapFactory[immutable.SortedMap] { implicit def builderFactory[A, B](implicit ord: Ordering[A]): BuilderFactory[(A, B), SortedMap[A, B], Coll] = new SortedMapBuilderFactory[A, B] def empty[A, B](implicit ord: Ordering[A]): immutable.SortedMap[A, B] = immutable.SortedMap.empty[A, B](ord) diff --git a/src/library/scala/collection/SortedMapLike.scala b/src/library/scala/collection/SortedMapLike.scala index 083bb46257..2e75053f9b 100644 --- a/src/library/scala/collection/SortedMapLike.scala +++ b/src/library/scala/collection/SortedMapLike.scala @@ -20,6 +20,7 @@ import generic._ * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait SortedMapLike[A, +B, +This <: SortedMapLike[A, B, This] with SortedMap[A, B]] extends Sorted[A, This] with MapLike[A, B, This] { self => diff --git a/src/library/scala/collection/SortedSet.scala b/src/library/scala/collection/SortedSet.scala index c6eb6ea570..95d0e0d084 100644 --- a/src/library/scala/collection/SortedSet.scala +++ b/src/library/scala/collection/SortedSet.scala @@ -15,6 +15,7 @@ package scala.collection * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.4 */ trait SortedSet[A] extends Set[A] with SortedSetLike[A, SortedSet[A]] { /** Needs to be overridden in subclasses. */ diff --git a/src/library/scala/collection/SortedSetLike.scala b/src/library/scala/collection/SortedSetLike.scala index 3d595b8f29..b0a2f20992 100644 --- a/src/library/scala/collection/SortedSetLike.scala +++ b/src/library/scala/collection/SortedSetLike.scala @@ -16,6 +16,7 @@ import generic._ * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait SortedSetLike[A, +This <: SortedSet[A] with SortedSetLike[A, This]] extends Sorted[A, This] with SetLike[A, This] { self => diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala index 717d832d90..432acfac62 100644 --- a/src/library/scala/collection/Traversable.scala +++ b/src/library/scala/collection/Traversable.scala @@ -28,6 +28,7 @@ import scala.util.control.Breaks * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait Traversable[+A] extends TraversableLike[A, Traversable[A]] with GenericTraversableTemplate[A, Traversable] { diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala index ddd637d62a..b87dff042d 100644 --- a/src/library/scala/collection/TraversableLike.scala +++ b/src/library/scala/collection/TraversableLike.scala @@ -60,6 +60,7 @@ import annotation.experimental * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait TraversableLike[+A, +Repr] { self => diff --git a/src/library/scala/collection/TraversableProxy.scala b/src/library/scala/collection/TraversableProxy.scala index 54e3ea705d..72a6b2cfce 100644 --- a/src/library/scala/collection/TraversableProxy.scala +++ b/src/library/scala/collection/TraversableProxy.scala @@ -19,5 +19,6 @@ package scala.collection * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait TraversableProxy[+A] extends Traversable[A] with TraversableProxyLike[A, Traversable[A]] diff --git a/src/library/scala/collection/TraversableProxyLike.scala b/src/library/scala/collection/TraversableProxyLike.scala index e667e7cc7f..ee50105bae 100644 --- a/src/library/scala/collection/TraversableProxyLike.scala +++ b/src/library/scala/collection/TraversableProxyLike.scala @@ -22,6 +22,7 @@ import mutable.Buffer * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait TraversableProxyLike[+A, +This <: TraversableLike[A, This] with Traversable[A]] extends TraversableLike[A, This] with Proxy { def self: This diff --git a/src/library/scala/collection/TraversableView.scala b/src/library/scala/collection/TraversableView.scala index e5d5400cf9..324a0038bd 100644 --- a/src/library/scala/collection/TraversableView.scala +++ b/src/library/scala/collection/TraversableView.scala @@ -23,6 +23,7 @@ import TraversableView.NoBuilder * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait TraversableView[+A, +Coll] extends TraversableViewLike[A, Coll, TraversableView[A, Coll]] diff --git a/src/library/scala/collection/Vector.scala b/src/library/scala/collection/Vector.scala index a642caba33..93ca11427c 100644 --- a/src/library/scala/collection/Vector.scala +++ b/src/library/scala/collection/Vector.scala @@ -25,6 +25,7 @@ import mutable.{Builder, ArrayBuffer} * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait Vector[+A] extends Sequence[A] with GenericTraversableTemplate[A, Vector] diff --git a/src/library/scala/collection/VectorLike.scala b/src/library/scala/collection/VectorLike.scala index 1e2548a12f..901d99972e 100644 --- a/src/library/scala/collection/VectorLike.scala +++ b/src/library/scala/collection/VectorLike.scala @@ -21,6 +21,7 @@ import mutable.ArrayBuffer * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait VectorLike[+A, +Repr] extends SequenceLike[A, Repr] { self => diff --git a/src/library/scala/collection/VectorView.scala b/src/library/scala/collection/VectorView.scala index f13f764f77..b679a4d04e 100644 --- a/src/library/scala/collection/VectorView.scala +++ b/src/library/scala/collection/VectorView.scala @@ -19,6 +19,7 @@ import generic._ * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait VectorView[+A, +Coll] extends VectorViewLike[A, Coll, VectorView[A, Coll]] diff --git a/src/library/scala/collection/VectorViewLike.scala b/src/library/scala/collection/VectorViewLike.scala index 99ca5ab023..3a1527f13a 100644 --- a/src/library/scala/collection/VectorViewLike.scala +++ b/src/library/scala/collection/VectorViewLike.scala @@ -19,6 +19,7 @@ import TraversableView.NoBuilder * @author Sean McDirmid * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait VectorViewLike[+A, +Coll, diff --git a/src/library/scala/collection/generic/Addable.scala b/src/library/scala/collection/generic/Addable.scala index 45b81e41fb..d05258922a 100644 --- a/src/library/scala/collection/generic/Addable.scala +++ b/src/library/scala/collection/generic/Addable.scala @@ -17,6 +17,7 @@ package generic * @author Martin Odersky * @owner Martin Odersky * @version 2.8 + * @since 2.8 */ trait Addable[A, +This <: Addable[A, This]] { self => diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index 0c9319aae5..bfc8593a4d 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -15,6 +15,9 @@ package generic import scala.collection._ import mutable.{Builder, AddingBuilder} +/** + * @since 2.8 + */ trait BitSetFactory[Coll <: BitSet with BitSetLike[Coll]] { def newBuilder: Builder[Int, Coll] = new AddingBuilder[Int, Coll](empty) def empty: Coll diff --git a/src/library/scala/collection/generic/BuilderFactory.scala b/src/library/scala/collection/generic/BuilderFactory.scala index 27cc6ddfb0..e377cd46e3 100644 --- a/src/library/scala/collection/generic/BuilderFactory.scala +++ b/src/library/scala/collection/generic/BuilderFactory.scala @@ -14,6 +14,8 @@ package generic import mutable.Builder /** A base class for builder factories + * + * @since 2.8 */ trait BuilderFactory[-Elem, +To, -From] { diff --git a/src/library/scala/collection/generic/GenericCompanion.scala b/src/library/scala/collection/generic/GenericCompanion.scala index a1a165254d..b895994497 100644 --- a/src/library/scala/collection/generic/GenericCompanion.scala +++ b/src/library/scala/collection/generic/GenericCompanion.scala @@ -14,6 +14,9 @@ package generic import mutable.Builder +/** + * @since 2.8 + */ abstract class GenericCompanion[+CC[X] <: Traversable[X]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/GenericSequenceFactory.scala.disabled b/src/library/scala/collection/generic/GenericSequenceFactory.scala.disabled index 7edfc3b25e..9132c96762 100644 --- a/src/library/scala/collection/generic/GenericSequenceFactory.scala.disabled +++ b/src/library/scala/collection/generic/GenericSequenceFactory.scala.disabled @@ -1,6 +1,8 @@ package scala.collection.generic /** A template for companion objects of Sequence and subclasses thereof. + * + * @since 2.8 */ abstract class GenericSequenceFactory extends GenericTraversableFactory { diff --git a/src/library/scala/collection/generic/GenericSetTemplate.scala b/src/library/scala/collection/generic/GenericSetTemplate.scala index f51fdcbb6e..b62b59e50b 100644 --- a/src/library/scala/collection/generic/GenericSetTemplate.scala +++ b/src/library/scala/collection/generic/GenericSetTemplate.scala @@ -12,6 +12,9 @@ package scala.collection package generic +/** + * @ since 2.8 + */ trait GenericSetTemplate[A, +CC[X] <: Set[X]] extends GenericTraversableTemplate[A, CC] { def empty: CC[A] = companion.empty[A] } diff --git a/src/library/scala/collection/generic/GenericTraversableFactory.scala.disabled b/src/library/scala/collection/generic/GenericTraversableFactory.scala.disabled index 97e3997cba..c2ae7e114c 100644 --- a/src/library/scala/collection/generic/GenericTraversableFactory.scala.disabled +++ b/src/library/scala/collection/generic/GenericTraversableFactory.scala.disabled @@ -1,6 +1,8 @@ package scala.collection.generic /** A template for companion objects of Traversable and subclasses thereof. + * + * @since 2.8 */ abstract class GenericTraversableFactory { diff --git a/src/library/scala/collection/generic/GenericTraversableTemplate.scala b/src/library/scala/collection/generic/GenericTraversableTemplate.scala index 886607c458..dfa31d686b 100644 --- a/src/library/scala/collection/generic/GenericTraversableTemplate.scala +++ b/src/library/scala/collection/generic/GenericTraversableTemplate.scala @@ -15,6 +15,9 @@ package generic import mutable.Builder import annotation.unchecked.uncheckedVariance +/** + * @since 2.8 + */ trait GenericTraversableTemplate[+A, +CC[X] <: Traversable[X]] { def foreach[U](f: A => U): Unit diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index 70a5b35501..504bceae66 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -17,6 +17,7 @@ package generic * @author Martin Odersky * @owner Martin Odersky * @version 2.8 + * @since 2.8 */ trait Growable[-A] { diff --git a/src/library/scala/collection/generic/ImmutableMapFactory.scala b/src/library/scala/collection/generic/ImmutableMapFactory.scala index 92762fd53b..88862d3b4e 100644 --- a/src/library/scala/collection/generic/ImmutableMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableMapFactory.scala @@ -15,6 +15,8 @@ import mutable.{Builder, MapBuilder} /** A template for companion objects of <code>immutable.Map</code> and * subclasses thereof. + * + * @since 2.8 */ abstract class ImmutableMapFactory[CC[A, +B] <: immutable.Map[A, B] with immutable.MapLike[A, B, CC[A, B]]] extends MapFactory[CC] { diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index ad3980fcb2..296d166471 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -15,6 +15,8 @@ package generic import mutable.{Builder, MapBuilder} /** A template for companion objects of immutable.Map and subclasses thereof. + * + * @since 2.8 */ abstract class ImmutableSortedMapFactory[CC[A, B] <: immutable.SortedMap[A, B] with SortedMapLike[A, B, CC[A, B]]] extends SortedMapFactory[CC] { diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 7b7f2fcfdf..84b990314b 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -15,6 +15,8 @@ package generic import mutable.{Builder, SetBuilder} /** A template for companion objects of mutable.Map and subclasses thereof. + * + * @since 2.8 */ abstract class ImmutableSortedSetFactory[CC[A] <: immutable.SortedSet[A] with SortedSetLike[A, CC[A]]] extends SortedSetFactory[CC]{ def newBuilder[A](implicit ord: Ordering[A]): Builder[A, CC[A]] = new SetBuilder[A, CC[A]](empty) diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index 9965a2bf2c..09903ae26a 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -31,6 +31,7 @@ import collection.mutable.Buffer * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait IterableForwarder[+A] extends Iterable[A] with TraversableForwarder[A] { diff --git a/src/library/scala/collection/generic/MapFactory.scala b/src/library/scala/collection/generic/MapFactory.scala index 941a43b136..813431b534 100644 --- a/src/library/scala/collection/generic/MapFactory.scala +++ b/src/library/scala/collection/generic/MapFactory.scala @@ -16,6 +16,8 @@ import mutable.Builder /** A template for companion objects of <code>mutable.Map</code> and * subclasses thereof. + * + * @since 2.8 */ abstract class MapFactory[CC[A, B] <: Map[A, B] with MapLike[A, B, CC[A, B]]] { diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index d506f66400..e7aaa5e68b 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -15,6 +15,8 @@ package generic import mutable.MapBuilder /** A template for companion objects of mutable.Map and subclasses thereof. + * + * @since 2.8 */ abstract class MutableMapFactory[CC[A, B] <: mutable.Map[A, B] with mutable.MapLike[A, B, CC[A, B]]] extends MapFactory[CC] { diff --git a/src/library/scala/collection/generic/SequenceFactory.scala b/src/library/scala/collection/generic/SequenceFactory.scala index 525eeb828c..3c2d36b1fd 100644 --- a/src/library/scala/collection/generic/SequenceFactory.scala +++ b/src/library/scala/collection/generic/SequenceFactory.scala @@ -13,6 +13,8 @@ package scala.collection package generic /** A template for companion objects of Sequence and subclasses thereof. + * + * @since 2.8 */ abstract class SequenceFactory[CC[X] <: Sequence[X] with GenericTraversableTemplate[X, CC]] extends TraversableFactory[CC] { diff --git a/src/library/scala/collection/generic/SequenceForwarder.scala b/src/library/scala/collection/generic/SequenceForwarder.scala index e42ce086d5..f21a02605c 100644 --- a/src/library/scala/collection/generic/SequenceForwarder.scala +++ b/src/library/scala/collection/generic/SequenceForwarder.scala @@ -23,6 +23,7 @@ import scala.collection._ * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait SequenceForwarder[+A] extends Sequence[A] with IterableForwarder[A] { diff --git a/src/library/scala/collection/generic/SetFactory.scala b/src/library/scala/collection/generic/SetFactory.scala index b106285e0d..8ed299ff6a 100644 --- a/src/library/scala/collection/generic/SetFactory.scala +++ b/src/library/scala/collection/generic/SetFactory.scala @@ -16,6 +16,8 @@ import mutable.{Builder, AddingBuilder} /** A template for companion objects of <code>Set</code> and subclasses * thereof. + * + * @since 2.8 */ abstract class SetFactory[CC[X] <: Set[X] with SetLike[X, CC[X]]] extends GenericCompanion[CC] { diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index dc996289d9..863b7fe55e 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -16,6 +16,7 @@ package generic * @author Martin Odersky * @owner Martin Odersky * @version 2.8 + * @since 2.8 */ trait Shrinkable[-A] { diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index b0cc6907bb..78ffe83ec2 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -14,6 +14,7 @@ package generic /** Any collection (including maps) whose keys (or elements) are ordered. * * @author Sean McDirmid + * @since 2.8 */ trait Sorted[K, +This <: Sorted[K, This]]{ def ordering : Ordering[K]; diff --git a/src/library/scala/collection/generic/SortedMapFactory.scala b/src/library/scala/collection/generic/SortedMapFactory.scala index 6e1deccf99..2be68b3ca9 100644 --- a/src/library/scala/collection/generic/SortedMapFactory.scala +++ b/src/library/scala/collection/generic/SortedMapFactory.scala @@ -15,6 +15,8 @@ package generic import mutable.Builder /** A template for companion objects of mutable.Map and subclasses thereof. + * + * @since 2.8 */ abstract class SortedMapFactory[CC[A, B] <: SortedMap[A, B] with SortedMapLike[A, B, CC[A, B]]] { diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index fbad5179a6..dc98f37579 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -15,6 +15,8 @@ package generic import mutable.Builder /** A template for companion objects of Set and subclasses thereof. + * + * @since 2.8 */ abstract class SortedSetFactory[CC[A] <: SortedSet[A] with SortedSetLike[A, CC[A]]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/Subtractable.scala b/src/library/scala/collection/generic/Subtractable.scala index bd1a9e9000..9ae731bfd1 100644 --- a/src/library/scala/collection/generic/Subtractable.scala +++ b/src/library/scala/collection/generic/Subtractable.scala @@ -16,6 +16,7 @@ package generic * @author Martin Odersky * @owner Martin Odersky * @version 2.8 + * @since 2.8 */ trait Subtractable[A, +This <: Subtractable[A, This]] { self => diff --git a/src/library/scala/collection/generic/TraversableFactory.scala b/src/library/scala/collection/generic/TraversableFactory.scala index 2086befff3..a43e607989 100644 --- a/src/library/scala/collection/generic/TraversableFactory.scala +++ b/src/library/scala/collection/generic/TraversableFactory.scala @@ -12,6 +12,8 @@ package scala.collection package generic /** A template for companion objects of Traversable and subclasses thereof. + * + * @since 2.8 */ abstract class TraversableFactory[CC[X] <: Traversable[X] with GenericTraversableTemplate[X, CC]] extends GenericCompanion[CC] { diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index 4760413fbd..50652e9343 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -34,6 +34,7 @@ import mutable.Buffer * * @author Martin Odersky * @version 2.8 + * @since 2.8 */ trait TraversableForwarder[+A] extends Traversable[A] { diff --git a/src/library/scala/collection/generic/TraversableView.scala.1 b/src/library/scala/collection/generic/TraversableView.scala.1 index 5a21034ed4..bbded08091 100644 --- a/src/library/scala/collection/generic/TraversableView.scala.1 +++ b/src/library/scala/collection/generic/TraversableView.scala.1 @@ -16,6 +16,8 @@ import TraversableView.NoBuilder * <p> * Every subclass has to implement the <code>foreach</code> method. * </p> + * + * @since 2.8 */ abstract class TraversableView[+A, +Coll <: Traversable[_]] extends Traversable[A] { self => diff --git a/src/library/scala/collection/interfaces/IterableMethods.scala b/src/library/scala/collection/interfaces/IterableMethods.scala index e8285f7f8b..e4f502dbe4 100644 --- a/src/library/scala/collection/interfaces/IterableMethods.scala +++ b/src/library/scala/collection/interfaces/IterableMethods.scala @@ -14,6 +14,9 @@ import mutable.Buffer import scala.reflect.ClassManifest import annotation.unchecked.uncheckedVariance +/** + * @since 2.8 + */ trait IterableMethods[+A, +This <: IterableLike[A, This] with Iterable[A]] extends TraversableMethods[A, This] { // abstract diff --git a/src/library/scala/collection/interfaces/MapMethods.scala b/src/library/scala/collection/interfaces/MapMethods.scala index 9777b9d8e8..f8c20366b8 100644 --- a/src/library/scala/collection/interfaces/MapMethods.scala +++ b/src/library/scala/collection/interfaces/MapMethods.scala @@ -11,6 +11,9 @@ package interfaces import generic._ +/** + * @since 2.8 + */ trait MapMethods[A, +B, +This <: MapLike[A, B, This] with Map[A, B]] extends IterableMethods[(A, B), This] with SubtractableMethods[A, This] diff --git a/src/library/scala/collection/interfaces/SequenceMethods.scala b/src/library/scala/collection/interfaces/SequenceMethods.scala index fe8e361ae6..ee91d33648 100644 --- a/src/library/scala/collection/interfaces/SequenceMethods.scala +++ b/src/library/scala/collection/interfaces/SequenceMethods.scala @@ -13,6 +13,9 @@ import generic._ import mutable.Buffer import scala.reflect.ClassManifest +/** + * @since 2.8 + */ trait SequenceMethods[+A, +This <: SequenceLike[A, This] with Sequence[A]] extends IterableMethods[A, This] { // abstract diff --git a/src/library/scala/collection/interfaces/SetMethods.scala b/src/library/scala/collection/interfaces/SetMethods.scala index 23320f3058..c7a7addec3 100644 --- a/src/library/scala/collection/interfaces/SetMethods.scala +++ b/src/library/scala/collection/interfaces/SetMethods.scala @@ -14,6 +14,9 @@ import mutable.Buffer import scala.reflect.ClassManifest import annotation.unchecked.uncheckedVariance +/** + * @since 2.8 + */ trait AddableMethods[A, +This <: Addable[A, This]] { protected def repr: This def +(elem: A): This @@ -22,6 +25,9 @@ trait AddableMethods[A, +This <: Addable[A, This]] { def ++ (iter: Iterator[A]): This } +/** + * @since 2.8 + */ trait SubtractableMethods[A, +This <: Subtractable[A, This]] { protected def repr: This def -(elem: A): This @@ -30,6 +36,9 @@ trait SubtractableMethods[A, +This <: Subtractable[A, This]] { def --(iter: Iterator[A]): This } +/** + * @since 2.8 + */ trait SetMethods[A, +This <: SetLike[A, This] with Set[A]] extends IterableMethods[A, This] with AddableMethods[A, This] diff --git a/src/library/scala/collection/interfaces/TraversableMethods.scala b/src/library/scala/collection/interfaces/TraversableMethods.scala index 56fb4c0395..4e8cdf6ec7 100644 --- a/src/library/scala/collection/interfaces/TraversableMethods.scala +++ b/src/library/scala/collection/interfaces/TraversableMethods.scala @@ -13,6 +13,9 @@ import generic._ import mutable.Buffer import scala.reflect.ClassManifest +/** + * @since 2.8 + */ trait TraversableMethods[+A, +This <: TraversableLike[A, This] with Traversable[A]] { // abstract diff --git a/src/library/scala/collection/script/Location.scala b/src/library/scala/collection/script/Location.scala index 7819d23d02..8214462d82 100644 --- a/src/library/scala/collection/script/Location.scala +++ b/src/library/scala/collection/script/Location.scala @@ -18,6 +18,7 @@ package script * * @author Matthias Zenger * @version 1.0, 10/05/2004 + * @since 2.8 */ sealed abstract class Location diff --git a/src/library/scala/collection/script/Message.scala b/src/library/scala/collection/script/Message.scala index 2a9974c28d..5a06289fc1 100644 --- a/src/library/scala/collection/script/Message.scala +++ b/src/library/scala/collection/script/Message.scala @@ -23,6 +23,7 @@ import mutable.ArrayBuffer * * @author Matthias Zenger * @version 1.0, 08/07/2003 + * @since 2.8 */ trait Message[+A] diff --git a/src/library/scala/collection/script/Scriptable.scala b/src/library/scala/collection/script/Scriptable.scala index 5c777463a2..4bdd88aa4c 100644 --- a/src/library/scala/collection/script/Scriptable.scala +++ b/src/library/scala/collection/script/Scriptable.scala @@ -18,6 +18,7 @@ package script * * @author Matthias Zenger * @version 1.0, 09/05/2004 + * @since 2.8 */ trait Scriptable[A] { /** Send a message to this scriptable object. |