Fixed compilation

zzorn · Aug 19, 2010 · bd93e6b · bd93e6b
1 parent 9424f22
commit bd93e6b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/main/scala/org/cloudfun/data/Data.scala b/src/main/scala/org/cloudfun/data/Data.scala
@@ -1,6 +1,6 @@
 package org.cloudfun.data
 
-import org.cloudfun.storage.{NoRef, Ref}
+import org.cloudfun.storage.{Storable, NoRef, Ref}
 
 /**
  * Collection of key-value properties.
@@ -26,7 +26,7 @@ trait Data {
   protected def string(name: Symbol, value: String = "") = makeField[String](name, value)
   protected def data(name: Symbol, value: Data = null) = makeField[Data](name, value)
   protected def list[E](name: Symbol, value: List[E] = Nil) = makeField[List[E]](name, value)
-  protected def ref[E](name: Symbol, value: Ref[E] = NoRef[E]()) = makeField[Ref[E]](name, value)
+  protected def ref[E <: Storable](name: Symbol, value: Ref[E] = NoRef[E]()) = makeField[Ref[E]](name, value)
 
   private def makeField[T](name: Symbol, value: T): Field[T] = {
     set(name, value.asInstanceOf[Object])
@@ -66,7 +66,7 @@ trait Data {
   def getBoolean(name: Symbol, default: Boolean) = getAs[Boolean](name).getOrElse(default)
   def getString(name: Symbol, default: String = "") = getAs[String](name).getOrElse(default)
   def getList(name: Symbol, default: List[Object] = Nil) = getAs[List[Object]](name).getOrElse(default)
-  def getRef[E](name: Symbol, default: Ref[E] = NoRef[E]()) = getAs[Ref[E]](name).getOrElse(default)
+  def getRef[E <: Storable](name: Symbol, default: Ref[E] = NoRef[E]()) = getAs[Ref[E]](name).getOrElse(default)
   def getData(name: Symbol, default: Data = EmptyData) = getAs[Data](name).getOrElse(default)
 
 

diff --git a/src/main/scala/org/cloudfun/entity/Entity.scala b/src/main/scala/org/cloudfun/entity/Entity.scala
@@ -33,7 +33,7 @@ class Entity extends MutableData with Storable with MessageReceiver with LogMeth
     val r = facet.ref
     if (facets().contains(r)) {
       facets.set(facets().filterNot(_ == r))
-      facet.entity := NoRef[Facet]()
+      facet.entity := NoRef[Entity]()
     }
   }
 
@@ -46,12 +46,12 @@ class Entity extends MutableData with Storable with MessageReceiver with LogMeth
    * Get a facet with the specified name, or None if not found.
    */
   // TODO: Store the facets in a map instead, for faster access?
-  def facet[T <: Facet](name: Symbol): Option[T] = facets().map(_.apply()).find(f => f.name == name).asInstanceOf[Option[T]]
+  def facet[T <: Facet](name: Symbol): Option[T] = facets().map(_.apply()).find(f => f.facetType == name).asInstanceOf[Option[T]]
 
   final def onMessage(message: Data) = {
     message.get('facet) match {
       case None => fallbackMessageHandler(message)
-      case Some(name: Symbol) => facet(name) match {
+      case Some(name: Symbol) => facet[Facet](name) match {
         case None => fallbackMessageHandler(message)
         case Some(facet: Facet) => facet.onMessage(message)
       }

diff --git a/src/main/scala/org/cloudfun/entity/Facet.scala b/src/main/scala/org/cloudfun/entity/Facet.scala
@@ -19,7 +19,7 @@ trait Facet extends MutableData with Storable with Taskable with MessageReceiver
   /**
    * Name for this type of facet.
    */
-  def name: Symbol = Symbol(getClass.getSimpleName())
+  def facetType: Symbol = Symbol(getClass.getSimpleName())
 
   protected[entity] final def initialize(parameters: Data) {init(parameters)}
 

diff --git a/src/main/scala/org/cloudfun/examples/ChatGame.scala b/src/main/scala/org/cloudfun/examples/ChatGame.scala
@@ -19,7 +19,7 @@ class ChatGame extends Game {
 
   def createEntityForNewUser(userName: String, context: GameServer) = {
     new Entity() {
-      override def onMessage(message: Data) {
+      override def fallbackMessageHandler(message: Data) {
         println(message)
 
         // TODO: Tell message to other users

diff --git a/src/main/scala/org/cloudfun/storage/memory/InMemoryStorage.scala b/src/main/scala/org/cloudfun/storage/memory/InMemoryStorage.scala
@@ -38,7 +38,7 @@ class InMemoryStorage extends Storage {
     names.put(name, get(ref))
   }
 
-  private def getReferencedObject[T](ref: Ref[T]): T = {
+  private def getReferencedObject[T <: Storable](ref: Ref[T]): T = {
     ref match  {
       case NoRef() => throw new ElementNotFoundException("Reference to nothing")
       case MemoryRef(obj) => obj