From cc5e79c9ec9cea8d0f22020b528877d8f6e00153 Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Wed, 27 May 2009 19:35:02 +0000
Subject: In "Iterable" and in all its subclasses, "itera...

In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).
---
 src/swing/scala/swing/BufferWrapper.scala   | 2 +-
 src/swing/scala/swing/ButtonGroup.scala     | 4 ++--
 src/swing/scala/swing/LayoutContainer.scala | 2 +-
 src/swing/scala/swing/ListView.scala        | 4 ++--
 src/swing/scala/swing/Publisher.scala       | 6 +++---
 src/swing/scala/swing/Table.scala           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/swing')

diff --git a/src/swing/scala/swing/BufferWrapper.scala b/src/swing/scala/swing/BufferWrapper.scala
index ad2f5d4278..9e563e230e 100644
--- a/src/swing/scala/swing/BufferWrapper.scala
+++ b/src/swing/scala/swing/BufferWrapper.scala
@@ -26,5 +26,5 @@ protected[swing] abstract class BufferWrapper[A] extends Buffer[A] { outer =>
     override def stringPrefix = outer.stringPrefix + "RO"
   }
   def +:(a: A): this.type = { insertAt(0, a); this }
-  def elements = Iterator.range(0,length).map(apply(_))
+  def iterator = Iterator.range(0,length).map(apply(_))
 }
diff --git a/src/swing/scala/swing/ButtonGroup.scala b/src/swing/scala/swing/ButtonGroup.scala
index 4b5eeab74c..0f518d4ddc 100644
--- a/src/swing/scala/swing/ButtonGroup.scala
+++ b/src/swing/scala/swing/ButtonGroup.scala
@@ -17,9 +17,9 @@ class ButtonGroup(initialButtons: AbstractButton*) {
   val buttons: mutable.Set[AbstractButton] = new mutable.Set[AbstractButton] {
     def -=(b: AbstractButton): this.type = { peer.remove(b.peer); this }
     def +=(b: AbstractButton): this.type = { peer.add(b.peer); this }
-    def contains(b: AbstractButton) = elements.contains(b)
+    def contains(b: AbstractButton) = this.iterator.contains(b)
     override def size = peer.getButtonCount
-    def elements: Iterator[AbstractButton] = new Iterator[AbstractButton] {
+    def iterator: Iterator[AbstractButton] = new Iterator[AbstractButton] {
       val enum = peer.getElements
       def next = Component.wrapperFor[AbstractButton](enum.nextElement)
       def hasNext = enum.hasMoreElements
diff --git a/src/swing/scala/swing/LayoutContainer.scala b/src/swing/scala/swing/LayoutContainer.scala
index e05273ab5f..1526c7ed7e 100644
--- a/src/swing/scala/swing/LayoutContainer.scala
+++ b/src/swing/scala/swing/LayoutContainer.scala
@@ -54,7 +54,7 @@ trait LayoutContainer extends Container.Wrapper {
     }
     def get(c: Component) = Swing.toOption(constraintsFor(c))
     override def size = peer.getComponentCount
-    def elements: Iterator[(Component, Constraints)] =
+    def iterator: Iterator[(Component, Constraints)] =
       Iterator.range(0,size).map { c =>
         val comp = Component.wrapperFor[Component](peer.getComponent(c).asInstanceOf[JComponent])
         (comp, constraintsFor(comp))
diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala
index fe9f34de57..ec61bb6908 100644
--- a/src/swing/scala/swing/ListView.scala
+++ b/src/swing/scala/swing/ListView.scala
@@ -150,7 +150,7 @@ class ListView[A] extends Component {
     case model: ModelWrapper => model.items
     case model @ _ => new Seq[A] {
      def length = model.getSize
-     def elements = new Iterator[A] {
+     def iterator = new Iterator[A] {
        var idx = 0
        def next = { idx += 1; apply(idx-1) }
        def hasNext = idx < length
@@ -175,7 +175,7 @@ class ListView[A] extends Component {
       def +=(n: A): this.type
       def contains(n: A) = a.contains(n)
       override def size = a.length
-      def elements = a.elements
+      def iterator = a.iterator
     }
 
     /**
diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala
index f586af8813..338fa838c7 100644
--- a/src/swing/scala/swing/Publisher.scala
+++ b/src/swing/scala/swing/Publisher.scala
@@ -90,8 +90,8 @@ private[swing] trait SingleRefCollection[+A <: AnyRef] extends Collection[A] { s
 
   protected[this] def removeReference(ref: Reference[A])
 
-  def elements = new Iterator[A] {
-    private val elems = self.underlying.elements
+  def iterator = new Iterator[A] {
+    private val elems = self.underlying.iterator
     private var hd: A = _
     private var ahead: Boolean = false
     private def skip: Unit =
@@ -134,7 +134,7 @@ abstract class RefBuffer[A <: AnyRef] extends Buffer[A] with SingleRefCollection
   def update(n: Int, el: A) { purgeReferences(); underlying(n) = Ref(el) }
   def readOnly : Seq[A] = new Seq[A] {
     def length = self.length
-    def elements = self.elements
+    def iterator = self.iterator
     def apply(n: Int) = self(n)
   }
   def apply(n: Int) = {
diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index f9568782c3..2a40a635ab 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -164,7 +164,7 @@ class Table extends Component with Scrollable with Publisher {
       def +=(n: A): this.type
       def contains(n: A) = a.contains(n)
       override def size = a.length
-      def elements = a.elements
+      def iterator = a.iterator
     }
 
     object rows extends SelectionSet(peer.getSelectedRows) {
-- 
cgit v1.2.3