In "Iterable" and in all its subclasses, "itera...

In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).

1 files changed, 5 insertions, 3 deletions

diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala
index 4b30ce5d4b..61c9b50568 100644
--- a/src/library/scala/collection/mutable/SynchronizedMap.scala
+++ b/src/library/scala/collection/mutable/SynchronizedMap.scala
@@ -21,7 +21,7 @@ package scala.collection.mutable
 trait SynchronizedMap[A, B] extends Map[A, B] {
 
   abstract override def get(key: A): Option[B] = synchronized { super.get(key) }
-  abstract override def elements: Iterator[(A, B)] = synchronized { super.elements }
+  abstract override def iterator: Iterator[(A, B)] = synchronized { super.iterator }
   abstract override def += (kv: (A, B)): this.type = synchronized[this.type] { super.+=(kv) }
   abstract override def -= (key: A): this.type = synchronized[this.type] { super.-=(key) }
 
@@ -33,11 +33,13 @@ trait SynchronizedMap[A, B] extends Map[A, B] {
   override def getOrElseUpdate(key: A, default: => B): B = synchronized { super.getOrElseUpdate(key, default) }
   override def transform(f: (A, B) => B): this.type = synchronized[this.type] { super.transform(f) }
   override def retain(p: (A, B) => Boolean): this.type = synchronized[this.type] { super.retain(p) }
-  override def valueSet = synchronized { super.valueSet }
+  override def values: collection.immutable.Set[B] = synchronized { super.values }
+  override def valuesIterator: Iterator[B] = synchronized { super.valuesIterator }
   override def clone() = synchronized { super.clone() }
   override def foreach[U](f: ((A, B)) => U) = synchronized { super.foreach(f) }
   override def apply(key: A): B = synchronized { super.apply(key) }
-  override def keys: Iterator[A] = synchronized { super.keys }
+  override def keys: collection.Set[A] = synchronized { super.keys }
+  override def keysIterator: Iterator[A] = synchronized { super.keysIterator }
   override def isEmpty: Boolean = synchronized { super.isEmpty }
   override def contains(key: A): Boolean = synchronized {super.contains(key) }
   override def isDefinedAt(key: A) = synchronized { super.isDefinedAt(key) }