From 65a1fbbd70c36502ee2f0bea23fc8a94decf60d9 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 27 Jun 2010 00:04:38 +0000
Subject: [PATCH] working on android stuff, debugging whatnot

---
 app/src/processing/app/exec/ProcessResult.java | 8 ++++----
 app/src/processing/app/exec/StreamPump.java    | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/processing/app/exec/ProcessResult.java b/app/src/processing/app/exec/ProcessResult.java
index 713672743..7d36a1c23 100644
--- a/app/src/processing/app/exec/ProcessResult.java
+++ b/app/src/processing/app/exec/ProcessResult.java
@@ -10,8 +10,8 @@ public class ProcessResult implements Iterable<String> {
   private final String error;
   private final int result;
 
-  public ProcessResult(final String cmd, final int result, final String output,
-                       final String error, final long time) {
+  public ProcessResult(String cmd, int result, String output,
+                       String error, long time) {
     this.cmd = cmd;
     this.output = output;
     this.error = error;
@@ -52,8 +52,8 @@ public class ProcessResult implements Iterable<String> {
     final StringBuilder sb = new StringBuilder(cmd).append("\n");
     sb.append("    status: ").append(result).append("\n");
     sb.append("    ").append(time).append("ms").append("\n");
-    sb.append("    stdout:\n").append(output).append("\n");
-    sb.append("    stderr:\n").append(error);
+    sb.append("    stdout:\n").append(output.trim()).append("\n");
+    sb.append("    stderr:\n").append(error.trim());
     return sb.toString();
   }
 
diff --git a/app/src/processing/app/exec/StreamPump.java b/app/src/processing/app/exec/StreamPump.java
index 2ee653bcf..fac45cc56 100644
--- a/app/src/processing/app/exec/StreamPump.java
+++ b/app/src/processing/app/exec/StreamPump.java
@@ -12,6 +12,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import processing.app.EditorConsole;
+
 
 /**
  * <p>A StreamPump reads lines of text from its given InputStream 
@@ -24,8 +26,8 @@ import java.util.concurrent.ThreadFactory;
  *
  */
 public class StreamPump implements Runnable {
-  private static final ExecutorService threads = Executors
-      .newCachedThreadPool(new ThreadFactory() {
+  private static final ExecutorService threads = 
+    Executors.newCachedThreadPool(new ThreadFactory() {
         public Thread newThread(final Runnable r) {
           final Thread t = new Thread(r);
           t.setDaemon(true);
@@ -59,6 +61,8 @@ public class StreamPump implements Runnable {
   }
 
   public void start() {
+//    System.out.println("starting new StreamPump");
+//    new Exception().printStackTrace(EditorConsole.systemOut);
     threads.execute(this);
   }