From 0fda503420e9075a76463526d4b7c3eaf0d874bb Mon Sep 17 00:00:00 2001
From: jdf <jdf@pobox.com>
Date: Thu, 25 Feb 2010 21:15:23 +0000
Subject: [PATCH] fix attributions

---
 .../app/tools/android/AndroidEnvironment.java |  2 +-
 .../app/tools/android/ProcessHelper.java      | 22 ++++++++++++++-----
 .../app/tools/android/SketchLogCatter.java    |  2 +-
 .../app/tools/android/StreamPump.java         |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
index fb9088fb9..fd8bf4b21 100644
--- a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
+++ b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
  * 
  * AndroidDevice n1 = env.getHardware();</pre>
  * 
- * @author Jonathan Feinberg &lt;jdf@us.ibm.com&gt;
+ * @author Jonathan Feinberg &lt;jdf@pobox.com&gt;
  *
  */
 public class AndroidEnvironment implements AndroidEnvironmentProperties {
diff --git a/android/tool/src/processing/app/tools/android/ProcessHelper.java b/android/tool/src/processing/app/tools/android/ProcessHelper.java
index 783f6f8f8..fa2f63917 100644
--- a/android/tool/src/processing/app/tools/android/ProcessHelper.java
+++ b/android/tool/src/processing/app/tools/android/ProcessHelper.java
@@ -21,7 +21,6 @@ package processing.app.tools.android;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import processing.core.PApplet;
 
 /**
  * Class to handle calling Runtime.exec() and stuffing output and error streams
@@ -37,7 +36,14 @@ class ProcessHelper {
   }
 
   public String getCommand() {
-    return PApplet.join(cmd, " ");
+    final StringBuffer buffer = new StringBuffer();
+    for (int i = 0; i < cmd.length; i++) {
+      if (i != 0) {
+        buffer.append(" ");
+      }
+      buffer.append(cmd[i]);
+    }
+    return buffer.toString();
   }
 
   /**
@@ -76,6 +82,8 @@ class ProcessHelper {
     final StringWriter errWriter = new StringWriter();
     final long startTime = System.currentTimeMillis();
 
+    final String prettyCommand = getCommand();
+    //    System.err.println("ProcessHelper: begin " + prettyCommand);
     final Process process = Runtime.getRuntime().exec(cmd);
 
     final StreamPump outpump = new StreamPump(process.getInputStream())
@@ -92,11 +100,13 @@ class ProcessHelper {
     }
     errpump.start();
     try {
-      return new ProcessResult(getCommand(), process.waitFor(), outWriter
-          .toString(), errWriter.toString(), System.currentTimeMillis()
-          - startTime);
+      final int result = process.waitFor();
+      final long time = System.currentTimeMillis() - startTime;
+      //      System.err.println("ProcessHelper: " + time + "ms: " + prettyCommand);
+      return new ProcessResult(prettyCommand, result, outWriter.toString(),
+                               errWriter.toString(), time);
     } catch (final InterruptedException e) {
-      System.err.println("Interrupted: " + getCommand());
+      System.err.println("Interrupted: " + prettyCommand);
       throw e;
     }
   }
diff --git a/android/tool/src/processing/app/tools/android/SketchLogCatter.java b/android/tool/src/processing/app/tools/android/SketchLogCatter.java
index e9b9b45a9..9d7e53838 100644
--- a/android/tool/src/processing/app/tools/android/SketchLogCatter.java
+++ b/android/tool/src/processing/app/tools/android/SketchLogCatter.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
 
 /**
  * 
- * @author Jonathan Feinberg <jdf@us.ibm.com>
+ * @author Jonathan Feinberg &lt;jdf@pobox.com&gt;
  *
  */
 class SketchLogCatter implements LineProcessor {
diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/android/tool/src/processing/app/tools/android/StreamPump.java
index b3a5dc012..16170fb1f 100644
--- a/android/tool/src/processing/app/tools/android/StreamPump.java
+++ b/android/tool/src/processing/app/tools/android/StreamPump.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ThreadFactory;
  * text, and not for arbitrary binary cruft.</b> It's handy for reading
  * the output of processes that emit textual data, for example.
  * 
- * @author Jonathan Feinberg &lt;jdf@us.ibm.com&gt;
+ * @author Jonathan Feinberg &lt;jdf@pobox.com&gt;
  *
  */
 class StreamPump implements Runnable {