Convert ChildModel to scala

Remove custom waitFor on EDT stuff

Author: qiemem

build.sbt

@@ -1,13 +1,11 @@
-import org.nlogo.build.NetLogoExtension
-
 enablePlugins(org.nlogo.build.NetLogoExtension)
 
-scalaVersion := "2.11.7"
-
-name := "ls"
+netLogoExtName := "ls"
 
 netLogoClassManager := "org.nlogo.ls.LevelSpace"
 
+scalaVersion := "2.11.7"
+
 netLogoTarget := NetLogoExtension.directoryTarget(baseDirectory.value)
 
 netLogoZipSources := false
@@ -20,8 +18,7 @@ javaSource in Compile := baseDirectory.value / "src" / "main"
 
 javaSource in Test := baseDirectory.value / "src" / "test"
 
-scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xfatal-warnings",
-                      "-feature", "-encoding", "us-ascii")
+scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xfatal-warnings", "-encoding", "us-ascii")
 
 libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest" % "2.2.1" % "test",
@@ -53,4 +50,4 @@ test in Test := {
   IO.delete(lsDirectory.value)
 }
 
-netLogoVersion := "6.0.0-M4"
+netLogoVersion := "6.0.0-M5"

src/main/BackingModelManager.scala

@@ -24,10 +24,10 @@ class BackingModelManager extends LSModelManager {
     val models            = indexedModels.values
 
     // toSeq.distinct preserves ordering, whereas toSet does not
-    val modelPaths        = models.map(_.workspace().getModelPath).toSeq.distinct
+    val modelPaths        = models.map(_.workspace.getModelPath).toSeq.distinct
 
-    val closedModelsPaths = (openModels.values.toSet &~ models.toSet).map(_.workspace().getModelPath)
-    val newlyOpenedPaths  = (models.toSet &~ openModels.values.toSet).map(_.workspace().getModelPath)
+    val closedModelsPaths = (openModels.values.toSet &~ models.toSet).map(_.workspace.getModelPath)
+    val newlyOpenedPaths  = (models.toSet &~ openModels.values.toSet).map(_.workspace.getModelPath)
     openModels            = (modelPaths zip models).toMap
     (closedModelsPaths intersect openModelPaths).foreach(replaceTabAtPath)
     (newlyOpenedPaths  intersect openModelPaths).foreach(replaceTabAtPath)
@@ -47,7 +47,7 @@ class BackingModelManager extends LSModelManager {
 
   def removeTab(tab: ModelCodeTab): Unit = {
     if (! openModelPaths(tab.filePath))
-      backingModels.get(tab.filePath).foreach(_._1.kill())
+      backingModels.get(tab.filePath).foreach(_._1.kill)
     backingModels -= tab.filePath
   }
 
@@ -56,7 +56,7 @@ class BackingModelManager extends LSModelManager {
     if (backingModels.get(filePath).isDefined) {
       None
     } else {
-      val tab = f(model.workspace())
+      val tab = f(model.workspace)
       backingModels += filePath ->(model, tab)
       Some(tab)
     }
@@ -68,7 +68,7 @@ class BackingModelManager extends LSModelManager {
       None
     } else {
       val newModel =
-        openModels.getOrElse(filePath, new HeadlessChildModel(App.app.workspace.world, filePath, -1))
+        openModels.getOrElse(filePath, new HeadlessChildModel(App.app.workspace, filePath, -1))
       registerTab(filePath, newModel)(f)
     }
   }