Make run button behave

JakubValtar · JakubValtar · commit e5833e8a7fac · 2017-01-22T23:24:32.000+01:00
When clicking run button while a sketch is running, it will be activated
again when the sketch is restarted. Previously it got deactivated by the
old sketch runner, because it was quitting after the new sketch runner
started.
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -1170,6 +1170,13 @@ public void handleContinue() {
   }
 
 
+  public void onRunnerExiting(Runner runner) {
+    if (this.runtime == runner) {
+      deactivateRun();
+    }
+  }
+
+
 //  /** Toggle a breakpoint on the current line. */
 //  public void toggleBreakpoint() {
 //    toggleBreakpoint(getCurrentLineID().lineIdx());
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
@@ -24,10 +24,10 @@
 
 import processing.app.*;
 import processing.app.exec.StreamRedirectThread;
-import processing.app.ui.Editor;
 import processing.core.*;
 import processing.data.StringList;
 import processing.mode.java.JavaBuild;
+import processing.mode.java.JavaEditor;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -71,7 +71,7 @@ public class Runner implements MessageConsumer {
   protected Thread outThread = null;
 
   protected SketchException exception;
-  protected Editor editor;
+  protected JavaEditor editor;
   protected JavaBuild build;
   protected Process process;
 
@@ -86,8 +86,8 @@ public Runner(JavaBuild build, RunnerListener listener) throws SketchException {
 
     checkLocalHost();
 
-    if (listener instanceof Editor) {
-      this.editor = (Editor) listener;
+    if (listener instanceof JavaEditor) {
+      this.editor = (JavaEditor) listener;
       sketchErr = editor.getConsole().getErr();
       sketchOut = editor.getConsole().getOut();
     } else {
@@ -610,7 +610,9 @@ public void run() {
       // or the user manually closes the sketch window.
       // TODO this should be handled better, should it not?
       if (editor != null) {
-        editor.deactivateRun();
+        java.awt.EventQueue.invokeLater(() -> {
+          editor.onRunnerExiting(Runner.this);
+        });
       }
     } catch (InterruptedException exc) {
       // we don't interrupt
@@ -679,7 +681,9 @@ public void exceptionEvent(ExceptionEvent event) {
     handleCommonErrors(exceptionName, message, listener, sketchErr);
 
     if (editor != null) {
-      editor.deactivateRun();
+      java.awt.EventQueue.invokeLater(() -> {
+        editor.onRunnerExiting(Runner.this);
+      });
     }
   }
 
