From e91bb354f4a28c4c534b6f237b20a4c8edc977c2 Mon Sep 17 00:00:00 2001
From: Sean McDirmid <sean.mcdirmid@gmail.com>
Date: Sun, 22 Apr 2007 02:46:34 +0000
Subject: Fixing linearization issue in JCL.

---
 src/library/scala/collection/jcl/HashSet.scala          | 2 +-
 src/library/scala/collection/jcl/LinkedHashSet.scala    | 2 +-
 src/library/scala/collection/jcl/SetWrapper.scala       | 2 +-
 src/library/scala/collection/jcl/SortedSetWrapper.scala | 1 +
 src/library/scala/collection/jcl/TreeSet.scala          | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/library/scala/collection/jcl/HashSet.scala b/src/library/scala/collection/jcl/HashSet.scala
index 900b7008ac..4f5848c209 100644
--- a/src/library/scala/collection/jcl/HashSet.scala
+++ b/src/library/scala/collection/jcl/HashSet.scala
@@ -14,7 +14,7 @@ package scala.collection.jcl;
  *
  *  @author Sean McDirmid
  */
-class HashSet[A](override val underlying: java.util.HashSet) extends CollectionWrapper[A] with SetWrapper[A] {
+class HashSet[A](override val underlying: java.util.HashSet) extends SetWrapper[A] {
   /** Creates an underlying Java hash set. */
   def this() = this(new java.util.HashSet);
 }
diff --git a/src/library/scala/collection/jcl/LinkedHashSet.scala b/src/library/scala/collection/jcl/LinkedHashSet.scala
index 3bd26a8b5b..57f0d737d5 100644
--- a/src/library/scala/collection/jcl/LinkedHashSet.scala
+++ b/src/library/scala/collection/jcl/LinkedHashSet.scala
@@ -15,6 +15,6 @@ package scala.collection.jcl;
  *
  *  @author Sean McDirmid
  */
-class LinkedHashSet[A](override val underlying: java.util.LinkedHashSet) extends CollectionWrapper[A] with SetWrapper[A] {
+class LinkedHashSet[A](override val underlying: java.util.LinkedHashSet) extends SetWrapper[A] {
   def this() = this(new java.util.LinkedHashSet);
 }
diff --git a/src/library/scala/collection/jcl/SetWrapper.scala b/src/library/scala/collection/jcl/SetWrapper.scala
index 77113800d5..5b1ba751e4 100644
--- a/src/library/scala/collection/jcl/SetWrapper.scala
+++ b/src/library/scala/collection/jcl/SetWrapper.scala
@@ -14,7 +14,7 @@ package scala.collection.jcl;
  *
  *  @author Sean McDirmid
  */
-trait SetWrapper[A] extends CollectionWrapper[A] with Set[A] {
+trait SetWrapper[A] extends Set[A] with CollectionWrapper[A] {
   protected def underlying: java.util.Set;
   override def isEmpty = super[CollectionWrapper].isEmpty;
   override def clear() = super[CollectionWrapper].clear;
diff --git a/src/library/scala/collection/jcl/SortedSetWrapper.scala b/src/library/scala/collection/jcl/SortedSetWrapper.scala
index 7e1af55690..f923a14019 100644
--- a/src/library/scala/collection/jcl/SortedSetWrapper.scala
+++ b/src/library/scala/collection/jcl/SortedSetWrapper.scala
@@ -35,4 +35,5 @@ trait SortedSetWrapper[A] extends SortedSet[A] with SetWrapper[A] {
     }
     override def elements : MutableIterator[A] = super[SortedSetWrapper].elements;
   }
+  override def toString = super.toString;
 }
diff --git a/src/library/scala/collection/jcl/TreeSet.scala b/src/library/scala/collection/jcl/TreeSet.scala
index 4ce84fa79e..55d4943a7c 100644
--- a/src/library/scala/collection/jcl/TreeSet.scala
+++ b/src/library/scala/collection/jcl/TreeSet.scala
@@ -15,6 +15,6 @@ package scala.collection.jcl;
  *
  *  @author Sean McDirmid
  */
-class TreeSet[A <% Ordered[A]] extends CollectionWrapper[A] with SortedSetWrapper[A] {
+class TreeSet[A <% Ordered[A]] extends SortedSetWrapper[A] {
   val underlying = new java.util.TreeSet(new Comparator[A]);
 }
-- 
cgit v1.2.3