diff --git a/android/tool/src/processing/app/tools/android/AVD.java b/android/tool/src/processing/app/tools/android/AVD.java index ae1286163..2047193f2 100644 --- a/android/tool/src/processing/app/tools/android/AVD.java +++ b/android/tool/src/processing/app/tools/android/AVD.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; import processing.app.Base; +import processing.util.exec.ProcessHelper; +import processing.util.exec.ProcessResult; public class AVD { // Tempting to switch to WVGA854 (854x480), the same aspect ratio diff --git a/android/tool/src/processing/app/tools/android/AndroidDevice.java b/android/tool/src/processing/app/tools/android/AndroidDevice.java index b84ca8055..05276fa87 100644 --- a/android/tool/src/processing/app/tools/android/AndroidDevice.java +++ b/android/tool/src/processing/app/tools/android/AndroidDevice.java @@ -10,6 +10,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import processing.app.debug.RunnerListener; import processing.app.tools.android.LogEntry.Severity; +import processing.util.exec.LineProcessor; +import processing.util.exec.ProcessRegistry; +import processing.util.exec.ProcessResult; +import processing.util.exec.StreamPump; class AndroidDevice implements AndroidDeviceProperties { private final AndroidEnvironment env; diff --git a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java index eb6cf6cb0..c9b12b95a 100644 --- a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java +++ b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java @@ -12,6 +12,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import processing.app.tools.android.EmulatorController.State; +import processing.util.exec.ProcessResult; /** *
 AndroidEnvironment env = AndroidEnvironment.getInstance();
diff --git a/android/tool/src/processing/app/tools/android/AndroidSDK.java b/android/tool/src/processing/app/tools/android/AndroidSDK.java
index 7199c16c5..c56a4e2cb 100644
--- a/android/tool/src/processing/app/tools/android/AndroidSDK.java
+++ b/android/tool/src/processing/app/tools/android/AndroidSDK.java
@@ -7,6 +7,8 @@ import javax.swing.JOptionPane;
 import processing.app.Base;
 import processing.app.Platform;
 import processing.app.Preferences;
+import processing.util.exec.ProcessHelper;
+import processing.util.exec.ProcessResult;
 
 class AndroidSDK {
   private final File sdk;
diff --git a/android/tool/src/processing/app/tools/android/EmulatorController.java b/android/tool/src/processing/app/tools/android/EmulatorController.java
index d111f2dc0..f33126e5b 100644
--- a/android/tool/src/processing/app/tools/android/EmulatorController.java
+++ b/android/tool/src/processing/app/tools/android/EmulatorController.java
@@ -3,6 +3,8 @@ package processing.app.tools.android;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import processing.app.Preferences;
+import processing.util.exec.ProcessRegistry;
+import processing.util.exec.StreamPump;
 
 class EmulatorController {
   public static enum State {
diff --git a/android/tool/src/processing/app/tools/android/LineProcessor.java b/android/tool/src/processing/app/tools/android/LineProcessor.java
deleted file mode 100644
index 39e58434a..000000000
--- a/android/tool/src/processing/app/tools/android/LineProcessor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package processing.app.tools.android;
-
-interface LineProcessor {
-  void processLine(final String line);
-}
diff --git a/app/src/processing/util/exec/LineProcessor.java b/app/src/processing/util/exec/LineProcessor.java
new file mode 100644
index 000000000..2888ac563
--- /dev/null
+++ b/app/src/processing/util/exec/LineProcessor.java
@@ -0,0 +1,5 @@
+package processing.util.exec;
+
+public interface LineProcessor {
+  void processLine(final String line);
+}
diff --git a/android/tool/src/processing/app/tools/android/ProcessHelper.java b/app/src/processing/util/exec/ProcessHelper.java
similarity index 97%
rename from android/tool/src/processing/app/tools/android/ProcessHelper.java
rename to app/src/processing/util/exec/ProcessHelper.java
index ace855852..62fbe12af 100644
--- a/android/tool/src/processing/app/tools/android/ProcessHelper.java
+++ b/app/src/processing/util/exec/ProcessHelper.java
@@ -17,7 +17,7 @@
  along with this program; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package processing.app.tools.android;
+package processing.util.exec;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -28,7 +28,7 @@ import java.io.StringWriter;
  *
  * @author Jonathan Feinberg 
  */
-class ProcessHelper {
+public class ProcessHelper {
   private final String[] cmd;
 
   public ProcessHelper(final String... cmd) {
diff --git a/android/tool/src/processing/app/tools/android/ProcessRegistry.java b/app/src/processing/util/exec/ProcessRegistry.java
similarity index 95%
rename from android/tool/src/processing/app/tools/android/ProcessRegistry.java
rename to app/src/processing/util/exec/ProcessRegistry.java
index 56bc813b4..158faa4d5 100644
--- a/android/tool/src/processing/app/tools/android/ProcessRegistry.java
+++ b/app/src/processing/util/exec/ProcessRegistry.java
@@ -1,4 +1,4 @@
-package processing.app.tools.android;
+package processing.util.exec;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/android/tool/src/processing/app/tools/android/ProcessResult.java b/app/src/processing/util/exec/ProcessResult.java
similarity index 97%
rename from android/tool/src/processing/app/tools/android/ProcessResult.java
rename to app/src/processing/util/exec/ProcessResult.java
index 4147a6639..b2253e8dc 100644
--- a/android/tool/src/processing/app/tools/android/ProcessResult.java
+++ b/app/src/processing/util/exec/ProcessResult.java
@@ -1,4 +1,4 @@
-package processing.app.tools.android;
+package processing.util.exec;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/app/src/processing/util/exec/StreamPump.java
similarity index 96%
rename from android/tool/src/processing/app/tools/android/StreamPump.java
rename to app/src/processing/util/exec/StreamPump.java
index e482dbb6e..4285056cc 100644
--- a/android/tool/src/processing/app/tools/android/StreamPump.java
+++ b/app/src/processing/util/exec/StreamPump.java
@@ -1,7 +1,4 @@
-/**
- * 
- */
-package processing.app.tools.android;
+package processing.util.exec;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -26,7 +23,7 @@ import java.util.concurrent.ThreadFactory;
  * @author Jonathan Feinberg <jdf@pobox.com>
  *
  */
-class StreamPump implements Runnable {
+public class StreamPump implements Runnable {
   private static final ExecutorService threads = Executors
       .newCachedThreadPool(new ThreadFactory() {
         public Thread newThread(final Runnable r) {