diff options
author | schinz <schinz@epfl.ch> | 2005-01-25 10:44:57 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2005-01-25 10:44:57 +0000 |
commit | 16856ead749a8bc74471a016f12ec8e5965c3303 (patch) | |
tree | 91e3f6a760e77e4e497f54e544856e8b56fb56e4 | |
parent | 9d73819ae72a83f0aaeb096c1fe7dd8f9aa05ca1 (diff) | |
download | scala-16856ead749a8bc74471a016f12ec8e5965c3303.tar.gz scala-16856ead749a8bc74471a016f12ec8e5965c3303.tar.bz2 scala-16856ead749a8bc74471a016f12ec8e5965c3303.zip |
- moved Entry class outside (to avoid the outer...
- moved Entry class outside (to avoid the outer link, which can cause
pattern-matching problems with run time types, and is useless)
-rw-r--r-- | sources/scala/collection/mutable/DefaultMapModel.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sources/scala/collection/mutable/DefaultMapModel.scala b/sources/scala/collection/mutable/DefaultMapModel.scala index d6d1227a15..a9d9b32376 100644 --- a/sources/scala/collection/mutable/DefaultMapModel.scala +++ b/sources/scala/collection/mutable/DefaultMapModel.scala @@ -18,6 +18,7 @@ package scala.collection.mutable; * @version 1.0, 08/07/2003 */ trait DefaultMapModel[A, B] extends scala.collection.mutable.Map[A, B] { + protected type Entry = DefaultEntry[A,B]; protected def findEntry(key: A): Option[Entry]; @@ -40,12 +41,11 @@ trait DefaultMapModel[A, B] extends scala.collection.mutable.Map[A, B] { def hasNext = iter.hasNext; def next = iter.next.toPair; } +} - protected class Entry(k: A, v: B) with java.io.Serializable { - def key = k; - var value = v; - def toPair = Pair(k, value); - override def toString() = k.toString() + " -> " + value; - } - +protected class DefaultEntry[A,B](k: A, v: B) with java.io.Serializable { + def key = k; + var value = v; + def toPair = Pair(k, value); + override def toString() = k.toString() + " -> " + value; } |