diff options
Diffstat (limited to 'src/library/scala/collection')
117 files changed, 146 insertions, 74 deletions
diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index c3a3082e8a..3d94c9c0fb 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -10,7 +10,7 @@ package scala.collection -import util.control.Breaks._ +import scala.util.control.Breaks._ // import immutable.Stream import generic._ diff --git a/src/library/scala/collection/LinearSequence.scala b/src/library/scala/collection/LinearSequence.scala index 0d926fd36f..fa7977d7eb 100644 --- a/src/library/scala/collection/LinearSequence.scala +++ b/src/library/scala/collection/LinearSequence.scala @@ -14,7 +14,7 @@ package scala.collection import mutable.ListBuffer // import immutable.{List, Nil, ::} import generic._ -import util.control.Breaks._ +import scala.util.control.Breaks._ /** <p> * Class <code>Linear[A]</code> represents linear sequences of elements. diff --git a/src/library/scala/collection/Sequence.scala b/src/library/scala/collection/Sequence.scala index 04411c8db3..b0c507f088 100644 --- a/src/library/scala/collection/Sequence.scala +++ b/src/library/scala/collection/Sequence.scala @@ -14,7 +14,7 @@ package scala.collection import mutable.ListBuffer // import immutable.{List, Nil, ::} import generic._ -import util.control.Breaks._ +import scala.util.control.Breaks._ /** Class <code>Sequence[A]</code> represents sequences of elements * of type <code>A</code>. diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala index 1ae0c3b029..9998e02242 100644 --- a/src/library/scala/collection/Traversable.scala +++ b/src/library/scala/collection/Traversable.scala @@ -11,7 +11,7 @@ package scala.collection // import immutable.{List, Stream, Nil} import mutable.{Buffer, ArrayBuffer, ListBuffer} -import util.control.Breaks +import scala.util.control.Breaks import generic._ /** <p> diff --git a/src/library/scala/collection/generic/Addable.scala b/src/library/scala/collection/generic/Addable.scala index 5a794d4cde..d1348ee2ff 100644 --- a/src/library/scala/collection/generic/Addable.scala +++ b/src/library/scala/collection/generic/Addable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be added to other * collections using a '+' operator. diff --git a/src/library/scala/collection/generic/AddingBuilder.scala b/src/library/scala/collection/generic/AddingBuilder.scala index 7963836922..fbb195646a 100644 --- a/src/library/scala/collection/generic/AddingBuilder.scala +++ b/src/library/scala/collection/generic/AddingBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index acbfc0fd0b..035347340f 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -7,6 +7,7 @@ \* */ // $Id$ package scala.collection.generic +import scala.collection._ trait BitSetFactory[Coll <: BitSet with BitSetTemplate[Coll]] { def newBuilder: Builder[Int, Coll] = new AddingBuilder[Int, Coll](empty) diff --git a/src/library/scala/collection/generic/BitSetTemplate.scala b/src/library/scala/collection/generic/BitSetTemplate.scala index 66c8b27972..501a388b4d 100644 --- a/src/library/scala/collection/generic/BitSetTemplate.scala +++ b/src/library/scala/collection/generic/BitSetTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import BitSetTemplate._ import generic._ diff --git a/src/library/scala/collection/generic/BufferTemplate.scala b/src/library/scala/collection/generic/BufferTemplate.scala index ca14d586e6..55f9322949 100644 --- a/src/library/scala/collection/generic/BufferTemplate.scala +++ b/src/library/scala/collection/generic/BufferTemplate.scala @@ -11,8 +11,9 @@ package scala.collection.generic -import mutable.Buffer -import script._ +import scala.collection._ +import scala.collection.mutable.Buffer +import scala.collection.script._ /** Buffers are used to create sequences of elements incrementally by * appending, prepending, or inserting new elements. It is also diff --git a/src/library/scala/collection/generic/Builder.scala b/src/library/scala/collection/generic/Builder.scala index 974018ce26..3d0489223c 100644 --- a/src/library/scala/collection/generic/Builder.scala +++ b/src/library/scala/collection/generic/Builder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** The base trait of all builders. * A builder lets one construct a collection incrementally, by adding diff --git a/src/library/scala/collection/generic/BuilderFactory.scala b/src/library/scala/collection/generic/BuilderFactory.scala index 2834b38951..1940865031 100644 --- a/src/library/scala/collection/generic/BuilderFactory.scala +++ b/src/library/scala/collection/generic/BuilderFactory.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** A base class for builder factories */ diff --git a/src/library/scala/collection/generic/Cloneable.scala b/src/library/scala/collection/generic/Cloneable.scala index 9b84df0e2b..667a7af588 100644 --- a/src/library/scala/collection/generic/Cloneable.scala +++ b/src/library/scala/collection/generic/Cloneable.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A trait for cloneable collections. */ diff --git a/src/library/scala/collection/generic/Companion.scala b/src/library/scala/collection/generic/Companion.scala index 3ab7a4fa06..fd2e9325ca 100644 --- a/src/library/scala/collection/generic/Companion.scala +++ b/src/library/scala/collection/generic/Companion.scala @@ -10,6 +10,9 @@ package scala.collection.generic +import scala.collection._ + +import scala.collection._ abstract class Companion[+CC[X] <: Traversable[X]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala index 14686cdb90..6bad44054d 100644 --- a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala +++ b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This extensible class may be used as a basis for implementing double * linked lists. Type variable <code>A</code> refers to the element type diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index bbef2b7f29..7004952040 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be augmented using a `+=` operator * and that can be cleared of all elements using the `clear` method. diff --git a/src/library/scala/collection/generic/ImmutableMapFactory.scala b/src/library/scala/collection/generic/ImmutableMapFactory.scala index f401f86603..d74048f059 100644 --- a/src/library/scala/collection/generic/ImmutableMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableMapFactory.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>immutable.Map</code> and * subclasses thereof. diff --git a/src/library/scala/collection/generic/ImmutableMapTemplate.scala b/src/library/scala/collection/generic/ImmutableMapTemplate.scala index 5fbf3fda21..c754de541f 100644 --- a/src/library/scala/collection/generic/ImmutableMapTemplate.scala +++ b/src/library/scala/collection/generic/ImmutableMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for immutable maps from keys of type <code>A</code> diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index 1e36149f83..447129aab5 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of immutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 9d09e35132..141f3aee6f 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index 9fefd22367..9965a2bf2c 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/IterableProxyTemplate.scala b/src/library/scala/collection/generic/IterableProxyTemplate.scala index 74911ec113..545294e341 100644 --- a/src/library/scala/collection/generic/IterableProxyTemplate.scala +++ b/src/library/scala/collection/generic/IterableProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala index b0555df124..3477634821 100644 --- a/src/library/scala/collection/generic/IterableTemplate.scala +++ b/src/library/scala/collection/generic/IterableTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ import util.control.Breaks._ // import immutable.Stream // !!! diff --git a/src/library/scala/collection/generic/IterableView.scala b/src/library/scala/collection/generic/IterableView.scala index f63eb4930b..eca431ae1e 100644 --- a/src/library/scala/collection/generic/IterableView.scala +++ b/src/library/scala/collection/generic/IterableView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/IterableViewTemplate.scala b/src/library/scala/collection/generic/IterableViewTemplate.scala index 674ad9c30c..eda3f191f0 100644 --- a/src/library/scala/collection/generic/IterableViewTemplate.scala +++ b/src/library/scala/collection/generic/IterableViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/LazyBuilder.scala b/src/library/scala/collection/generic/LazyBuilder.scala index 8210225198..3f444bc02e 100644 --- a/src/library/scala/collection/generic/LazyBuilder.scala +++ b/src/library/scala/collection/generic/LazyBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import immutable.{List, Nil, ::} import mutable.ListBuffer diff --git a/src/library/scala/collection/generic/LinearSequenceTemplate.scala b/src/library/scala/collection/generic/LinearSequenceTemplate.scala index 5a66f4cfa5..6dcf96fce4 100644 --- a/src/library/scala/collection/generic/LinearSequenceTemplate.scala +++ b/src/library/scala/collection/generic/LinearSequenceTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.ListBuffer // import immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/LinkedListTemplate.scala b/src/library/scala/collection/generic/LinkedListTemplate.scala index 62f33eeccb..a368f36b64 100644 --- a/src/library/scala/collection/generic/LinkedListTemplate.scala +++ b/src/library/scala/collection/generic/LinkedListTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This extensible class may be used as a basis for implementing linked * list. Type variable <code>A</code> refers to the element type of the diff --git a/src/library/scala/collection/generic/MapBuilder.scala b/src/library/scala/collection/generic/MapBuilder.scala index 9d2249fc21..90c667a50a 100644 --- a/src/library/scala/collection/generic/MapBuilder.scala +++ b/src/library/scala/collection/generic/MapBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/MapFactory.scala b/src/library/scala/collection/generic/MapFactory.scala index 32916933ac..6caa97b270 100644 --- a/src/library/scala/collection/generic/MapFactory.scala +++ b/src/library/scala/collection/generic/MapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>mutable.Map</code> and * subclasses thereof. diff --git a/src/library/scala/collection/generic/MapProxyTemplate.scala b/src/library/scala/collection/generic/MapProxyTemplate.scala index ae53e33eaf..6ab3e470ab 100644 --- a/src/library/scala/collection/generic/MapProxyTemplate.scala +++ b/src/library/scala/collection/generic/MapProxyTemplate.scala @@ -7,6 +7,7 @@ \* */ package scala.collection.generic +import scala.collection._ // Methods could be printed by cat MapTemplate.scala | egrep '^ (override )?def' diff --git a/src/library/scala/collection/generic/MapTemplate.scala b/src/library/scala/collection/generic/MapTemplate.scala index 651eb2bd81..5ad959ae60 100644 --- a/src/library/scala/collection/generic/MapTemplate.scala +++ b/src/library/scala/collection/generic/MapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for maps from keys of type <code>A</code> to values diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index c3ef54efcb..0d72339c2c 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/MutableMapTemplate.scala b/src/library/scala/collection/generic/MutableMapTemplate.scala index 334fa937a4..5614a885b7 100644 --- a/src/library/scala/collection/generic/MutableMapTemplate.scala +++ b/src/library/scala/collection/generic/MutableMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for mutable maps from keys of type <code>A</code> to diff --git a/src/library/scala/collection/generic/MutableMapTemplateBase.scala b/src/library/scala/collection/generic/MutableMapTemplateBase.scala index 5486372f28..e55a04e1a1 100755 --- a/src/library/scala/collection/generic/MutableMapTemplateBase.scala +++ b/src/library/scala/collection/generic/MutableMapTemplateBase.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** The reason for this class is so that we can * have both a generic immutable `+` with signature diff --git a/src/library/scala/collection/generic/MutableSetTemplate.scala b/src/library/scala/collection/generic/MutableSetTemplate.scala index 7ed515a4d6..1f29838174 100644 --- a/src/library/scala/collection/generic/MutableSetTemplate.scala +++ b/src/library/scala/collection/generic/MutableSetTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import script._ diff --git a/src/library/scala/collection/generic/MutableVectorTemplate.scala b/src/library/scala/collection/generic/MutableVectorTemplate.scala index 2067fb99c2..4cb3856464 100644 --- a/src/library/scala/collection/generic/MutableVectorTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A subtrait of collection.Vector which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/generic/MutableVectorView.scala b/src/library/scala/collection/generic/MutableVectorView.scala index 3d8fab6dec..1a84ace1e2 100644 --- a/src/library/scala/collection/generic/MutableVectorView.scala +++ b/src/library/scala/collection/generic/MutableVectorView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala index 15bee72db3..61531ed96b 100644 --- a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SequenceFactory.scala b/src/library/scala/collection/generic/SequenceFactory.scala index 3fcfe870cd..acf0f0cfd1 100644 --- a/src/library/scala/collection/generic/SequenceFactory.scala +++ b/src/library/scala/collection/generic/SequenceFactory.scala @@ -10,6 +10,8 @@ package scala.collection.generic +import scala.collection._ +import scala.collection._ /** A template for companion objects of Sequence and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SequenceForwarder.scala b/src/library/scala/collection/generic/SequenceForwarder.scala index 40bc212718..e42ce086d5 100644 --- a/src/library/scala/collection/generic/SequenceForwarder.scala +++ b/src/library/scala/collection/generic/SequenceForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This class implements a forwarder for sequences. It forwards * all calls to a different sequence object except for diff --git a/src/library/scala/collection/generic/SequenceProxyTemplate.scala b/src/library/scala/collection/generic/SequenceProxyTemplate.scala index 4231dc1eb7..d3f5c3c9b5 100644 --- a/src/library/scala/collection/generic/SequenceProxyTemplate.scala +++ b/src/library/scala/collection/generic/SequenceProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/SequenceTemplate.scala b/src/library/scala/collection/generic/SequenceTemplate.scala index f3a9f03f4a..ec08d8a160 100644 --- a/src/library/scala/collection/generic/SequenceTemplate.scala +++ b/src/library/scala/collection/generic/SequenceTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.{ListBuffer, HashMap} diff --git a/src/library/scala/collection/generic/SequenceView.scala b/src/library/scala/collection/generic/SequenceView.scala index 25b015dd86..269d247316 100644 --- a/src/library/scala/collection/generic/SequenceView.scala +++ b/src/library/scala/collection/generic/SequenceView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SequenceViewTemplate.scala b/src/library/scala/collection/generic/SequenceViewTemplate.scala index 998b61271a..12ccd300e2 100644 --- a/src/library/scala/collection/generic/SequenceViewTemplate.scala +++ b/src/library/scala/collection/generic/SequenceViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import Sequence.fill import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SetBuilder.scala b/src/library/scala/collection/generic/SetBuilder.scala index 1c4d3a18d9..df8949e93c 100644 --- a/src/library/scala/collection/generic/SetBuilder.scala +++ b/src/library/scala/collection/generic/SetBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/SetClass.scala b/src/library/scala/collection/generic/SetClass.scala index 41b4477811..7e03ea2441 100644 --- a/src/library/scala/collection/generic/SetClass.scala +++ b/src/library/scala/collection/generic/SetClass.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ trait SetClass[A, +CC[X] <: Set[X]] extends TraversableClass[A, CC] { def empty: CC[A] = companion.empty[A] diff --git a/src/library/scala/collection/generic/SetFactory.scala b/src/library/scala/collection/generic/SetFactory.scala index 9696a72810..4422f58f57 100644 --- a/src/library/scala/collection/generic/SetFactory.scala +++ b/src/library/scala/collection/generic/SetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>Set</code> and subclasses * thereof. diff --git a/src/library/scala/collection/generic/SetProxyTemplate.scala b/src/library/scala/collection/generic/SetProxyTemplate.scala index a944b132a0..057025e5c5 100644 --- a/src/library/scala/collection/generic/SetProxyTemplate.scala +++ b/src/library/scala/collection/generic/SetProxyTemplate.scala @@ -8,6 +8,7 @@ package scala.collection.generic +import scala.collection._ // Methods could be printed by cat SetTemplate.scala | egrep '^ (override )?def' diff --git a/src/library/scala/collection/generic/SetTemplate.scala b/src/library/scala/collection/generic/SetTemplate.scala index f3f8bf3e2c..e7f93e2701 100644 --- a/src/library/scala/collection/generic/SetTemplate.scala +++ b/src/library/scala/collection/generic/SetTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for sets of type <code>A</code>.<br/> diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index 342e724e80..83b164abac 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be reduced using a -= operator. * diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index fb26919424..43d46dcc26 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** Any collection (including maps) whose keys (or elements) are ordered. * diff --git a/src/library/scala/collection/generic/SortedMapFactory.scala b/src/library/scala/collection/generic/SortedMapFactory.scala index 3c1355ac99..4ea81a417c 100644 --- a/src/library/scala/collection/generic/SortedMapFactory.scala +++ b/src/library/scala/collection/generic/SortedMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SortedMapTemplate.scala b/src/library/scala/collection/generic/SortedMapTemplate.scala index 7dd6fae30e..b6bdd15deb 100644 --- a/src/library/scala/collection/generic/SortedMapTemplate.scala +++ b/src/library/scala/collection/generic/SortedMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for maps whose keys are sorted. * To create a concrete sorted map, you need to implement the rangeImpl method, diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index b113528653..5f813dec7f 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of Set and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SortedSetTemplate.scala b/src/library/scala/collection/generic/SortedSetTemplate.scala index f7da860e25..2a793daca6 100644 --- a/src/library/scala/collection/generic/SortedSetTemplate.scala +++ b/src/library/scala/collection/generic/SortedSetTemplate.scala @@ -10,6 +10,7 @@ // !!! todo: integrate in new collections library package scala.collection.generic +import scala.collection._ /** A template for sets which are sorted. * diff --git a/src/library/scala/collection/generic/Subtractable.scala b/src/library/scala/collection/generic/Subtractable.scala index 151298fe20..1ac70c7391 100644 --- a/src/library/scala/collection/generic/Subtractable.scala +++ b/src/library/scala/collection/generic/Subtractable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be reduced using a - operator. * diff --git a/src/library/scala/collection/generic/TraversableClass.scala b/src/library/scala/collection/generic/TraversableClass.scala index 04c61dc413..6d6d445d88 100644 --- a/src/library/scala/collection/generic/TraversableClass.scala +++ b/src/library/scala/collection/generic/TraversableClass.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import annotation.unchecked.uncheckedVariance diff --git a/src/library/scala/collection/generic/TraversableFactory.scala b/src/library/scala/collection/generic/TraversableFactory.scala index 4b783370bd..747dd993bb 100644 --- a/src/library/scala/collection/generic/TraversableFactory.scala +++ b/src/library/scala/collection/generic/TraversableFactory.scala @@ -10,6 +10,9 @@ package scala.collection.generic +import scala.collection._ + +import scala.collection._ /** A template for companion objects of Traversable and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index 68e420b7c7..eff1bef8a1 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.Buffer // import immutable.{List, Nil, ::, Stream} diff --git a/src/library/scala/collection/generic/TraversableProxyTemplate.scala b/src/library/scala/collection/generic/TraversableProxyTemplate.scala index b3f0fd5a48..3ab602fb35 100644 --- a/src/library/scala/collection/generic/TraversableProxyTemplate.scala +++ b/src/library/scala/collection/generic/TraversableProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala index 96aca0530a..21273a11bd 100644 --- a/src/library/scala/collection/generic/TraversableTemplate.scala +++ b/src/library/scala/collection/generic/TraversableTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ // import immutable.{List, Stream, Nil} //!!! import mutable.{Buffer, ArrayBuffer, ListBuffer} diff --git a/src/library/scala/collection/generic/TraversableView.scala b/src/library/scala/collection/generic/TraversableView.scala index 78e70bdb04..47eb3c22c7 100644 --- a/src/library/scala/collection/generic/TraversableView.scala +++ b/src/library/scala/collection/generic/TraversableView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/TraversableViewTemplate.scala b/src/library/scala/collection/generic/TraversableViewTemplate.scala index ec18eca433..6b8cdbd2ec 100644 --- a/src/library/scala/collection/generic/TraversableViewTemplate.scala +++ b/src/library/scala/collection/generic/TraversableViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import Math.MAX_INT import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/VectorTemplate.scala b/src/library/scala/collection/generic/VectorTemplate.scala index daba1709cd..f494c67cbd 100644 --- a/src/library/scala/collection/generic/VectorTemplate.scala +++ b/src/library/scala/collection/generic/VectorTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ import mutable.ArrayBuffer diff --git a/src/library/scala/collection/generic/VectorView.scala b/src/library/scala/collection/generic/VectorView.scala index 41d2c98a19..65850e8a01 100644 --- a/src/library/scala/collection/generic/VectorView.scala +++ b/src/library/scala/collection/generic/VectorView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/VectorViewTemplate.scala b/src/library/scala/collection/generic/VectorViewTemplate.scala index a8dcc05180..f043a04685 100644 --- a/src/library/scala/collection/generic/VectorViewTemplate.scala +++ b/src/library/scala/collection/generic/VectorViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala index 01c0d78b53..c645b30b56 100644 --- a/src/library/scala/collection/immutable/BitSet.scala +++ b/src/library/scala/collection/immutable/BitSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ import BitSetTemplate.{LogWL, updateArray} /** a base class for immutable bit sets diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index c20dc017f8..0849536755 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -11,7 +11,8 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable import annotation.unchecked.uncheckedVariance /** This class implements immutable maps using a hash table. diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala index 215fe80914..9300164438 100644 --- a/src/library/scala/collection/immutable/HashSet.scala +++ b/src/library/scala/collection/immutable/HashSet.scala @@ -10,7 +10,8 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** This class implements immutable sets using a hash table. * It is optimized for sequential accesses where the last updated table is accessed most often. diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala index 31d7d6db8d..649d2eafc5 100644 --- a/src/library/scala/collection/immutable/Iterable.scala +++ b/src/library/scala/collection/immutable/Iterable.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Iterable which represents iterables * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/LinearSequence.scala b/src/library/scala/collection/immutable/LinearSequence.scala index 6a9665e705..da4b364b74 100644 --- a/src/library/scala/collection/immutable/LinearSequence.scala +++ b/src/library/scala/collection/immutable/LinearSequence.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index 78bb4a125e..29813152ad 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -11,8 +11,8 @@ package scala.collection.immutable -import mutable.ListBuffer -import generic._ +import scala.collection.mutable.ListBuffer +import scala.collection.generic._ /** A class representing an ordered collection of elements of type * <code>a</code>. This class comes with two implementing case @@ -221,8 +221,6 @@ sealed abstract class List[+A] extends LinearSequence[A] loop(drop(n), this) } - // dropRight is inherited from Stream - /** Split the list at a given point and return the two parts thus * created. * diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala index 816018bf28..40ecc67381 100644 --- a/src/library/scala/collection/immutable/ListMap.scala +++ b/src/library/scala/collection/immutable/ListMap.scala @@ -12,7 +12,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="ListMap.html">ListMap</a>'s */ object ListMap extends ImmutableMapFactory[ListMap] { diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala index 2a7fa22661..d3eac8f9f9 100644 --- a/src/library/scala/collection/immutable/ListSet.scala +++ b/src/library/scala/collection/immutable/ListSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="ListSet.html">ListSet</a>'s */ object ListSet extends SetFactory[ListSet] { diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index ef3c3006f0..929d41bc99 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ trait Map[A, +B] extends Iterable[(A, B)] with collection.Map[A, B] diff --git a/src/library/scala/collection/immutable/MapProxy.scala b/src/library/scala/collection/immutable/MapProxy.scala index a2a1223cfe..1ad7219fc7 100644 --- a/src/library/scala/collection/immutable/MapProxy.scala +++ b/src/library/scala/collection/immutable/MapProxy.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic.MapProxyTemplate +import scala.collection.generic.MapProxyTemplate /** <p> * This is a simple wrapper class for <a href="Map.html" @@ -26,10 +26,10 @@ import generic.MapProxyTemplate * @version 2.0, 31/12/2006 */ -trait MapProxy[A, +B] extends immutable.Map[A, B] with MapProxyTemplate[A, B, immutable.Map[A, B]] +trait MapProxy[A, +B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]] { override def thisCollection = this - private def newProxy[B1 >: B](newSelf: immutable.Map[A, B1]): MapProxy[A, B1] = + private def newProxy[B1 >: B](newSelf: Map[A, B1]): MapProxy[A, B1] = new MapProxy[A, B1] { val self = newSelf } override def empty = newProxy(self.empty) @@ -39,4 +39,4 @@ trait MapProxy[A, +B] extends immutable.Map[A, B] with MapProxyTemplate[A, B, im override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = newProxy(self.+(elem1, elem2, elems: _*)) override def -(key: A) = newProxy(self - key) -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala index f63545cbe7..1ba58f8df0 100644 --- a/src/library/scala/collection/immutable/Queue.scala +++ b/src/library/scala/collection/immutable/Queue.scala @@ -27,8 +27,7 @@ object Queue { @serializable class Queue[+A] protected( protected val in: List[A], - protected val out: List[A]) -extends immutable.Sequence[A] + protected val out: List[A]) extends Sequence[A] { /** Returns the <code>n</code>-th element of this queue. * The first element is at position 0. diff --git a/src/library/scala/collection/immutable/Sequence.scala b/src/library/scala/collection/immutable/Sequence.scala index 715cabb705..b58f8e16cf 100644 --- a/src/library/scala/collection/immutable/Sequence.scala +++ b/src/library/scala/collection/immutable/Sequence.scala @@ -7,7 +7,8 @@ \* */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala index 9135306038..e03c232850 100644 --- a/src/library/scala/collection/immutable/Set.scala +++ b/src/library/scala/collection/immutable/Set.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** <p> * A generic trait for immutable sets. Concrete set implementations have diff --git a/src/library/scala/collection/immutable/SetProxy.scala b/src/library/scala/collection/immutable/SetProxy.scala index 4d7ef52d93..d33a4b68cc 100644 --- a/src/library/scala/collection/immutable/SetProxy.scala +++ b/src/library/scala/collection/immutable/SetProxy.scala @@ -8,7 +8,7 @@ package scala.collection.immutable -import generic.SetProxyTemplate +import scala.collection.generic.SetProxyTemplate /** <p> * This is a simple wrapper class for <a href="Set.html" @@ -20,10 +20,10 @@ import generic.SetProxyTemplate * </p> */ -trait SetProxy[A] extends immutable.Set[A] with SetProxyTemplate[A, immutable.Set[A]] +trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]] { override def thisCollection = this - private def newProxy[B >: A](newSelf: immutable.Set[B]): SetProxy[B] = + private def newProxy[B >: A](newSelf: Set[B]): SetProxy[B] = new SetProxy[B] { val self = newSelf } override def empty = newProxy(self.empty) diff --git a/src/library/scala/collection/immutable/SortedMap.scala b/src/library/scala/collection/immutable/SortedMap.scala index 85461b54c9..cc641e70f8 100644 --- a/src/library/scala/collection/immutable/SortedMap.scala +++ b/src/library/scala/collection/immutable/SortedMap.scala @@ -17,7 +17,7 @@ */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ import annotation.unchecked.uncheckedVariance trait SortedMap[A, +B] extends Map[A, B] @@ -26,7 +26,7 @@ trait SortedMap[A, +B] extends Map[A, B] with SortedMapTemplate[A, B, SortedMap[A, B]] { override protected[this] def newBuilder : Builder[(A, B), SortedMap[A, B]] = - immutable.SortedMap.newBuilder[A, B] + SortedMap.newBuilder[A, B] override def updated [B1 >: B](key: A, value: B1): SortedMap[A, B1] = this + ((key, value)) diff --git a/src/library/scala/collection/immutable/SortedSet.scala b/src/library/scala/collection/immutable/SortedSet.scala index 911cfcba0a..80fd411acd 100644 --- a/src/library/scala/collection/immutable/SortedSet.scala +++ b/src/library/scala/collection/immutable/SortedSet.scala @@ -16,7 +16,7 @@ */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ trait SortedSet[A] extends Set[A] with collection.SortedSet[A] with SortedSetTemplate[A, SortedSet[A]] { /** Needs to be overridden in subclasses. */ diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index ad20214bbb..862ac2cfc7 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -11,8 +11,8 @@ package scala.collection.immutable -import mutable.ListBuffer -import generic._ +import scala.collection.mutable.ListBuffer +import scala.collection.generic._ /** * <p>The class <code>Stream</code> implements lazy lists where elements diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala index 398a0264c8..53fc96aae0 100644 --- a/src/library/scala/collection/immutable/Traversable.scala +++ b/src/library/scala/collection/immutable/Traversable.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of Traversable in package collection which represents traversables * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index cff70586ab..c146064296 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -10,7 +10,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="TreeMap.html">TreeMap</a>'s. */ object TreeMap extends ImmutableSortedMapFactory[TreeMap] { diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 36e4fc98c4..0e5496828a 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="TreeSet.html">TreeSet</a>'s. */ object TreeSet extends SortedSetFactory[TreeSet]{ diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index 743ab9897d..27b69949c8 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -7,8 +7,8 @@ \* */ package scala.collection.immutable -import generic._ -import mutable.ArrayBuffer +import scala.collection.generic._ +import scala.collection.mutable.ArrayBuffer /** A subtrait of collection.Vector which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala index d25c55f4af..d4986265a2 100644 --- a/src/library/scala/collection/mutable/ArrayBuffer.scala +++ b/src/library/scala/collection/mutable/ArrayBuffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** An implementation of the <code>Buffer</code> class using an array to * represent the assembled sequence internally. Append, update and random diff --git a/src/library/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala index 33fbebf324..383c6954cb 100644 --- a/src/library/scala/collection/mutable/BitSet.scala +++ b/src/library/scala/collection/mutable/BitSet.scala @@ -1,6 +1,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ +import scala.collection.immutable import BitSetTemplate.{LogWL, updateArray} /** A class for mutable bitsets */ diff --git a/src/library/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala index 2099f134fc..fcbe4f655f 100644 --- a/src/library/scala/collection/mutable/Buffer.scala +++ b/src/library/scala/collection/mutable/Buffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** Buffers are used to create sequences of elements incrementally by * appending, prepending, or inserting new elements. It is also diff --git a/src/library/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala index aeaaf71808..3b28648489 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedList.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedList.scala @@ -13,7 +13,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements single linked lists where both the head (<code>elem</code>) * and the tail (<code>next</code>) are mutable. diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala index 255358ae1f..a8c2e14655 100644 --- a/src/library/scala/collection/mutable/HashMap.scala +++ b/src/library/scala/collection/mutable/HashMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ @serializable diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala index 20e5a1e6b5..12b7398db1 100644 --- a/src/library/scala/collection/mutable/HashSet.scala +++ b/src/library/scala/collection/mutable/HashSet.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements mutable sets using a hashtable. * diff --git a/src/library/scala/collection/mutable/Iterable.scala b/src/library/scala/collection/mutable/Iterable.scala index 41a88af7f8..2a8c4eb773 100644 --- a/src/library/scala/collection/mutable/Iterable.scala +++ b/src/library/scala/collection/mutable/Iterable.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** <p> * A subtrait of <a href="../Iterable.html" target="contentFrame"> diff --git a/src/library/scala/collection/mutable/LinearSequence.scala b/src/library/scala/collection/mutable/LinearSequence.scala index 3d71be1f81..59bd14fead 100644 --- a/src/library/scala/collection/mutable/LinearSequence.scala +++ b/src/library/scala/collection/mutable/LinearSequence.scala @@ -1,6 +1,6 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index 4a64b9e8ce..84a74b25c1 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -12,7 +12,7 @@ package scala.collection.mutable import Predef._ -import generic._ +import scala.collection.generic._ /** This class implements mutable maps using a hashtable. * diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala index f2825db975..d746f834b5 100644 --- a/src/library/scala/collection/mutable/LinkedHashSet.scala +++ b/src/library/scala/collection/mutable/LinkedHashSet.scala @@ -10,7 +10,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** Todo: this has O(n) cost for element removal. * Should be rewritten to be more efficient. diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala index 90c88439b4..b02b2bc90b 100644 --- a/src/library/scala/collection/mutable/LinkedList.scala +++ b/src/library/scala/collection/mutable/LinkedList.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements single linked lists where both the head (<code>elem</code>) * and the tail (<code>next</code>) are mutable. diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index c75e18dcd1..d1d0bb62ed 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -11,8 +11,8 @@ package scala.collection.mutable -import generic._ -// import immutable.{List, Nil, ::} +import scala.collection.generic._ +import scala.collection.immutable /** A Buffer implementation back up by a list. It provides constant time * prepend and append. Most other operations are linear. diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala index a0d844cb5d..3bdca762e2 100644 --- a/src/library/scala/collection/mutable/ListMap.scala +++ b/src/library/scala/collection/mutable/ListMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ @serializable class ListMap[A, B] extends Map[A, B] with MutableMapTemplate[A, B, ListMap[A, B]] { diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala index eab5b426a8..c59211fc96 100644 --- a/src/library/scala/collection/mutable/Map.scala +++ b/src/library/scala/collection/mutable/Map.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ trait Map[A, B] extends Iterable[(A, B)] diff --git a/src/library/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala index 92fb1c85a2..051f92f62a 100644 --- a/src/library/scala/collection/mutable/MapProxy.scala +++ b/src/library/scala/collection/mutable/MapProxy.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic.MapProxyTemplate +import scala.collection.generic.MapProxyTemplate /** <p> * This is a simple wrapper class for <a href="Map.html" @@ -26,7 +26,7 @@ import generic.MapProxyTemplate * @version 2.0, 31/12/2006 */ -trait MapProxy[A, B] extends mutable.Map[A, B] with MapProxyTemplate[A, B, mutable.Map[A, B]] +trait MapProxy[A, B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]] { override def thisCollection = this override def empty: MapProxy[A, B] = new MapProxy[A, B] { val self = MapProxy.this.self.empty } @@ -39,4 +39,4 @@ trait MapProxy[A, B] extends mutable.Map[A, B] with MapProxyTemplate[A, B, mutab override def += (kv: (A, B)) = { self += kv ; this } override def -= (key: A) = { self -= key ; this } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala index ce9060acf8..2a001e187c 100644 --- a/src/library/scala/collection/mutable/MutableList.scala +++ b/src/library/scala/collection/mutable/MutableList.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ // import immutable.{List, Nil, ::} //import Predef.NoSuchElementException diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala index 7cda49d2fa..59f1fad220 100644 --- a/src/library/scala/collection/mutable/ObservableBuffer.scala +++ b/src/library/scala/collection/mutable/ObservableBuffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription * mechanism to the <code>Buffer</code> class into which this abstract @@ -65,4 +65,4 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] def undo { throw new UnsupportedOperationException("cannot undo") } }) } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala index b4fe6c8693..c43fd8ab9b 100644 --- a/src/library/scala/collection/mutable/ObservableMap.scala +++ b/src/library/scala/collection/mutable/ObservableMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription diff --git a/src/library/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala index 31dd10c8b9..d01d8803da 100644 --- a/src/library/scala/collection/mutable/ObservableSet.scala +++ b/src/library/scala/collection/mutable/ObservableSet.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription * mechanism to the <code>Set</code> class into which this abstract diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index f0b4e537e9..b1bc75f762 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic.{ Addable, Cloneable, Growable } +import scala.collection.generic.{ Addable, Cloneable, Growable } /** This class implements priority queues using a heap. diff --git a/src/library/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala index 14736dccf9..4c6d1a2320 100644 --- a/src/library/scala/collection/mutable/Queue.scala +++ b/src/library/scala/collection/mutable/Queue.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** <code>Queue</code> objects implement data structures that allow to * insert and retrieve elements in a first-in-first-out (FIFO) manner. diff --git a/src/library/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala index 6f8d58ad47..5a6a5a187b 100644 --- a/src/library/scala/collection/mutable/ResizableArray.scala +++ b/src/library/scala/collection/mutable/ResizableArray.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class is used internally to implement data structures that * are based on resizable arrays. diff --git a/src/library/scala/collection/mutable/Sequence.scala b/src/library/scala/collection/mutable/Sequence.scala index 4f460f74c7..6ce3afae33 100644 --- a/src/library/scala/collection/mutable/Sequence.scala +++ b/src/library/scala/collection/mutable/Sequence.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Sequence which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala index d17dee1753..55c3d3f1aa 100644 --- a/src/library/scala/collection/mutable/Set.scala +++ b/src/library/scala/collection/mutable/Set.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A generic trait for mutable sets. Concrete set implementations * have to provide functionality for the abstract methods in Set: diff --git a/src/library/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala index 0b032816eb..0ff57ee366 100644 --- a/src/library/scala/collection/mutable/SetProxy.scala +++ b/src/library/scala/collection/mutable/SetProxy.scala @@ -10,7 +10,7 @@ package scala.collection.mutable -import generic.SetProxyTemplate +import scala.collection.generic.SetProxyTemplate /** This is a simple wrapper class for <a href="Set.html" * target="contentFrame"><code>scala.collection.mutable.Set</code></a>. @@ -20,7 +20,7 @@ import generic.SetProxyTemplate * @author Matthias Zenger * @version 1.1, 09/05/2004 */ -trait SetProxy[A] extends mutable.Set[A] with SetProxyTemplate[A, mutable.Set[A]] +trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]] { override def thisCollection = this override def empty = new SetProxy[A] { val self = SetProxy.this.self.empty } @@ -29,4 +29,4 @@ trait SetProxy[A] extends mutable.Set[A] with SetProxyTemplate[A, mutable.Set[A] def +=(elem: A) = { self += elem; this } def -=(elem: A) = { self -= elem; this } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala index 637a414c5a..30caec89be 100644 --- a/src/library/scala/collection/mutable/Stack.scala +++ b/src/library/scala/collection/mutable/Stack.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A stack implements a data structure which allows to store and retrieve * objects in a last-in-first-out (LIFO) fashion. diff --git a/src/library/scala/collection/mutable/Traversable.scala b/src/library/scala/collection/mutable/Traversable.scala index f6d2433be2..025100fb91 100644 --- a/src/library/scala/collection/mutable/Traversable.scala +++ b/src/library/scala/collection/mutable/Traversable.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Traversable which represents traversables * that can be mutated. diff --git a/src/library/scala/collection/mutable/Vector.scala b/src/library/scala/collection/mutable/Vector.scala index db082bb09d..6bd5bf3fdb 100644 --- a/src/library/scala/collection/mutable/Vector.scala +++ b/src/library/scala/collection/mutable/Vector.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Vector which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/mutable/WeakHashMap.scala b/src/library/scala/collection/mutable/WeakHashMap.scala index 7520026e01..9ecbcfb586 100644 --- a/src/library/scala/collection/mutable/WeakHashMap.scala +++ b/src/library/scala/collection/mutable/WeakHashMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import JavaConversions._ +import scala.collection.JavaConversions._ class WeakHashMap[A, B] extends JMapWrapper[A, B](new java.util.WeakHashMap) { override def empty = new WeakHashMap[A, B] diff --git a/src/library/scala/collection/script/Message.scala b/src/library/scala/collection/script/Message.scala index c4bf81eebc..b333c83fb7 100644 --- a/src/library/scala/collection/script/Message.scala +++ b/src/library/scala/collection/script/Message.scala @@ -10,6 +10,7 @@ package scala.collection.script +import scala.collection._ import Predef._ import mutable.ArrayBuffer |