Toolbar functionality PoC

Author: Stefterv

app/build.gradle.kts

@@ -55,7 +55,7 @@ compose.desktop {
             "processing.contributions.source" to "https://contributions.processing.org/contribs",
             "processing.download.page" to "https://processing.org/download/",
             "processing.download.latest" to "https://processing.org/download/latest.txt",
-            "processing.tutorials" to "https://processing.org/tutorials/",
+            "processing.tutorials" to "https://processing.org/tutorials/"
         )
 
         jvmArgs(*variables.entries.map { "-D${it.key}=${it.value}" }.toTypedArray())

app/src/processing/app/Base.java

@@ -67,8 +67,6 @@ public class Base {
    */
   static public boolean DEBUG = System.getenv().containsKey("DEBUG");
 
-  static public boolean GRADLE = true;
-
   /** True if running via Commander. */
   static private boolean commandLine;
 

app/src/processing/app/gradle/GradleService.kt

@@ -6,7 +6,6 @@ import com.sun.jdi.Bootstrap
 import com.sun.jdi.VirtualMachine
 import com.sun.jdi.connect.AttachingConnector
 import kotlinx.coroutines.*
-import org.gradle.internal.logging.events.OutputEvent
 import org.gradle.tooling.BuildLauncher
 import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.ProjectConnection
@@ -26,11 +25,14 @@ import javax.swing.event.DocumentListener
 import kotlin.io.path.writeText
 
 // TODO: Remove dependency on editor
+// TODO: Move to jobs system
+// TODO: Improve progress tracking
 class GradleService(val editor: Editor) {
+    val active = mutableStateOf(true)
     val availableTasks = mutableStateListOf<String>()
     val finishedTasks = mutableStateListOf<String>()
     val running = mutableStateOf(false)
-    var vm: VirtualMachine? = null
+    var vm = mutableStateOf<VirtualMachine?>(null)
     val debugPort = (30000..60000).random()
     val problems = mutableStateListOf<ProblemEvent>()
 
@@ -43,6 +45,14 @@ class GradleService(val editor: Editor) {
 
     val folder: File get() = editor.sketch.folder
 
+    // Hooks for java to check if the Gradle service is running
+    fun getEnabled(): Boolean {
+        return active.value
+    }
+    fun setEnabled(active: Boolean) {
+        this.active.value = active
+    }
+
     fun prepare(){
         Messages.log("Preparing sketch")
         if(preparing) return
@@ -164,9 +174,9 @@ class GradleService(val editor: Editor) {
                 ?: return@ProgressListener
             val args = connector.defaultArguments()
             args["port"]?.setValue(debugPort.toString())
-            val vm = connector.attach(args)
-            this@GradleService.vm = vm
-            Messages.log("Attached to VM: ${vm.name()}")
+            val sketch = connector.attach(args)
+            vm.value = sketch
+            Messages.log("Attached to VM: ${sketch.name()}")
         })
         return this
     }
@@ -182,7 +192,7 @@ class GradleService(val editor: Editor) {
                 finishedTasks.add(name)
             }
             if(event is DefaultSingleProblemEvent){
-                Messages.log("")
+                problems.add(event)
             }
         })
         return this