eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 18:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

lambda time, and use EventQueue instead of SwingUtilities

Browse Source
This commit is contained in:
Ben Fry
2021-08-01 12:57:39 -04:00
parent 2b1e38f5a9
commit e74f36f1eb
1 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
java/src/processing/mode/java/JavaMode.java
View File

@@ -22,6 +22,7 @@
package processing.mode.java;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
@@ -29,8 +30,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.swing.SwingUtilities;
import processing.app.*;
import processing.app.ui.Editor;
import processing.app.ui.EditorException;
@@ -116,14 +115,12 @@ public class JavaMode extends Mode {
String appletClassName = build.build(true);
if (appletClassName != null) {
final Runner runtime = new Runner(build, listener);
new Thread(new Runnable() {
public void run() {
// these block until finished
if (present) {
runtime.present(null);
} else {
runtime.launch(null);
}
new Thread(() -> {
// these block until finished
if (present) {
runtime.present(null);
} else {
runtime.launch(null);
}
}).start();
return runtime;
@@ -161,36 +158,25 @@ public class JavaMode extends Mode {
if (appletClassName != null) {
final Runner runtime = new Runner(build, listener);
new Thread(new Runnable() {
public void run() {
// these block until finished
// if (present) {
// runtime.present(null);
// } else {
runtime.launch(null);
// }
// next lines are executed when the sketch quits
if (launchInteractive) {
// fix swing deadlock issue: https://github.com/processing/processing/issues/3928
SwingUtilities.invokeLater(new Runnable() {
public void run() {
editor.initEditorCode(parser.allHandles, false);
editor.stopTweakMode(parser.allHandles);
}
});
}
new Thread(() -> {
runtime.launch(null);
// next lines are executed when the sketch quits
if (launchInteractive) {
// fix swing deadlock issue: https://github.com/processing/processing/issues/3928
EventQueue.invokeLater(() -> {
editor.initEditorCode(parser.allHandles, false);
editor.stopTweakMode(parser.allHandles);
});
}
}).start();
if (launchInteractive) {
// fix swing deadlock issue: https://github.com/processing/processing/issues/3928
SwingUtilities.invokeLater(new Runnable() {
public void run() {
// replace editor code with baseCode
editor.initEditorCode(parser.allHandles, false);
editor.updateInterface(parser.allHandles, parser.colorBoxes);
editor.startTweakMode();
}
EventQueue.invokeLater(() -> {
// replace editor code with baseCode
editor.initEditorCode(parser.allHandles, false);
editor.updateInterface(parser.allHandles, parser.colorBoxes);
editor.startTweakMode();
});
}
return runtime;