From 749b63e732390ebf889463e3f9c5dd651fc9e0a0 Mon Sep 17 00:00:00 2001 From: Derek Williams Date: Tue, 26 Jul 2011 17:58:37 -0600 Subject: [PATCH] formatting fixes --- .../src/test/scala/akka/dispatch/FutureSpec.scala | 2 +- .../src/test/scala/akka/misc/SchedulerSpec.scala | 2 +- akka-actor/src/main/scala/akka/actor/IO.scala | 2 +- akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala index cc89b60119..f007223c25 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala @@ -309,7 +309,7 @@ class FutureSpec extends WordSpec with MustMatchers with Checkers with BeforeAnd Futures.fold(0, timeout)(futures)(_ + _).await.exception.get.getMessage must be("shouldFoldResultsWithException: expected") } -/* @Test + /* @Test def shouldFoldMutableZeroes { import scala.collection.mutable.ArrayBuffer def test(testNumber: Int) { diff --git a/akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala index bd988aa190..9fa7a8cced 100644 --- a/akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala @@ -27,7 +27,7 @@ class SchedulerSpec extends JUnitSuite { @After def afterEach { - while(futures.peek() ne null) { Option(futures.poll()).foreach(_.cancel(true)) } + while (futures.peek() ne null) { Option(futures.poll()).foreach(_.cancel(true)) } Actor.registry.local.shutdownAll EventHandler.start() } diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala index c7fe40343d..5f4be5bcde 100644 --- a/akka-actor/src/main/scala/akka/actor/IO.scala +++ b/akka-actor/src/main/scala/akka/actor/IO.scala @@ -206,7 +206,7 @@ trait IO { _next = continuation(bytes) run() } - case bsd@ByteStringDelimited(continuation, handle, message, delimiter, inclusive, scanned) ⇒ + case bsd @ ByteStringDelimited(continuation, handle, message, delimiter, inclusive, scanned) ⇒ self.currentMessage = message val st = state(handle) val idx = st.readBytes.indexOfSlice(delimiter, scanned) diff --git a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala index ba68b95633..cf9c53f894 100644 --- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala @@ -8,7 +8,7 @@ import akka.actor.Actor._ import akka.routing.{ Routing, CyclicIterator } import Routing._ import akka.event.EventHandler -import akka.actor.{Channel, Actor, PoisonPill, Timeout} +import akka.actor.{ Channel, Actor, PoisonPill, Timeout } import akka.dispatch.Future import System.{ currentTimeMillis ⇒ now } @@ -105,8 +105,8 @@ object Pi extends App { //send calculate message master.?(Calculate, Timeout(60000)). - await.resultOrException match {//wait for the result, with a 60 seconds timeout - case Some(pi) => + await.resultOrException match { //wait for the result, with a 60 seconds timeout + case Some(pi) ⇒ EventHandler.info(this, "\n\tPi estimate: \t\t%s\n\tCalculation time: \t%s millis".format(pi, (now - start))) case None ⇒ EventHandler.error(this, "Pi calculation did not complete within the timeout.")