Collections refactoring.

1 files changed, 53 insertions, 0 deletions

diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala
new file mode 100644
index 0000000000..7a9b98bd97
--- /dev/null
+++ b/src/library/scala/collection/MapProxyLike.scala
@@ -0,0 +1,53 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+package scala.collection
+
+import generic._
+
+// Methods could be printed by  cat MapLike.scala | egrep '^  (override )?def'
+
+/** This trait implements a proxy for iterable objects. It forwards
+ *  all calls to a different iterable object
+ *
+ *  @author  Martin Odersky
+ *  @version 2.8
+ */
+trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]]
+      extends MapLike[A, B, This]
+      with IterableProxyLike[(A, B), This]
+{
+  // def empty: This
+  // def + [B1 >: B] (kv: (A, B1)): Map[A, B1]
+  // def - (key: A): This
+
+  override def get(key: A): Option[B] = self.get(key)
+  override def iterator: Iterator[(A, B)] = self.iterator
+  override def isEmpty: Boolean = self.isEmpty
+  override def getOrElse[B1 >: B](key: A, default: => B1): B1 = self.getOrElse(key, default)
+  override def apply(key: A): B = self.apply(key)
+  override def contains(key: A): Boolean = self.contains(key)
+  override def isDefinedAt(key: A) = self.isDefinedAt(key)
+  override def keySet: Set[A] = self.keySet
+  override def keysIterator: Iterator[A] = self.keysIterator
+  override def keys: Iterator[A] = self.keysIterator
+  override def valueIterable: Iterable[B] = self.valueIterable
+  override def valuesIterator: Iterator[B] = self.valuesIterator
+  override def values: Iterator[B] = self.valuesIterator
+  override def default(key: A): B = self.default(key)
+  override def filterKeys(p: A => Boolean) = self.filterKeys(p)
+  override def mapValues[C](f: B => C) = self.mapValues(f)
+
+  // override def updated [B1 >: B](key: A, value: B1) = self + ((key, value))
+  // override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = self.+(elem1, elem2, elems: _*)
+  // override def ++[B1 >: B](elems: Traversable[(A, B1)]) = self.++(elems)
+  // override def ++[B1 >: B](iter: Iterator[(A, B1)]) = self.++(iter)
+
+  override def addString(b: StringBuilder, start: String, sep: String, end: String): StringBuilder =
+    self.addString(b, start, sep, end)
+}