eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-04-27 14:40:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix up the tiered warning call and run on EDT

Browse Source
This commit is contained in:
Ben Fry
2023-01-21 12:15:46 -05:00
parent 8b4c4efbfd
commit c170cf1e67
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/processing/app/Messages.java
View File

@@ -23,6 +23,7 @@ package processing.app;
import processing.app.ui.Toolkit;
import java.awt.EventQueue;
import java.awt.Frame;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -74,21 +75,23 @@ public class Messages {
/**
* Non-fatal error message with optional stack trace side dish.
* Non-fatal error message with two levels of formatting.
* Unlike the others, this is non-blocking and will run later on the EDT.
*/
static public void showWarningTiered(String title,
String primary, String secondary,
Throwable e) {
if (title == null) title = "Warning";
final String message = primary + "\n" + secondary;
if (Base.isCommandLine()) {
System.out.println(title + ": " + message);
// TODO All these messages need to be handled differently for
// proper parsing on the command line. Many have \n in them.
System.out.println(title + ": " + primary + "\n" + secondary);
} else {
JOptionPane.showMessageDialog(new JFrame(),
Toolkit.formatMessage(primary, secondary),
title, JOptionPane.WARNING_MESSAGE);
EventQueue.invokeLater(() -> {
JOptionPane.showMessageDialog(new JFrame(),
Toolkit.formatMessage(primary, secondary),
title, JOptionPane.WARNING_MESSAGE);
});
}
if (e != null) e.printStackTrace();
}