diff options
-rw-r--r-- | config/list/library.lst | 13 | ||||
-rw-r--r-- | sources/scala/collection/mutable/Inclusion.scala | 18 | ||||
-rw-r--r-- | sources/scala/collection/mutable/Modification.scala | 18 | ||||
-rw-r--r-- | sources/scala/collection/mutable/ObservableUpdate.scala | 20 | ||||
-rw-r--r-- | sources/scala/collection/mutable/Removal.scala | 19 | ||||
-rw-r--r-- | sources/scala/collection/mutable/Reset.scala | 17 | ||||
-rw-r--r-- | sources/scala/collection/mutable/Undo.scala | 24 | ||||
-rw-r--r-- | test/files/dis/List.check | 4 |
8 files changed, 9 insertions, 124 deletions
diff --git a/config/list/library.lst b/config/list/library.lst index 423268d726..1419df1c98 100644 --- a/config/list/library.lst +++ b/config/list/library.lst @@ -77,30 +77,31 @@ collection/mutable/HashTable.scala collection/mutable/History.scala collection/mutable/ImmutableMapAdaptor.scala collection/mutable/ImmutableSetAdaptor.scala -collection/mutable/Inclusion.scala collection/mutable/JavaMapAdaptor.scala collection/mutable/JavaSetAdaptor.scala collection/mutable/LinkedList.scala collection/mutable/ListBuffer.scala collection/mutable/Map.scala collection/mutable/MapProxy.scala -collection/mutable/Modification.scala +collection/mutable/Message.scala collection/mutable/MultiMap.scala collection/mutable/MutableList.scala +collection/mutable/ObservableBuffer.scala collection/mutable/ObservableMap.scala collection/mutable/ObservableSet.scala -collection/mutable/ObservableUpdate.scala collection/mutable/PriorityQueue.scala +collection/mutable/PriorityQueueProxy.scala collection/mutable/Publisher.scala collection/mutable/Queue.scala -collection/mutable/Removal.scala -collection/mutable/Reset.scala +collection/mutable/QueueProxy.scala collection/mutable/ResizableArray.scala collection/mutable/RevertableHistory.scala +collection/mutable/Scriptable.scala collection/mutable/Set.scala collection/mutable/SetProxy.scala collection/mutable/SingleLinkedList.scala collection/mutable/Stack.scala +collection/mutable/StackProxy.scala collection/mutable/Subscriber.scala collection/mutable/SynchronizedBuffer.scala collection/mutable/SynchronizedMap.scala @@ -108,7 +109,7 @@ collection/mutable/SynchronizedPriorityQueue.scala collection/mutable/SynchronizedQueue.scala collection/mutable/SynchronizedSet.scala collection/mutable/SynchronizedStack.scala -collection/mutable/Undo.scala +collection/mutable/Undoable.scala collection/immutable/ListMap.scala collection/immutable/ListSet.scala diff --git a/sources/scala/collection/mutable/Inclusion.scala b/sources/scala/collection/mutable/Inclusion.scala deleted file mode 100644 index e93f429095..0000000000 --- a/sources/scala/collection/mutable/Inclusion.scala +++ /dev/null @@ -1,18 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - -/** This observable update refers to inclusion operations that add new elements - * to collection classes. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -case class Inclusion[A](elem: A) extends ObservableUpdate[A]; diff --git a/sources/scala/collection/mutable/Modification.scala b/sources/scala/collection/mutable/Modification.scala deleted file mode 100644 index d83f445bee..0000000000 --- a/sources/scala/collection/mutable/Modification.scala +++ /dev/null @@ -1,18 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - -/** This observable update refers to destructive modification operations - * of elements from collection classes. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -case class Modification[A](old: A, nu: A) extends ObservableUpdate[A]; diff --git a/sources/scala/collection/mutable/ObservableUpdate.scala b/sources/scala/collection/mutable/ObservableUpdate.scala deleted file mode 100644 index f79a53d5a1..0000000000 --- a/sources/scala/collection/mutable/ObservableUpdate.scala +++ /dev/null @@ -1,20 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - -/** Observable update events are issued by observable collection classes - * whenever a data structure is changed. Class <code>ObservableUpdate</code> - * has several subclasses for the various kinds of events: <code>Modification</code> - * <code>Removal</code>, <code>Insertion</code>, and <code>Reset</code>. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -trait ObservableUpdate[+A]; diff --git a/sources/scala/collection/mutable/Removal.scala b/sources/scala/collection/mutable/Removal.scala deleted file mode 100644 index 4e2b9b921d..0000000000 --- a/sources/scala/collection/mutable/Removal.scala +++ /dev/null @@ -1,19 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - - -/** This observable update refers to removal operations of elements - * from collection classes. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -case class Removal[A](elem: A) extends ObservableUpdate[A]; diff --git a/sources/scala/collection/mutable/Reset.scala b/sources/scala/collection/mutable/Reset.scala deleted file mode 100644 index 9caabe73e6..0000000000 --- a/sources/scala/collection/mutable/Reset.scala +++ /dev/null @@ -1,17 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - -/** This observable update refers to reset operations. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -case class Reset[A]() extends ObservableUpdate[A]; diff --git a/sources/scala/collection/mutable/Undo.scala b/sources/scala/collection/mutable/Undo.scala deleted file mode 100644 index f67ba946b8..0000000000 --- a/sources/scala/collection/mutable/Undo.scala +++ /dev/null @@ -1,24 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -** $Id$ -\* */ - -package scala.collection.mutable; - - -/** Classes that implement the <code>Undo</code> trait provide an operation - * <code>undo</code> which can be used to undo the last operation. - * - * @author Matthias Zenger - * @version 1.0, 08/07/2003 - */ -trait Undo { - - /** Undo the last operation. - */ - def undo: Unit; -} diff --git a/test/files/dis/List.check b/test/files/dis/List.check index e6c3f3c122..194a9f7c0a 100644 --- a/test/files/dis/List.check +++ b/test/files/dis/List.check @@ -32,8 +32,8 @@ sealed trait List[+a] extends scala.Seq[a] with scala.ScalaObject { def splitAt(scala.Int): scala.Tuple2[scala.List[a], scala.List[a]]; def dropRight(scala.Int): scala.List[a]; def takeRight(scala.Int): scala.List[a]; - def drop(scala.Int): scala.List[a]; - def take(scala.Int): scala.List[a]; + override def drop(scala.Int): scala.List[a]; + override def take(scala.Int): scala.List[a]; def last: a; def init: scala.List[a]; def elements: scala.Iterator[a]; |