From dcd182e22cd7ddb46362b39cb4d8d89abf8f5269 Mon Sep 17 00:00:00 2001
From: momania <irmo.manie@gmail.com>
Date: Mon, 19 Jul 2010 18:22:15 +0200
Subject: [PATCH] move StateTimeout into Fsm

---
 akka-core/src/main/scala/actor/Fsm.scala    | 2 +-
 akka-core/src/test/scala/FsmActorSpec.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-core/src/main/scala/actor/Fsm.scala b/akka-core/src/main/scala/actor/Fsm.scala
index e493758c0b..beba759843 100644
--- a/akka-core/src/main/scala/actor/Fsm.scala
+++ b/akka-core/src/main/scala/actor/Fsm.scala
@@ -34,5 +34,5 @@ trait Fsm[S] { self: Actor =>
 
   case class NextState(state: State, stateData: S, timeout: Option[Int] = None)
   case class Event(event: Any, stateData: S)
+  object StateTimeout
 }
-object StateTimeout
diff --git a/akka-core/src/test/scala/FsmActorSpec.scala b/akka-core/src/test/scala/FsmActorSpec.scala
index 06bf4d301b..12f83607a8 100644
--- a/akka-core/src/test/scala/FsmActorSpec.scala
+++ b/akka-core/src/test/scala/FsmActorSpec.scala
@@ -7,7 +7,7 @@ package se.scalablesolutions.akka.actor
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 import org.multiverse.api.latches.StandardLatch
-import actor.{StateTimeout, Fsm}
+import actor.Fsm
 import java.util.concurrent.TimeUnit
 
 object FsmActorSpec {