massive new collections checkin.

8 files changed, 14 insertions, 15 deletions

diff --git a/src/swing/scala/swing/BufferWrapper.scala b/src/swing/scala/swing/BufferWrapper.scala
index de5b2b0b81..ce97123aff 100644
--- a/src/swing/scala/swing/BufferWrapper.scala
+++ b/src/swing/scala/swing/BufferWrapper.scala
@@ -11,9 +11,9 @@ protected[swing] abstract class BufferWrapper[A] extends Buffer[A] { outer =>
     remove(0)
     insertAt(n, a)
   }
-  def insertAll(n: Int, iter: Iterable[A]) {
+  def insertAll(n: Int, elems: scala.collection.Traversible[A]) {
     var i = n
-    for(el <- iter) {
+    for (el <- elems) {
       insertAt(i, el)
       i += 1
     }
diff --git a/src/swing/scala/swing/ButtonGroup.scala b/src/swing/scala/swing/ButtonGroup.scala
index 39700540d5..b0fad49988 100644
--- a/src/swing/scala/swing/ButtonGroup.scala
+++ b/src/swing/scala/swing/ButtonGroup.scala
@@ -18,7 +18,7 @@ class ButtonGroup(initialButtons: AbstractButton*) {
     def -=(b: AbstractButton) { peer.remove(b.peer) }
     def +=(b: AbstractButton) { peer.add(b.peer) }
     def contains(b: AbstractButton) = elements.contains(b)
-    def size = peer.getButtonCount
+    override def size = peer.getButtonCount
     def elements: Iterator[AbstractButton] = new Iterator[AbstractButton] {
       val enum = peer.getElements
       def next = Component.wrapperFor[AbstractButton](enum.nextElement)
diff --git a/src/swing/scala/swing/Container.scala b/src/swing/scala/swing/Container.scala
index 285d1965d7..03c581ecab 100644
--- a/src/swing/scala/swing/Container.scala
+++ b/src/swing/scala/swing/Container.scala
@@ -15,7 +15,7 @@ object Container {
     protected class Content extends BufferWrapper[Component] {
       def wrap(c: java.awt.Component): Component = Component.wrapperFor(c.asInstanceOf[javax.swing.JComponent])
       override def clear { peer.removeAll() }
-      def remove(n: Int): Component = {
+      override def remove(n: Int): Component = {
         val c = peer.getComponent(n)
         peer.remove(n)
         wrap(c)
@@ -50,4 +50,4 @@ trait Container extends UIElement {
    * The child components of this container.
    */
   def contents: Seq[Component]
-}
\ No newline at end of file
+}
diff --git a/src/swing/scala/swing/LayoutContainer.scala b/src/swing/scala/swing/LayoutContainer.scala
index d052b9d27a..b9a426d544 100644
--- a/src/swing/scala/swing/LayoutContainer.scala
+++ b/src/swing/scala/swing/LayoutContainer.scala
@@ -51,7 +51,7 @@ trait LayoutContainer extends Container.Wrapper {
       add(c, l)
     }
     def get(c: Component) = Swing.toOption(constraintsFor(c))
-    def size = peer.getComponentCount
+    override def size = peer.getComponentCount
     def elements: Iterator[(Component, Constraints)] =
       Iterator.range(0,size).map { c =>
         val comp = Component.wrapperFor[Component](peer.getComponent(c).asInstanceOf[JComponent])
diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala
index 81581a5a9e..3a01fb1c46 100644
--- a/src/swing/scala/swing/ListView.scala
+++ b/src/swing/scala/swing/ListView.scala
@@ -174,7 +174,7 @@ class ListView[A] extends Component {
       def -=(n: A)
       def +=(n: A)
       def contains(n: A) = a.contains(n)
-      def size = a.length
+      override def size = a.length
       def elements = a.elements
     }
 
@@ -193,7 +193,7 @@ class ListView[A] extends Component {
     /**
      * The currently selected items.
      */
-    object items extends SeqProxy[A] {
+    object items extends scala.collection.SequenceProxy[A] {
       def self = peer.getSelectedValues.map(_.asInstanceOf[A])
       def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex
       def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex
@@ -233,4 +233,4 @@ class ListView[A] extends Component {
     def intervalRemoved(e: ListDataEvent) { publish(ListElementsRemoved(ListView.this, e.getIndex0 to e.getIndex1)) }
     def intervalAdded(e: ListDataEvent) { publish(ListElementsAdded(ListView.this, e.getIndex0 to e.getIndex1)) }
   })
-}
\ No newline at end of file
+}
diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala
index 1db4ecaced..3dbc3f46ec 100644
--- a/src/swing/scala/swing/Publisher.scala
+++ b/src/swing/scala/swing/Publisher.scala
@@ -158,7 +158,7 @@ private[swing] abstract class RefSet[A <: AnyRef] extends Set[A] with SingleRefC
   def -=(el: A) { underlying -= Ref(el); purgeReferences() }
   def +=(el: A) { purgeReferences(); underlying += Ref(el) }
   def contains(el: A) = { purgeReferences(); underlying.contains(Ref(el)) }
-  def size = { purgeReferences(); underlying.size }
+  override def size = { purgeReferences(); underlying.size }
 
   protected[this] def removeReference(ref: Reference[A]) { underlying -= ref }
 }
diff --git a/src/swing/scala/swing/Slider.scala b/src/swing/scala/swing/Slider.scala
index 36e352bbc3..0819aff6c1 100644
--- a/src/swing/scala/swing/Slider.scala
+++ b/src/swing/scala/swing/Slider.scala
@@ -41,9 +41,8 @@ class Slider extends Component with Orientable with Publisher {
   def adjusting = peer.getValueIsAdjusting
 
   def labels: scala.collection.Map[Int, Label] =
-    new scala.collection.jcl.MapWrapper[Int, Label] {
-      def underlying = peer.getLabelTable.asInstanceOf[java.util.Hashtable[Int, Label]]
-    }
+    new scala.collection.JavaConversions.JMapWrapper[Int, Label](
+      peer.getLabelTable.asInstanceOf[java.util.Hashtable[Int, Label]])
   def labels_=(l: scala.collection.Map[Int, Label]) {
     val table = new java.util.Hashtable[Any, Any]
     for ((k,v) <- l) table.put(k, v)
@@ -55,4 +54,4 @@ class Slider extends Component with Orientable with Publisher {
       publish(ValueChanged(Slider.this))
     }
   })
-}
\ No newline at end of file
+}
diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index 915f879264..17025c4454 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -163,7 +163,7 @@ class Table extends Component with Scrollable with Publisher {
       def -=(n: A)
       def +=(n: A)
       def contains(n: A) = a.contains(n)
-      def size = a.length
+      override def size = a.length
       def elements = a.elements
     }