The definition of put in Maps was broken.

since there is no correct definition of this former function.

4 files changed, 4 insertions, 28 deletions

diff --git a/sources/scala/ImmutableMap.scala b/sources/scala/ImmutableMap.scala
index 455c8b2458..7182d18e78 100644
--- a/sources/scala/ImmutableMap.scala
+++ b/sources/scala/ImmutableMap.scala
@@ -17,9 +17,7 @@ trait ImmutableMap[A, B, This <: ImmutableMap[A, B, This]]: This with Map[A, B]
 
     def clear: This;
 
-    def put(key: A, value: B): This = update(key, value);
-
-    def putAll(mappings: Pair[A, B]*): This = putMap(mappings);
+    def put(mappings: Pair[A, B]*): This = putMap(mappings);
 
     def putMap(map: Iterable[Pair[A, B]]): This = {
         val iter = map.elements;
diff --git a/sources/scala/MutableMap.scala b/sources/scala/MutableMap.scala
index 72e837f33c..3533edcc47 100644
--- a/sources/scala/MutableMap.scala
+++ b/sources/scala/MutableMap.scala
@@ -24,13 +24,7 @@ trait MutableMap[A, B] with Map[A, B] {
         }
     }
 
-    def put(key: A, value: B): B = {
-        val old = apply(key);
-        update(key, value);
-        old;
-    }
-
-    def putAll(mappings: Pair[A, B]*) = {
+    def put(mappings: Pair[A, B]*): Unit = {
         val ys = mappings as List[Pair[A, B]];
         ys foreach { case Pair(key, value) => update(key, value); };
     }
diff --git a/sources/scala/Predef.scala b/sources/scala/Predef.scala
index 895b3087cc..f835fdd64a 100644
--- a/sources/scala/Predef.scala
+++ b/sources/scala/Predef.scala
@@ -15,19 +15,7 @@ object Predef {
     def List[A](x: A*): List[A] = x as List[A];
     val List = scala.List;
 
-    def Set[A](es: A*): Set[A] = {
-        val set = new HashSet[A];
-        set.addSet(es);
-        set;
-    }
-
-    def ListSet[A](es: A*): Set[A] = {
-        val set = new ListSet[A];
-        set.addSet(es);
-        set;
-    }
-
-    def HashSet[A](es: A*): Set[A] = {
+    def Set[A](es: A*): MutableSet[A] = {
         val set = new HashSet[A];
         set.addSet(es);
         set;
diff --git a/sources/scala/SynchronizedMap.scala b/sources/scala/SynchronizedMap.scala
index 7cec8c1aef..a710fcf761 100644
--- a/sources/scala/SynchronizedMap.scala
+++ b/sources/scala/SynchronizedMap.scala
@@ -64,11 +64,7 @@ trait SynchronizedMap[A, B] extends MutableMap[A, B] with Monitor {
         super.clear;
     }
 
-    override def put(key: A, value: B): B = synchronized {
-        super.put(key, value);
-    }
-
-    override def putAll(mappings: Pair[A, B]*) = synchronized {
+    override def put(mappings: Pair[A, B]*) = synchronized {
         super.putMap(mappings);
     }