Skip to content

Commit b637c6f

Browse files
committed
fix for Runner change
1 parent f841f2b commit b637c6f

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/processing/mode/android/AndroidRunner.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121

2222
package processing.mode.android;
2323

24+
import java.io.PrintStream;
2425
import java.util.Iterator;
2526
import java.util.List;
2627
import java.util.concurrent.*;
2728
import java.util.regex.Matcher;
2829
import java.util.regex.Pattern;
2930

31+
import processing.app.Editor;
3032
import processing.app.RunnerListener;
3133
import processing.app.SketchException;
3234
import processing.mode.java.runner.Runner;
@@ -36,10 +38,22 @@ public class AndroidRunner implements DeviceListener {
3638
AndroidBuild build;
3739
RunnerListener listener;
3840

41+
protected PrintStream sketchErr;
42+
protected PrintStream sketchOut;
43+
3944

4045
public AndroidRunner(AndroidBuild build, RunnerListener listener) {
4146
this.build = build;
4247
this.listener = listener;
48+
49+
if (listener instanceof Editor) {
50+
Editor editor = (Editor) listener;
51+
sketchErr = editor.getConsole().getErr();
52+
sketchOut = editor.getConsole().getOut();
53+
} else {
54+
sketchErr = System.err;
55+
sketchOut = System.out;
56+
}
4357
}
4458

4559

@@ -263,7 +277,7 @@ public void stackTrace(final List<String> trace) {
263277
// if (Runner.handleCommonErrors(exceptionClass, exceptionLine, listener)) {
264278
// return;
265279
// }
266-
Runner.handleCommonErrors(exceptionClass, exceptionLine, listener);
280+
Runner.handleCommonErrors(exceptionClass, exceptionLine, listener, sketchErr);
267281

268282
while (frames.hasNext()) {
269283
final String line = frames.next();

0 commit comments

Comments
 (0)