diff options
author | Martin Odersky <odersky@gmail.com> | 2007-02-21 19:10:41 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2007-02-21 19:10:41 +0000 |
commit | 914932babf9343fdfcec20f25bfb1576dc8c433b (patch) | |
tree | 088e404a21862209be434b0236c34e4576042c51 /src/library/scala/collection/mutable/ObservableBuffer.scala | |
parent | cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89 (diff) | |
download | scala-914932babf9343fdfcec20f25bfb1576dc8c433b.tar.gz scala-914932babf9343fdfcec20f25bfb1576dc8c433b.tar.bz2 scala-914932babf9343fdfcec20f25bfb1576dc8c433b.zip |
Removed Pair(...), Triple(...).
Diffstat (limited to 'src/library/scala/collection/mutable/ObservableBuffer.scala')
-rw-r--r-- | src/library/scala/collection/mutable/ObservableBuffer.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala index 57f474f6e8..e1c98a1e85 100644 --- a/src/library/scala/collection/mutable/ObservableBuffer.scala +++ b/src/library/scala/collection/mutable/ObservableBuffer.scala @@ -24,13 +24,13 @@ package scala.collection.mutable */ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This extends Buffer[A] - with Publisher[Message[Pair[Location, A]] + with Publisher[Message[(Location, A)] with Undoable, This] { abstract override def +(element: A): Buffer[A] = { super.+(element) - publish(new Include(Pair(End, element)) with Undoable { + publish(new Include((End, element)) with Undoable { def undo: Unit = trimEnd(1) }) this @@ -38,7 +38,7 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This abstract override def +:(element: A): Buffer[A] = { super.+:(element); - publish(new Include(Pair(Start, element)) with Undoable { + publish(new Include((Start, element)) with Undoable { def undo: Unit = trimStart(1) }) this @@ -49,7 +49,7 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This var i = n val it = iter.elements while (it.hasNext) { - publish(new Include(Pair(Index(i), it.next)) with Undoable { + publish(new Include((Index(i), it.next)) with Undoable { def undo: Unit = remove(i); }) i = i + 1 @@ -59,7 +59,7 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This abstract override def update(n: Int, newelement: A): Unit = { val oldelement = apply(n) super.update(n, newelement) - publish(new Update(Pair(Index(n), newelement)) with Undoable { + publish(new Update((Index(n), newelement)) with Undoable { def undo: Unit = update(n, oldelement) }) } @@ -67,7 +67,7 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This abstract override def remove(n: Int): A = { val oldelement = apply(n) super.remove(n) - publish(new Remove(Pair(Index(n), oldelement)) with Undoable { + publish(new Remove((Index(n), oldelement)) with Undoable { def undo: Unit = insert(n, oldelement) }) oldelement |