# HG changeset patch # User The Geek Inside # Date 1290033910 21600 # Node ID 98f571f240e544818286eb9b40d7482a653a164e # Parent 455359276087ccad452c44da30c039dbaad1fefb Minor fixes diff -r 455359276087ccad452c44da30c039dbaad1fefb -r 98f571f240e544818286eb9b40d7482a653a164e .idea/misc.xml --- a/.idea/misc.xml Tue Nov 16 23:42:28 2010 -0600 +++ b/.idea/misc.xml Wed Nov 17 16:45:10 2010 -0600 @@ -25,6 +25,7 @@ + diff -r 455359276087ccad452c44da30c039dbaad1fefb -r 98f571f240e544818286eb9b40d7482a653a164e .idea/modules.xml --- a/.idea/modules.xml Tue Nov 16 23:42:28 2010 -0600 +++ b/.idea/modules.xml Wed Nov 17 16:45:10 2010 -0600 @@ -4,8 +4,7 @@ - - + diff -r 455359276087ccad452c44da30c039dbaad1fefb -r 98f571f240e544818286eb9b40d7482a653a164e Topics/Actors/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala --- a/Topics/Actors/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala Tue Nov 16 23:42:28 2010 -0600 +++ b/Topics/Actors/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala Wed Nov 17 16:45:10 2010 -0600 @@ -1,11 +1,7 @@ package net.thegeekinside.scala.talk.intro /** - * Created by IntelliJ IDEA. - * User: thegeekinside - * Date: 10-jul-2010 - * Time: 4:53:08 - * To change this template use File | Settings | File Templates. + * Actors example. */ object Main { @@ -13,6 +9,6 @@ EchoActor.start() EchoActor ! "Hello, world" EchoActor ! EchoMessage("Hola, mundo") - EchoActor ! 25 + EchoActor ! 25 } } \ No newline at end of file diff -r 455359276087ccad452c44da30c039dbaad1fefb -r 98f571f240e544818286eb9b40d7482a653a164e Topics/FunctionsAndClosures/FunctionsAndClosures.iml --- a/Topics/FunctionsAndClosures/FunctionsAndClosures.iml Tue Nov 16 23:42:28 2010 -0600 +++ b/Topics/FunctionsAndClosures/FunctionsAndClosures.iml Wed Nov 17 16:45:10 2010 -0600 @@ -14,7 +14,6 @@ - diff -r 455359276087ccad452c44da30c039dbaad1fefb -r 98f571f240e544818286eb9b40d7482a653a164e Topics/PatternMatching/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala --- a/Topics/PatternMatching/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala Tue Nov 16 23:42:28 2010 -0600 +++ b/Topics/PatternMatching/src/main/scala/net/thegeekinside/scala/talk/intro/Main.scala Wed Nov 17 16:45:10 2010 -0600 @@ -8,7 +8,7 @@ def main(args: Array[String]) { println(classifier(Ballena(500.50))) println(classifier(Canguro("Skippy"))) - println(classifier(Primate("thegeekinside"))) + println(classifier(new Primate("thegeekinside"))) println(classifier(Medusa())) } @@ -23,6 +23,6 @@ abstract class Animal case class Canguro(name: String) extends Animal -case class Primate(name: String) extends Animal +class Primate(name: String) extends Animal case class Ballena(weight: Double) extends Animal case class Medusa() extends Animal