From 5bfb4e7a569f779c5d0b06bb5c22bae515314033 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 13 Oct 2009 17:07:32 +0000 Subject: Changed mutable +: to +=: --- src/library/scala/collection/JavaConversions.scala | 2 +- src/library/scala/collection/mutable/ArrayBuffer.scala | 2 +- src/library/scala/collection/mutable/BufferLike.scala | 5 ++++- src/library/scala/collection/mutable/BufferProxy.scala | 2 +- src/library/scala/collection/mutable/ListBuffer.scala | 2 +- src/library/scala/collection/mutable/ObservableBuffer.scala | 4 ++-- src/library/scala/collection/mutable/SynchronizedBuffer.scala | 4 ++-- src/swing/scala/swing/BufferWrapper.scala | 2 +- src/swing/scala/swing/Publisher.scala | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala index dbac5a564c..b19abf6271 100644 --- a/src/library/scala/collection/JavaConversions.scala +++ b/src/library/scala/collection/JavaConversions.scala @@ -359,7 +359,7 @@ object JavaConversions { override def iterator : Iterator[A] = underlying.iterator def apply(i : Int) = underlying.get(i) def update(i : Int, elem : A) = underlying.set(i, elem) - def +:(elem : A) = { underlying.subList(0, 0).add(elem) ; this } + def +=:(elem : A) = { underlying.subList(0, 0).add(elem) ; this } def +=(elem : A): this.type = { underlying.add(elem); this } def insertAll(i : Int, elems : Traversable[A]) = { val ins = underlying.subList(0, i) ; elems.foreach(ins.add(_)) } def remove(i : Int) = underlying.remove(i) diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala index 6c2f092505..1b2a346b81 100644 --- a/src/library/scala/collection/mutable/ArrayBuffer.scala +++ b/src/library/scala/collection/mutable/ArrayBuffer.scala @@ -86,7 +86,7 @@ class ArrayBuffer[A](override protected val initialSize: Int) * @param elem the element to append. * @return the updated buffer. */ - def +:(elem: A): this.type = { + def +=:(elem: A): this.type = { ensureSize(size0 + 1) copy(0, 1, size0) array(0) = elem.asInstanceOf[AnyRef] diff --git a/src/library/scala/collection/mutable/BufferLike.scala b/src/library/scala/collection/mutable/BufferLike.scala index a1506ce6ed..51554c4782 100644 --- a/src/library/scala/collection/mutable/BufferLike.scala +++ b/src/library/scala/collection/mutable/BufferLike.scala @@ -76,7 +76,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] * the identity of the buffer. * @param elem the element to prepend. */ - def +:(elem: A): This + def +=:(elem: A): This + + @deprecated("use `+=:' instead") + final def +:(elem: A): This = +=:(elem) /** Inserts new elements at the index n. Opposed to method * update, this method will not replace an element with a diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala index 68e25f71ea..6468896510 100644 --- a/src/library/scala/collection/mutable/BufferProxy.scala +++ b/src/library/scala/collection/mutable/BufferProxy.scala @@ -84,7 +84,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy { * * @param elem the element to append. */ - def +:(elem: A): Buffer[A] = self.+:(elem) + def +=:(elem: A): Buffer[A] = self.+=:(elem) /** Prepends a number of elements provided by an iterable object * via its iterator method. The identity of the diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index fa8d777977..483c516e30 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -114,7 +114,7 @@ final class ListBuffer[A] * @param x the element to prepend. * @return this buffer. */ - def +: (x: A): this.type = { + def +=: (x: A): this.type = { if (exported) copy() val newElem = new :: (x, start) if (start.isEmpty) last0 = newElem diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala index 200ffbb223..e1cd8ace4d 100644 --- a/src/library/scala/collection/mutable/ObservableBuffer.scala +++ b/src/library/scala/collection/mutable/ObservableBuffer.scala @@ -36,8 +36,8 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] this } - abstract override def +:(element: A): this.type = { - super.+:(element) + abstract override def +=:(element: A): this.type = { + super.+=:(element) publish(new Include(Start, element) with Undoable { def undo() { trimStart(1) } }) diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala index a089572f98..7da96f1e61 100644 --- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala +++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala @@ -95,8 +95,8 @@ trait SynchronizedBuffer[A] extends Buffer[A] { * * @param elem the element to append. */ - abstract override def +:(elem: A): Buffer[A] = synchronized { - super.+:(elem) + abstract override def +=:(elem: A): Buffer[A] = synchronized { + super.+=:(elem) } /** Prepends a number of elements provided by an iterable object diff --git a/src/swing/scala/swing/BufferWrapper.scala b/src/swing/scala/swing/BufferWrapper.scala index c42ec10241..19d219b06d 100644 --- a/src/swing/scala/swing/BufferWrapper.scala +++ b/src/swing/scala/swing/BufferWrapper.scala @@ -37,6 +37,6 @@ protected[swing] abstract class BufferWrapper[A] extends Buffer[A] { outer => def apply(idx : Int) = outer.apply(idx) override def stringPrefix = outer.stringPrefix + "RO" } - def +:(a: A): this.type = { insertAt(0, a); this } + def +=:(a: A): this.type = { insertAt(0, a); this } def iterator = Iterator.range(0,length).map(apply(_)) } diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala index 5c931c469d..9a1f0ec6f1 100644 --- a/src/swing/scala/swing/Publisher.scala +++ b/src/swing/scala/swing/Publisher.scala @@ -138,7 +138,7 @@ abstract class RefBuffer[A <: AnyRef] extends Buffer[A] with SingleRefCollection protected val underlying: Buffer[Reference[A]] def +=(el: A): this.type = { purgeReferences(); underlying += Ref(el); this } - def +:(el: A) = { purgeReferences(); Ref(el) +: underlying; this } + def +=:(el: A) = { purgeReferences(); Ref(el) +: underlying; this } def remove(el: A) { underlying -= Ref(el); purgeReferences(); } def remove(n: Int) = { val el = apply(n); remove(el); el } def insertAll(n: Int, iter: Iterable[A]) { -- cgit v1.2.3