Fixed problem with `remove` in JavaConversions ...

Fixed problem with `remove` in JavaConversions which affected Java set
and map wrappers and which was noted on the scala list.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index c1a39e0332..80fc28e234 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -542,7 +542,7 @@ de> view of the argument.
       def next = { val e = ui.next ; prev = Some(e) ; e }
       def remove = prev match {
         case Some(e) =>
-          self match {
+          underlying match {
             case ms: mutable.Set[a] =>
               ms.remove(e.asInstanceOf[a])
               prev = None
@@ -618,7 +618,7 @@ de> view of the argument.
 
         def remove = prev match {
           case Some(k) =>
-            self match {
+            underlying match {
               case mm: mutable.Map[a, _] =>
                 val v = mm.remove(k.asInstanceOf[a])
                 prev = None
diff --git a/src/library/scala/collection/generic/FilterMonadic.scala b/src/library/scala/collection/generic/FilterMonadic.scala
index abf2e0355d..45bba19e96 100755
--- a/src/library/scala/collection/generic/FilterMonadic.scala
+++ b/src/library/scala/collection/generic/FilterMonadic.scala
@@ -1,7 +1,7 @@
 package scala.collection.generic
 
 /** A template trait that contains just the `map`, `flatMap`, `foreach` and `withFilter` methods
- *  of trait `TraverableLike`.
+ *  of trait `TraversableLike`.
  */
 trait FilterMonadic[+A, +Repr] {
   def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): That