arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Moved showWarning() implementation from Base to BaseNoGui.

Browse Source
This commit is contained in:
Claudio Indellicati
2014-08-21 20:25:23 +02:00
committed by Cristian Maglie
parent 74f59c215a
commit eb284804f5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/processing/app/Base.java
View File

@ -2265,16 +2265,7 @@ public class Base {
* Non-fatal error message with optional stack trace side dish. * Non-fatal error message with optional stack trace side dish.
*/ */
static public void showWarning(String title, String message, Exception e) { static public void showWarning(String title, String message, Exception e) {
if (title == null) title = _("Warning"); BaseNoGui.showWarning(title, message, e);
if (commandLine) {
System.out.println(title + ": " + message);
} else {
JOptionPane.showMessageDialog(new Frame(), message, title,
JOptionPane.WARNING_MESSAGE);
}
if (e != null) e.printStackTrace();
} }

8
app/src/processing/app/BaseNoGui.java
View File

@ -450,4 +450,12 @@ public class BaseNoGui {
static public void showMessage(String title, String message) { static public void showMessage(String title, String message) {
notifier.showMessage(title, message); notifier.showMessage(title, message);
} }
/**
* Non-fatal error message with optional stack trace side dish.
*/
static public void showWarning(String title, String message, Exception e) {
notifier.showWarning(title, message, e);
}
} }