Initial draft conversion

Author: ERSUCC

build.sbt

@@ -2,7 +2,7 @@ import org.nlogo.build.{ ExtensionDocumentationPlugin, NetLogoExtension }
 
 enablePlugins(NetLogoExtension, ExtensionDocumentationPlugin)
 
-scalaVersion := "2.12.12"
+scalaVersion := "2.13.16"
 
 name       := "LevelSpace"
 version    := "2.3.4"
@@ -18,5 +18,6 @@ Test / scalaSource    := baseDirectory.value / "src" / "test"
 scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xfatal-warnings", "-encoding", "us-ascii", "-feature", "-release", "11")
 
 libraryDependencies ++= Seq(
-  "com.google.guava" % "guava" % "18.0"
+  "com.google.guava" % "guava" % "18.0",
+  "org.scala-lang.modules" %% "scala-parallel-collections" % "1.2.0"
 )

src/main/BackingModelManager.scala

@@ -76,7 +76,7 @@ class BackingModelManager extends LSModelManager {
     }
   }
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     guiComponent.syncTheme()
     models.foreach(_.syncTheme())
     backingModels.values.foreach(_._2.syncTheme())
@@ -89,5 +89,5 @@ class HeadlessBackingModelManager extends LSModelManager {
   def existingTab(filePath: String): Option[ModelCodeTab] = None
   def registerTab(filePath: String)
                  (f: AbstractWorkspaceScala => ModelCodeTab): Option[ModelCodeTab] = None
-  def syncTheme() {}
+  def syncTheme(): Unit = {}
 }

src/main/ChildModel.scala

@@ -7,9 +7,9 @@ import org.nlogo.api.{CommandRunnable, ExtensionException, Version, Workspace}
 import org.nlogo.theme.ThemeSync
 import org.nlogo.workspace.AbstractWorkspaceScala
 
-import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
+import scala.jdk.CollectionConverters.IterableHasAsScala
 
 abstract class ChildModel(val parentWorkspace: Workspace, val modelID: Int) extends ThemeSync {
   lazy val evaluator = new Evaluator(modelID, name, workspace, parentWorkspace.asInstanceOf[AbstractWorkspaceScala])
@@ -72,7 +72,7 @@ abstract class ChildModel(val parentWorkspace: Workspace, val modelID: Int) exte
   }
 
   def seedRNG(rng: RNG, seed: Long): Unit = if (usesLevelSpace) {
-    ask("ls:random-seed seed", Seq("seed" -> Double.box(seed)), Seq(), rng).waitFor
+    ask("ls:random-seed seed", Seq("seed" -> Double.box(seed.toDouble)), Seq(), rng).waitFor
   } else {
     rng(workspace).setSeed(seed)
   }

src/main/GUIChildModel.scala

@@ -63,15 +63,15 @@ class GUIChildModel @throws(classOf[InterruptedException]) @throws(classOf[Exten
     // Wakes up the workspace if the speed slider is super low.
     // Makes it so there's not a long pause after increasing
     // the speed slider from a low position. BCH 6/18/2016
-    workspace.updateManager().nudgeSleeper
+    workspace.updateManager().nudgeSleeper()
     onEDT {
       panel.speedSlider.setValue((d * 2).intValue)
     }
   }
 
   override def hide(): Unit = {
     workspace.updateManager().speed = 50
-    workspace.updateManager().nudgeSleeper
+    workspace.updateManager().nudgeSleeper()
     super.hide()
   }
 
@@ -83,7 +83,7 @@ class GUIChildModel @throws(classOf[InterruptedException]) @throws(classOf[Exten
 
   def workspace: GUIWorkspace = component.workspace
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     menuBar.syncTheme()
     panel.syncTheme()
 
@@ -99,21 +99,21 @@ class SyncedMenuBar extends JMenuBar with ThemeSync {
 
   add(zoomMenu)
 
-  override def paintComponent(g: Graphics) {
+  override def paintComponent(g: Graphics): Unit = {
     val g2d = Utils.initGraphics2D(g)
 
     g2d.setColor(InterfaceColors.menuBackground)
     g2d.fillRect(0, 0, getWidth, getHeight)
   }
 
-  override def paintBorder(g: Graphics) {
+  override def paintBorder(g: Graphics): Unit = {
     val g2d = Utils.initGraphics2D(g)
 
     g2d.setColor(InterfaceColors.menuBarBorder)
     g2d.drawLine(0, getHeight - 1, getWidth, getHeight - 1)
   }
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     zoomMenu.syncTheme()
   }
 }

src/main/GUIPanel.scala

@@ -36,7 +36,7 @@ extends JPanel with Events.OutputEvent.Handler with ThemeSync {
       cc.output.append(outputEvent.outputObject, outputEvent.wrapLines)
   }
 
-  def packSplitPane() {
+  def packSplitPane(): Unit = {
     splitPane.setPreferredSize(
       splitPane.getOrientation match {
         case JSplitPane.HORIZONTAL_SPLIT =>
@@ -51,11 +51,11 @@ extends JPanel with Events.OutputEvent.Handler with ThemeSync {
     resetCommandCenter()
   }
 
-  def resetCommandCenter() {
+  def resetCommandCenter(): Unit = {
     splitPane.resetToPreferredSizes()
   }
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     controlStrip.setBackground(InterfaceColors.toolbarBackground)
     scrollPane.setBackground(InterfaceColors.interfaceBackground)
 
@@ -77,12 +77,12 @@ extends ModelPanel(ws, panel, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, 1)
   val speedSlider = new JSlider(-110, 112, ws.speedSliderPosition().toInt)
   speedSlider.addChangeListener((_: ChangeEvent) => {
     ws.speedSliderPosition(speedSlider.getValue / 2)
-    ws.updateManager().nudgeSleeper
+    ws.updateManager().nudgeSleeper()
   })
   speedSliderPanel.add(speedSlider)
   controlStrip.add(speedSliderPanel, BorderLayout.CENTER)
 
-  override def syncTheme() {
+  override def syncTheme(): Unit = {
     super.syncTheme()
 
     label.setForeground(InterfaceColors.toolbarText)

src/main/HeadlessChildModel.scala

@@ -10,10 +10,6 @@ import org.nlogo.headless.HeadlessWorkspace
 import org.nlogo.ls.gui.ViewFrame
 import org.nlogo.workspace.{AbstractWorkspace, AbstractWorkspaceScala}
 
-@throws(classOf[InterruptedException])
-@throws(classOf[ExtensionException])
-@throws(classOf[HaltException])
-@throws(classOf[IOException])
 class HeadlessChildModel (parentWorkspace: AbstractWorkspace, path: String, modelID: Int)
   extends ChildModel(parentWorkspace, modelID) {
 
@@ -91,7 +87,7 @@ class HeadlessChildModel (parentWorkspace: AbstractWorkspace, path: String, mode
   def tryEagerOf(code: String, lets: Seq[(String, AnyRef)], args: Seq[AnyRef], rng: RNG): Notifying[AnyRef] =
     evaluator.report(code, lets, args, rng, parallel = usesLevelSpace || isVisible)
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     frame.foreach(_.syncTheme())
   }
 }

src/main/InterfaceComponent.scala

@@ -54,7 +54,7 @@ with ThemeSync {
     override def stopInspectingAgent(agent: Agent): Unit = monitorManager.stopInspecting(agent)
     override def stopInspectingDeadAgents(): Unit = monitorManager.stopInspectingDeadAgents()
     override def closeAgentMonitors() = monitorManager.closeAll()
-    override def newRenderer = new org.nlogo.render.Renderer(world)
+    override def newRenderer = new org.nlogo.render.Renderer(this.world)
     override def updateModel(m: Model): Model = m
   }
 
@@ -74,12 +74,12 @@ with ThemeSync {
   addLinkComponent(procedures)
   addLinkComponent(new CompilerManager(workspace, workspace.world.asInstanceOf[World with CompilationManagement], procedures))
   addLinkComponent(new CompiledEvent.Handler {
-    override def handle(e: CompiledEvent) {
+    override def handle(e: CompiledEvent): Unit = {
       if (e.error != null)
         throw e.error
   }})
   addLinkComponent(new LoadModelEvent.Handler {
-    override def handle(e: LoadModelEvent) {
+    override def handle(e: LoadModelEvent): Unit = {
       workspace.aggregateManager.load(e.model, workspace)
   }})
   addLinkComponent(listenerManager)
@@ -130,7 +130,7 @@ with ThemeSync {
     }
   }
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     setBackground(InterfaceColors.interfaceBackground)
 
     interfacePanel.syncTheme()

src/main/LevelSpace.scala

@@ -25,7 +25,8 @@ import org.nlogo.nvm.HaltException
 import org.nlogo.theme.ThemeSync
 import org.nlogo.workspace.{ AbstractWorkspace, ExtensionManager => WorkspaceExtensionManager }
 
-import scala.collection.JavaConverters._
+import scala.collection.immutable.ArraySeq
+import scala.jdk.CollectionConverters.ConcurrentMapHasAsScala
 
 object LevelSpace {
   private var isHeadlessWorkspace = false
@@ -114,7 +115,7 @@ class LevelSpace extends DefaultClassManager with ThemeSync { // This can be acc
 
   def containsModel(id: Int): Boolean = models.contains(id)
 
-  def modelList: Seq[Integer] = models.keys.toArray.sorted
+  def modelList: Seq[Integer] = Seq(ArraySeq.unsafeWrapArray(models.keys.toArray.sorted): _*)
 
   def numModels: Integer = models.size
 
@@ -229,7 +230,7 @@ class LevelSpace extends DefaultClassManager with ThemeSync { // This can be acc
 
   private def haltChildModels(): Unit = models.values.foreach(_.halt())
 
-  def syncTheme() {
+  def syncTheme(): Unit = {
     modelManager.syncTheme()
   }
 }

src/main/LevelSpaceMenu.scala

@@ -16,7 +16,7 @@ import org.nlogo.fileformat.FileFormat
 import org.nlogo.swing.{ FileDialog, Menu, MenuItem }
 import org.nlogo.workspace.{AbstractWorkspaceScala, ModelsLibrary, ModelTracker, SaveModel}
 
-import scala.collection.JavaConversions._
+import scala.jdk.CollectionConverters.SeqHasAsJava
 
 trait ModelManager {
   def removeTab(tab: ModelCodeTab): Unit
@@ -107,10 +107,10 @@ class LevelSpaceMenu(tabManager: TabManager, val backingModelManager: ModelManag
           case e: CompilerException =>
             // we shouldn't have to raise an exception here, we should just be able to open it, but
             // in order to do that, we'll need to change child models not to compile in their constructors
-            throw new ExtensionException(filePath + " did not compile properly. There is probably something wrong " +
-              "with its code. Exception said" + e.getMessage);
-            case e: IOException =>
-              throw new ExtensionException("There was no model file at the path: \"" + filePath + "\"")
+            throw new ExtensionException(s"$filePath did not compile properly. There is probably something wrong " +
+              s"with its code. Exception said ${e.getMessage}")
+          case e: IOException =>
+            throw new ExtensionException(s"There was no model file at the path: \"$filePath\"")
         }
 
 

src/main/ModelCodeTab.scala

@@ -62,7 +62,7 @@ with ModelSavedEvent.Handler {
 
   protected var isDirty  = false
 
-  override def close() {
+  override def close(): Unit = {
     try {
       if (dirty && userWantsToSaveFile())
         save()