From c9c04a59072d4a640f92fa477f247697d51c241b Mon Sep 17 00:00:00 2001 From: Ingo Maier Date: Mon, 2 Nov 2009 16:32:01 +0000 Subject: Fixed remove/clear/update issues in BufferWrapp... Fixed remove/clear/update issues in BufferWrapper and layout map. --- src/swing/scala/swing/BufferWrapper.scala | 4 ++-- src/swing/scala/swing/LayoutContainer.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/swing') diff --git a/src/swing/scala/swing/BufferWrapper.scala b/src/swing/scala/swing/BufferWrapper.scala index 56d6e19887..7b5d9f0ea5 100644 --- a/src/swing/scala/swing/BufferWrapper.scala +++ b/src/swing/scala/swing/BufferWrapper.scala @@ -18,9 +18,9 @@ import scala.collection.IndexedSeq * Default partial implementation for buffer adapters. */ protected[swing] abstract class BufferWrapper[A] extends Buffer[A] { outer => - def clear() { for (i <- 0 until length) remove(i) } + def clear() { for (i <- 0 until length) remove(0) } def update(n: Int, a: A) { - remove(0) + remove(n) insertAt(n, a) } def insertAll(n: Int, elems: scala.collection.Traversable[A]) { diff --git a/src/swing/scala/swing/LayoutContainer.scala b/src/swing/scala/swing/LayoutContainer.scala index 3b323e59d4..d3587d638a 100644 --- a/src/swing/scala/swing/LayoutContainer.scala +++ b/src/swing/scala/swing/LayoutContainer.scala @@ -67,8 +67,8 @@ trait LayoutContainer extends Container.Wrapper { def get(c: Component) = Swing.toOption(constraintsFor(c)) override def size = peer.getComponentCount def iterator: Iterator[(Component, Constraints)] = - Iterator.range(0,size).map { c => - val comp = UIElement.cachedWrapper[Component](peer.getComponent(c).asInstanceOf[JComponent]) + peer.getComponents.iterator.map { c => + val comp = UIElement.cachedWrapper[Component](c.asInstanceOf[JComponent]) (comp, constraintsFor(comp)) } } -- cgit v1.2.3