diff options
| author | mihaylov <mihaylov@epfl.ch> | 2006-01-19 17:14:21 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2006-01-19 17:14:21 +0000 |
| commit | b9a2da1e41e040a18f4e0ed67d3fbe9d88ae9c13 (patch) | |
| tree | 498ca4006d6ee8450abbea7a9ca7972da8aa636f /src/library | |
| parent | 8a41146ae3528dfb246887f939dcbdf583deb42b (diff) | |
| download | scala-b9a2da1e41e040a18f4e0ed67d3fbe9d88ae9c13.tar.gz scala-b9a2da1e41e040a18f4e0ed67d3fbe9d88ae9c13.tar.bz2 scala-b9a2da1e41e040a18f4e0ed67d3fbe9d88ae9c13.zip | |
Use attributes instead of java.lang.Cloneable, ...
Use attributes instead of java.lang.Cloneable, java.io.Serializable
Diffstat (limited to 'src/library')
5 files changed, 19 insertions, 14 deletions
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index 3a7ee2b575..ba67e1fa7d 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -26,7 +26,8 @@ object Array { } } -final class Array[A](_length: Int) extends Cloneable with java.io.Serializable with Seq[A] { +[cloneable,serializable] +final class Array[A](_length: Int) extends Seq[A] { def length: Int = throw new Error(); def apply(i: Int): A = throw new Error(); def update(i: Int, x: A): Unit = throw new Error(); diff --git a/src/library/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala index fdb3f8cf46..5aa4312027 100644 --- a/src/library/scala/collection/immutable/Tree.scala +++ b/src/library/scala/collection/immutable/Tree.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -59,8 +59,9 @@ package scala.collection.immutable; * @author Michel Schinz * @version 1.1, 2005-01-20 */ -//[serializable] -abstract class Tree[A <% Ordered[A], B]() extends AnyRef with java.io.Serializable { + +[serializable] +abstract class Tree[A <% Ordered[A], B]() extends AnyRef { /* Data structure: ** - size:Int - the number of elements in the tree. ** - tree:T, which is composed of nodes of the form: diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index 12814b7a41..a06a316ff3 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -19,8 +19,9 @@ object TreeMap { * @author Matthias Zenger * @version 1.1, 03/05/2004 */ -//[serializable] -class TreeMap[A <% Ordered[A], B] extends Tree[A, Pair[A, B]] with Map[A, B] with java.io.Serializable { + +[serializable] +class TreeMap[A <% Ordered[A], B] extends Tree[A, Pair[A, B]] with Map[A, B] { override protected type This = TreeMap[A, B]; override protected def getThis: This = this; diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index bb3099e007..e61cfd3483 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -17,8 +17,9 @@ package scala.collection.immutable; * @author Burak Emir * @version 1.1, 03/05/2004 */ -//[serializable] -class TreeSet[A <% Ordered[A]]() extends Tree[A, A] with Set[A] with java.io.Serializable { + +[serializable] +class TreeSet[A <% Ordered[A]]() extends Tree[A, A] with Set[A] { override protected type This = TreeSet[A]; override protected def getThis: This = this; diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index e256d2dc5a..ab3fe5d12b 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -17,8 +17,9 @@ package scala.collection.mutable; * @author Matthias Zenger * @version 1.0, 03/05/2004 */ -//[serializable, cloneable] -class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] with java.io.Serializable { + +[serializable, cloneable] +class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] { size = size + 1; // we do not use array(0) protected def fixUp(as: Array[A], m: Int): Unit = { |