Use more robust method of checking for headless

Author: ERSUCC

build.sbt

@@ -19,7 +19,7 @@ scalacOptions ++= Seq(
 )
 
 netLogoClassManager := "org.nlogo.extensions.vid.VidExtension"
-netLogoVersion      := "7.0.0-beta2-7e8f7a4"
+netLogoVersion      := "7.0.0-424b50b"
 netLogoZipExtras   ++= Seq(baseDirectory.value / "README.md")
 
 // settings for the `sbt-javacpp` sbt plugin

src/main/scala/VidExtension.scala

@@ -3,10 +3,11 @@ package org.nlogo.extensions.vid
 import org.nlogo.api.{ DefaultClassManager, ExtensionManager, PrimitiveManager }
 
 object VidExtension {
+  private var isHeadless = true
 
   // we use two headless variables. The java one forces headless, the other one says NetLogo would like it if you ran headlessly
   def guiOrHeadless[A](gui: => A, headless: => A): A = {
-    if (System.getProperty("java.awt.headless") == "true" || System.getProperty("org.nlogo.preferHeadless") == "true") {
+    if (isHeadless) {
       headless
     } else {
       try {
@@ -31,6 +32,7 @@ class VidExtension(movies: MovieFactory, cameras: CameraFactory, player: Player,
     this(VidExtension.movie, VidExtension.camera, VidExtension.player, VidExtension.selector, new MP4Recorder())
 
   override def runOnce(em: ExtensionManager): Unit = {
+    VidExtension.isHeadless = !em.workspaceContext.workspaceGUI
   }
 
   override def load(manager: PrimitiveManager) = {

src/test/scala/NetLogoDummies.scala

@@ -4,65 +4,68 @@ import java.awt.image.BufferedImage
 import java.io.File
 import javax.imageio.ImageIO
 
-import org.nlogo.api._
+import org.nlogo.api.{ Activation, Agent, CommandRunnable, Context, ExtensionManager, ExternalResourceManager,
+                       ImportErrorHandler, JobOwner, LabProtocol, LibraryManager, LogoException, MersenneTwisterFast,
+                       OutputDestination, Perspective, PlotInterface, PlotManagerInterface, PreviewCommands,
+                       RendererInterface, ReporterRunnable, Workspace, WorkspaceContext, World }
 
 class FakeContext extends Context {
   def attachCurrentDirectory(path: String): String =
     s"/currentdir/$path"
   def attachModelDir(filePath: String): String = ???
-  def getAgent: org.nlogo.api.Agent = ???
+  def getAgent: Agent = ???
   def getDrawing: java.awt.image.BufferedImage = ???
-  def getRNG: org.nlogo.api.MersenneTwisterFast = ???
+  def getRNG: MersenneTwisterFast = ???
   def importPcolors(image: java.awt.image.BufferedImage,asNetLogoColors: Boolean): Unit = ???
   def logCustomGlobals(nameValuePairs: Seq[(String, String)]): Unit = ???
   def logCustomMessage(msg: String): Unit = ???
-  def activation: org.nlogo.api.Activation = ???
-  def world: org.nlogo.api.World = ???
+  def activation: Activation = ???
+  def world: World = ???
   val workspace = new FakeWorkspace()
 }
 
-class FakeWorkspace extends org.nlogo.api.Workspace {
+class FakeWorkspace extends Workspace {
   override def exportView: BufferedImage = {
     new BufferedImage(480, 480, BufferedImage.TYPE_INT_ARGB)
   }
 
   def getResourceManager: ExternalResourceManager = ???
 
-  // Members declared in org.nlogo.api.Controllable
+  // Members declared in Controllable
   def command(source: String): Unit = ???
-  def evaluateCommands(owner: org.nlogo.api.JobOwner,source: String,waitForCompletion: Boolean): Unit = ???
-  def evaluateCommands(owner: org.nlogo.api.JobOwner,source: String): Unit = ???
-  def evaluateReporter(owner: org.nlogo.api.JobOwner,source: String): AnyRef = ???
+  def evaluateCommands(owner: JobOwner,source: String,waitForCompletion: Boolean): Unit = ???
+  def evaluateCommands(owner: JobOwner,source: String): Unit = ???
+  def evaluateReporter(owner: JobOwner,source: String): AnyRef = ???
   def report(source: String): AnyRef = ???
 
-  // Members declared in org.nlogo.api.ImporterUser
+  // Members declared in ImporterUser
   def currentPlot(plot: String): Unit = ???
   def maybeGetPlot(plot: String): Option[PlotInterface] = ???
-  def importExtensionData(name: String,data: java.util.List[Array[String]],handler: org.nlogo.api.ImportErrorHandler): Unit = ???
+  def importExtensionData(name: String,data: java.util.List[Array[String]],handler: ImportErrorHandler): Unit = ???
   def isExtensionName(name: String): Boolean = ???
   def setOutputAreaContents(text: String): Unit = ???
 
   // Members declared in org.nlogo.core.LiteralParser
   def readFromString(s: String): AnyRef = ???
   def readNumberFromString(source: String): AnyRef = ???
 
-  // Members declared in org.nlogo.api.RandomServices
-  def auxRNG: org.nlogo.api.MersenneTwisterFast = ???
-  def mainRNG: org.nlogo.api.MersenneTwisterFast = ???
+  // Members declared in RandomServices
+  def auxRNG: MersenneTwisterFast = ???
+  def mainRNG: MersenneTwisterFast = ???
   def seedRNGs(seed: Int): Unit = ???
 
-  // Members declared in org.nlogo.api.ViewSettings
+  // Members declared in ViewSettings
   def drawSpotlight: Boolean = ???
   def fontSize: Int = ???
-  def isHeadless: Boolean = ???
-  def perspective: org.nlogo.api.Perspective = ???
+  def workspaceContext: WorkspaceContext = ???
+  def perspective: Perspective = ???
   def renderPerspective: Boolean = ???
   def viewHeight: Double = ???
   def viewOffsetX: Double = ???
   def viewOffsetY: Double = ???
   def viewWidth: Double = ???
 
-  // Members declared in org.nlogo.api.Workspace
+  // Members declared in Workspace
   def behaviorSpaceRunNumber(n: Int): Unit = ???
   def behaviorSpaceRunNumber: Int = ???
   def getBehaviorSpaceExperiments: List[LabProtocol] = ???
@@ -88,33 +91,33 @@ class FakeWorkspace extends org.nlogo.api.Workspace {
   def exportWorld(writer: java.io.PrintWriter): Unit = ???
   def exportWorld(path: String): Unit = ???
   def getAndCreateDrawing(): java.awt.image.BufferedImage = ???
-  def getExtensionManager: org.nlogo.api.ExtensionManager = ???
-  def getLibraryManager: org.nlogo.api.LibraryManager = ???
+  def getExtensionManager: ExtensionManager = ???
+  def getLibraryManager: LibraryManager = ???
   def getModelDir: String = ???
   def getModelFileName: String = ???
   def getModelPath: String = ???
   def graphicsChecksum: String = ???
   def importDrawing(path: String): Unit = ???
   def importWorld(path: String): Unit = ???
   def importWorld(reader: java.io.Reader): Unit = ???
-  def lastLogoException: org.nlogo.api.LogoException = ???
+  def lastLogoException: LogoException = ???
   def open(modelPath: String, shouldAutoInstallLibs: Boolean = false): Unit = ???
   def openModel(model: org.nlogo.core.Model, shouldAutoInstallLibs: Boolean = false): Unit = ???
-  def outputObject(obj: AnyRef,owner: AnyRef,addNewline: Boolean,readable: Boolean,destination: org.nlogo.api.OutputDestination): Unit = ???
+  def outputObject(obj: AnyRef,owner: AnyRef,addNewline: Boolean,readable: Boolean,destination: OutputDestination): Unit = ???
   def patchSize: Double = ???
   def plotManager: AnyRef = ???
   def realPlotManager: PlotManagerInterface = ???
-  def previewCommands: org.nlogo.api.PreviewCommands = ???
+  def previewCommands: PreviewCommands = ???
   def profilingEnabled: Boolean = ???
-  def renderer: org.nlogo.api.RendererInterface = ???
+  def renderer: RendererInterface = ???
   def setModelPath(path: String): Unit = ???
-  def waitFor(runnable: org.nlogo.api.CommandRunnable): Unit = ???
+  def waitFor(runnable: CommandRunnable): Unit = ???
   def waitForQueuedEvents(): Unit = ???
-  def waitForResult[T](runnable: org.nlogo.api.ReporterRunnable[T]): T = ???
+  def waitForResult[T](runnable: ReporterRunnable[T]): T = ???
   def warningMessage(message: String): Boolean = ???
-  def world: org.nlogo.api.World = ???
+  def world: World = ???
   def worldChecksum: String = ???
-  // Members declared in org.nlogo.api.WorldResizer
+  // Members declared in WorldResizer
   def patchSize(patchSize: Double): Unit = ???
   def resizeView(): Unit = ???
   def setDimensions(dim: org.nlogo.core.WorldDimensions,patchSize: Double): Unit = ???