From f3b85406e5f45db2d49abf2ed5b5fd238ebc97d1 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Tue, 13 Apr 2010 16:12:25 +0000
Subject: [PATCH] renaming package for consistency

---
 android/todo.txt                                          | 2 ++
 android/tool/src/processing/app/tools/android/AVD.java    | 4 ++--
 .../src/processing/app/tools/android/AndroidDevice.java   | 8 ++++----
 .../processing/app/tools/android/AndroidEnvironment.java  | 2 +-
 .../tool/src/processing/app/tools/android/AndroidSDK.java | 4 ++--
 .../processing/app/tools/android/EmulatorController.java  | 4 ++--
 app/src/processing/{util => app}/exec/LineProcessor.java  | 2 +-
 app/src/processing/{util => app}/exec/ProcessHelper.java  | 2 +-
 .../processing/{util => app}/exec/ProcessRegistry.java    | 2 +-
 app/src/processing/{util => app}/exec/ProcessResult.java  | 2 +-
 app/src/processing/{util => app}/exec/StreamPump.java     | 2 +-
 app/src/processing/app/tools/Uncrustify.java              | 4 ++--
 app/test/src/test/processing/parsing/ParserTests.java     | 2 +-
 app/test/src/test/processing/parsing/UTCompiler.java      | 4 ++--
 14 files changed, 23 insertions(+), 21 deletions(-)
 rename app/src/processing/{util => app}/exec/LineProcessor.java (71%)
 rename app/src/processing/{util => app}/exec/ProcessHelper.java (98%)
 rename app/src/processing/{util => app}/exec/ProcessRegistry.java (96%)
 rename app/src/processing/{util => app}/exec/ProcessResult.java (97%)
 rename app/src/processing/{util => app}/exec/StreamPump.java (98%)

diff --git a/android/todo.txt b/android/todo.txt
index 0c1bf0966..f8a80eb55 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -3,6 +3,8 @@ o when running a sketch, need to unlock the device
 o   http://dev.processing.org/bugs/show_bug.cgi?id=1500
 X add Pattern caching to match() to speed things up
 
+"Unable to resolve target 'Google...'" when APIs aren't installed
+
 _ path problems finding javac.exe on vista
 _   http://dev.processing.org/bugs/show_bug.cgi?id=1528
 
diff --git a/android/tool/src/processing/app/tools/android/AVD.java b/android/tool/src/processing/app/tools/android/AVD.java
index 98c5d78f9..fef75a6a9 100644
--- a/android/tool/src/processing/app/tools/android/AVD.java
+++ b/android/tool/src/processing/app/tools/android/AVD.java
@@ -4,8 +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;
+import processing.app.exec.ProcessHelper;
+import processing.app.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 05276fa87..c83068e02 100644
--- a/android/tool/src/processing/app/tools/android/AndroidDevice.java
+++ b/android/tool/src/processing/app/tools/android/AndroidDevice.java
@@ -9,11 +9,11 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import processing.app.debug.RunnerListener;
+import processing.app.exec.LineProcessor;
+import processing.app.exec.ProcessRegistry;
+import processing.app.exec.ProcessResult;
+import processing.app.exec.StreamPump;
 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 c9b12b95a..873ef8885 100644
--- a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
+++ b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
@@ -11,8 +11,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import processing.app.exec.ProcessResult;
 import processing.app.tools.android.EmulatorController.State;
-import processing.util.exec.ProcessResult;
 
 /**
  * <pre> 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 c56a4e2cb..1ae1f8912 100644
--- a/android/tool/src/processing/app/tools/android/AndroidSDK.java
+++ b/android/tool/src/processing/app/tools/android/AndroidSDK.java
@@ -7,8 +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;
+import processing.app.exec.ProcessHelper;
+import processing.app.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 f33126e5b..1d6497f21 100644
--- a/android/tool/src/processing/app/tools/android/EmulatorController.java
+++ b/android/tool/src/processing/app/tools/android/EmulatorController.java
@@ -3,8 +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;
+import processing.app.exec.ProcessRegistry;
+import processing.app.exec.StreamPump;
 
 class EmulatorController {
   public static enum State {
diff --git a/app/src/processing/util/exec/LineProcessor.java b/app/src/processing/app/exec/LineProcessor.java
similarity index 71%
rename from app/src/processing/util/exec/LineProcessor.java
rename to app/src/processing/app/exec/LineProcessor.java
index 2888ac563..dae4b457b 100644
--- a/app/src/processing/util/exec/LineProcessor.java
+++ b/app/src/processing/app/exec/LineProcessor.java
@@ -1,4 +1,4 @@
-package processing.util.exec;
+package processing.app.exec;
 
 public interface LineProcessor {
   void processLine(final String line);
diff --git a/app/src/processing/util/exec/ProcessHelper.java b/app/src/processing/app/exec/ProcessHelper.java
similarity index 98%
rename from app/src/processing/util/exec/ProcessHelper.java
rename to app/src/processing/app/exec/ProcessHelper.java
index 62fbe12af..7f949fc17 100644
--- a/app/src/processing/util/exec/ProcessHelper.java
+++ b/app/src/processing/app/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.util.exec;
+package processing.app.exec;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/app/src/processing/util/exec/ProcessRegistry.java b/app/src/processing/app/exec/ProcessRegistry.java
similarity index 96%
rename from app/src/processing/util/exec/ProcessRegistry.java
rename to app/src/processing/app/exec/ProcessRegistry.java
index 158faa4d5..b3254bc04 100644
--- a/app/src/processing/util/exec/ProcessRegistry.java
+++ b/app/src/processing/app/exec/ProcessRegistry.java
@@ -1,4 +1,4 @@
-package processing.util.exec;
+package processing.app.exec;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/app/src/processing/util/exec/ProcessResult.java b/app/src/processing/app/exec/ProcessResult.java
similarity index 97%
rename from app/src/processing/util/exec/ProcessResult.java
rename to app/src/processing/app/exec/ProcessResult.java
index b2253e8dc..713672743 100644
--- a/app/src/processing/util/exec/ProcessResult.java
+++ b/app/src/processing/app/exec/ProcessResult.java
@@ -1,4 +1,4 @@
-package processing.util.exec;
+package processing.app.exec;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/app/src/processing/util/exec/StreamPump.java b/app/src/processing/app/exec/StreamPump.java
similarity index 98%
rename from app/src/processing/util/exec/StreamPump.java
rename to app/src/processing/app/exec/StreamPump.java
index 9e3f9c430..1b4588fc3 100644
--- a/app/src/processing/util/exec/StreamPump.java
+++ b/app/src/processing/app/exec/StreamPump.java
@@ -1,4 +1,4 @@
-package processing.util.exec;
+package processing.app.exec;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/processing/app/tools/Uncrustify.java b/app/src/processing/app/tools/Uncrustify.java
index 89689bdee..f30f7cb02 100644
--- a/app/src/processing/app/tools/Uncrustify.java
+++ b/app/src/processing/app/tools/Uncrustify.java
@@ -5,8 +5,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import processing.app.Base;
 import processing.app.Editor;
-import processing.util.exec.ProcessHelper;
-import processing.util.exec.ProcessResult;
+import processing.app.exec.ProcessHelper;
+import processing.app.exec.ProcessResult;
 
 public class Uncrustify implements Tool {
 
diff --git a/app/test/src/test/processing/parsing/ParserTests.java b/app/test/src/test/processing/parsing/ParserTests.java
index 968fdddba..13842e8c2 100644
--- a/app/test/src/test/processing/parsing/ParserTests.java
+++ b/app/test/src/test/processing/parsing/ParserTests.java
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import processing.app.debug.RunnerException;
-import processing.util.exec.ProcessResult;
+import processing.app.exec.ProcessResult;
 import antlr.RecognitionException;
 import static test.processing.parsing.ProcessingTestUtil.res;
 import static test.processing.parsing.ProcessingTestUtil.COMPILER;
diff --git a/app/test/src/test/processing/parsing/UTCompiler.java b/app/test/src/test/processing/parsing/UTCompiler.java
index 6eab70535..b3a5b2234 100644
--- a/app/test/src/test/processing/parsing/UTCompiler.java
+++ b/app/test/src/test/processing/parsing/UTCompiler.java
@@ -5,8 +5,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import processing.app.Base;
 import processing.app.Platform;
-import processing.util.exec.ProcessHelper;
-import processing.util.exec.ProcessResult;
+import processing.app.exec.ProcessHelper;
+import processing.app.exec.ProcessResult;
 
 /**
  * Utility class for compiling single compilationUnits.