Skip to content

Commit 65a1fbb

Browse files
committed
working on android stuff, debugging whatnot
1 parent d589008 commit 65a1fbb

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

app/src/processing/app/exec/ProcessResult.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public class ProcessResult implements Iterable<String> {
1010
private final String error;
1111
private final int result;
1212

13-
public ProcessResult(final String cmd, final int result, final String output,
14-
final String error, final long time) {
13+
public ProcessResult(String cmd, int result, String output,
14+
String error, long time) {
1515
this.cmd = cmd;
1616
this.output = output;
1717
this.error = error;
@@ -52,8 +52,8 @@ public String toString() {
5252
final StringBuilder sb = new StringBuilder(cmd).append("\n");
5353
sb.append(" status: ").append(result).append("\n");
5454
sb.append(" ").append(time).append("ms").append("\n");
55-
sb.append(" stdout:\n").append(output).append("\n");
56-
sb.append(" stderr:\n").append(error);
55+
sb.append(" stdout:\n").append(output.trim()).append("\n");
56+
sb.append(" stderr:\n").append(error.trim());
5757
return sb.toString();
5858
}
5959

app/src/processing/app/exec/StreamPump.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import java.util.concurrent.ExecutorService;
1313
import java.util.concurrent.Executors;
1414
import java.util.concurrent.ThreadFactory;
15+
import processing.app.EditorConsole;
16+
1517

1618
/**
1719
* <p>A StreamPump reads lines of text from its given InputStream
@@ -24,8 +26,8 @@
2426
*
2527
*/
2628
public class StreamPump implements Runnable {
27-
private static final ExecutorService threads = Executors
28-
.newCachedThreadPool(new ThreadFactory() {
29+
private static final ExecutorService threads =
30+
Executors.newCachedThreadPool(new ThreadFactory() {
2931
public Thread newThread(final Runnable r) {
3032
final Thread t = new Thread(r);
3133
t.setDaemon(true);
@@ -59,6 +61,8 @@ public StreamPump addTarget(final LineProcessor out) {
5961
}
6062

6163
public void start() {
64+
// System.out.println("starting new StreamPump");
65+
// new Exception().printStackTrace(EditorConsole.systemOut);
6266
threads.execute(this);
6367
}
6468

0 commit comments

Comments
 (0)