eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make run button behave

Browse Source 
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.
This commit is contained in:
Jakub Valtar
2017-01-22 23:24:32 +01:00
parent 916e38b98d
commit 28052c2b39
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/processing/mode/java/JavaEditor.java
View File

@@ -1170,6 +1170,13 @@ public class JavaEditor extends Editor {
}
public void onRunnerExiting(Runner runner) {
if (this.runtime == runner) {
deactivateRun();
}
}
// /** Toggle a breakpoint on the current line. */
// public void toggleBreakpoint() {
// toggleBreakpoint(getCurrentLineID().lineIdx());

16
java/src/processing/mode/java/runner/Runner.java
View File

@@ -24,10 +24,10 @@ package processing.mode.java.runner;
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 class Runner implements MessageConsumer {
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 class Runner implements MessageConsumer {
// 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 class Runner implements MessageConsumer {
handleCommonErrors(exceptionName, message, listener, sketchErr);
if (editor != null) {
editor.deactivateRun();
java.awt.EventQueue.invokeLater(() -> {
editor.onRunnerExiting(Runner.this);
});
}
}