2 files changed, 19 insertions, 7 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala
index db0c6ac50a..057faa66e1 100644
--- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala
+++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala
@@ -4,16 +4,16 @@ package mutable
 
 
 
+import collection.generic._
 
 
 
 
 
-/*
-class ParHashMap[K, +V]
+class ParHashMap[K, V]
 extends ParMap[K, V]
    with GenericParMapTemplate[K, V, ParHashMap]
-   with ParMapLike[K, V]
+   with ParMapLike[K, V, ParHashMap[K, V], collection.mutable.HashMap[K, V]]
 {
 self =>
 
@@ -25,18 +25,30 @@ self =>
 
   def seq = null // TODO
 
+  def get(k: K): Option[V] = null // TODO
 
+  def +=(kv: (K, V)) = null // TODO
+
+  def -=(k: K) = null // TODO
+
+  override def size = 0 // TODO
 
 }
 
 
 
 
-object ParHashMap {
+object ParHashMap extends ParMapFactory[ParHashMap] {
+
+  def empty[K, V]: ParHashMap[K, V] = new ParHashMap[K, V]
+
+  def newCombiner[K, V]: Combiner[(K, V), ParHashMap[K, V]] = null // TODO
+
+  implicit def canBuildFrom[K, V]: CanCombineFrom[Coll, (K, V), ParHashMap[K, V]] = null // TODO
 
 }
 
-*/
+
 
 
 
diff --git a/src/library/scala/collection/parallel/mutable/ParMap.scala b/src/library/scala/collection/parallel/mutable/ParMap.scala
index c5fccf45ae..63342fa1bc 100644
--- a/src/library/scala/collection/parallel/mutable/ParMap.scala
+++ b/src/library/scala/collection/parallel/mutable/ParMap.scala
@@ -11,9 +11,9 @@ import collection.parallel.Combiner
 trait ParMap[K, V]
 extends collection.mutable.Map[K, V]
    with collection.parallel.ParMap[K, V]
-   with ParIterable[(K, V)]
+   with /* mutable */ ParIterable[(K, V)]
    with GenericParMapTemplate[K, V, ParMap]
-   with ParMapLike[K, V, ParMap[K, V], collection.mutable.Map[K, V]]
+   with /* mutable */ ParMapLike[K, V, ParMap[K, V], collection.mutable.Map[K, V]]
 {
 
   override def mapCompanion: GenericParMapCompanion[ParMap] = ParMap