diff options
author | michelou <michelou@epfl.ch> | 2009-02-24 14:14:01 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2009-02-24 14:14:01 +0000 |
commit | 0f81e1686bef598c5353a7187a332f3008492f29 (patch) | |
tree | 875ecf733730c066f016f44a1e3d8751b07f5d39 /src/swing | |
parent | 57e95eb403c325594e17c6f84852bbdc49954fd6 (diff) | |
download | scala-0f81e1686bef598c5353a7187a332f3008492f29.tar.gz scala-0f81e1686bef598c5353a7187a332f3008492f29.tar.bz2 scala-0f81e1686bef598c5353a7187a332f3008492f29.zip |
removed deprecated for-loops and units
Diffstat (limited to 'src/swing')
-rw-r--r-- | src/swing/scala/swing/CheckBox.scala | 2 | ||||
-rw-r--r-- | src/swing/scala/swing/Publisher.scala | 6 | ||||
-rw-r--r-- | src/swing/scala/swing/Reactor.scala | 4 | ||||
-rw-r--r-- | src/swing/scala/swing/model/Matrix.scala | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/swing/scala/swing/CheckBox.scala b/src/swing/scala/swing/CheckBox.scala index 845b7f7024..8fb1e2bb5f 100644 --- a/src/swing/scala/swing/CheckBox.scala +++ b/src/swing/scala/swing/CheckBox.scala @@ -13,4 +13,4 @@ class CheckBox(text: String) extends ToggleButton { def borderPaintedFlat: Boolean = peer.isBorderPaintedFlat def borderPaintedFlat_=(flat: Boolean) { peer.setBorderPaintedFlat(flat) } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala index e6f990418c..67728705a0 100644 --- a/src/swing/scala/swing/Publisher.scala +++ b/src/swing/scala/swing/Publisher.scala @@ -33,7 +33,7 @@ trait Publisher extends Reactor { /** * Notify all registered reactions. */ - def publish(e: Event) { for (val l <- listeners) l(e) } + def publish(e: Event) { for (l <- listeners) l(e) } listenTo(this) } @@ -42,7 +42,7 @@ import scala.ref._ private[swing] trait SingleRefCollection[+A <: AnyRef] extends Collection[A] { self => - trait Ref[+A<:AnyRef] extends Reference[A] { + trait Ref[+A <: AnyRef] extends Reference[A] { override def hashCode() = { val v = get if (v == None) 0 else v.get.hashCode @@ -64,7 +64,7 @@ private[swing] trait SingleRefCollection[+A <: AnyRef] extends Collection[A] { s def purgeReferences() { var ref = referenceQueue.poll - while(ref != None) { + while (ref != None) { removeReference(ref.get.asInstanceOf[Reference[A]]) ref = referenceQueue.poll } diff --git a/src/swing/scala/swing/Reactor.scala b/src/swing/scala/swing/Reactor.scala index 1b2d806d85..9f13e3f6a3 100644 --- a/src/swing/scala/swing/Reactor.scala +++ b/src/swing/scala/swing/Reactor.scala @@ -12,9 +12,9 @@ trait Reactor { * Listen to the given publisher as long as <code>deafTo</code> isn't called for * them. */ - def listenTo(ps: Publisher*) = for (val p <- ps) p.subscribe(reactions) + def listenTo(ps: Publisher*) = for (p <- ps) p.subscribe(reactions) /** * Installed reaction won't receive events from the given publisher anylonger. */ - def deafTo(ps: Publisher*) = for (val p <- ps) p.unsubscribe(reactions) + def deafTo(ps: Publisher*) = for (p <- ps) p.unsubscribe(reactions) } diff --git a/src/swing/scala/swing/model/Matrix.scala b/src/swing/scala/swing/model/Matrix.scala index d028b6826e..40f7e4c6f7 100644 --- a/src/swing/scala/swing/model/Matrix.scala +++ b/src/swing/scala/swing/model/Matrix.scala @@ -100,7 +100,7 @@ object Matrix { implicit def MatrixToSeqs[A](matrix: Matrix[A]): Seq[Seq[A]] = { val result = new Array[SubArray[A]](matrix.width) - for (val col <- 0 until matrix.width) + for (col <- 0 until matrix.width) result(col) = new SubArray[A](matrix.delegate, col * matrix.height, matrix.height) result } |