added options to scaladoc Ant task

removed several unchecked warnings

2 files changed, 26 insertions, 25 deletions

diff --git a/src/library/scala/collection/SortedSet.scala b/src/library/scala/collection/SortedSet.scala
index 8e605a61ce..058876c974 100644
--- a/src/library/scala/collection/SortedSet.scala
+++ b/src/library/scala/collection/SortedSet.scala
@@ -41,7 +41,7 @@ trait SortedSet[A] extends Set[A] with Sorted[A, A] {
   override def range(from: A, until: A) = rangeImpl(Some(from),Some(until))
 
   override def subsetOf(that: Set[A]): Boolean = that match {
-    case that: SortedSet[A] => that.hasAll(elements)
+    case that: SortedSet[_] => that.hasAll(elements)
     case that => super.subsetOf(that)
   }
 
diff --git a/src/library/scala/collection/jcl/Set.scala b/src/library/scala/collection/jcl/Set.scala
index bed84a8462..975b76a167 100644
--- a/src/library/scala/collection/jcl/Set.scala
+++ b/src/library/scala/collection/jcl/Set.scala
@@ -1,14 +1,14 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2006-2007, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
 \*                                                                      */
 
 // $Id$
 
-package scala.collection.jcl;
+package scala.collection.jcl
 
 /** Analogous to a Java set.
  *
@@ -17,37 +17,38 @@ package scala.collection.jcl;
 trait Set[A] extends Collection[A] with scala.collection.mutable.Set[A] {
 
   /** Add will return false if "a" already exists in the set. **/
-  override def add(a : A) : Boolean;
-
-  override def ++(i : Iterable[A]) : this.type = super[Collection].++(i);
-  override def --(i : Iterable[A]) : this.type = super[Collection].--(i);
-  override def +(t : A) : this.type = super[Collection].+(t);
-  override def -(t : A) : this.type = super[Collection].-(t);
-  override def retain(f : A => Boolean) = super[Collection].retain(f);
-  override def isEmpty = super[Collection].isEmpty;
-  override final def contains(a : A) = has(a);
-  override def clear() = super.clear();
+  override def add(a: A): Boolean
+
+  override def ++(i: Iterable[A]) : this.type = super[Collection].++(i)
+  override def --(i: Iterable[A]) : this.type = super[Collection].--(i)
+  override def +(t: A) : this.type = super[Collection].+(t)
+  override def -(t: A) : this.type = super[Collection].-(t)
+  override def retain(f: A => Boolean) = super[Collection].retain(f)
+  override def isEmpty = super[Collection].isEmpty
+  override final def contains(a: A) = has(a)
+  override def clear() = super.clear()
   override def subsetOf(set : scala.collection.Set[A]) = set match {
-  case set : Set[A] => set.hasAll(this);
-  case set => super.subsetOf(set);
+    case set : Set[_] => set.hasAll(this)
+    case set => super.subsetOf(set)
   }
 
-  override def transform(f : A => A) = {
-    var toAdd : List[A] = Nil;
-    val i = elements;
+  override def transform(f: A => A) = {
+    var toAdd : List[A] = Nil
+    val i = elements
     while (i.hasNext) {
-      val i0 = i.next;
-      val i1 = f(i0);
+      val i0 = i.next
+      val i1 = f(i0)
       if (i0 != i1) {
-        i.remove; toAdd = i1 :: toAdd;
+        i.remove; toAdd = i1 :: toAdd
       }
     }
-    addAll(toAdd);
+    addAll(toAdd)
   }
 
-  override def pfilter(p : A => Boolean) : Set[A] = new Filter(p);
-  class Filter(p : A => Boolean) extends super.Filter(p) with Set[A] {
-    override def filter(p : A => Boolean): scala.collection.mutable.Set[A] = {
+  override def pfilter(p: A => Boolean): Set[A] = new Filter(p)
+
+  class Filter(p: A => Boolean) extends super.Filter(p) with Set[A] {
+    override def filter(p: A => Boolean): scala.collection.mutable.Set[A] = {
       super[Set].retain(p)
       this
     }