From a63dda54e58a454ed47b9c145e696f2f261aaa57 Mon Sep 17 00:00:00 2001
From: jdf <jdf@pobox.com>
Date: Thu, 25 Feb 2010 01:32:53 +0000
Subject: [PATCH] Rename Android to AndroidTool to better reflect its purpose,
 preparing to create a non-processing-related Android stack

---
 .../android/{Android.java => AndroidTool.java}     |  2 +-
 .../src/processing/app/tools/android/Build.java    |  7 ++++---
 .../src/processing/app/tools/android/Device.java   | 14 ++++----------
 .../src/processing/app/tools/android/Reset.java    |  4 ++--
 4 files changed, 11 insertions(+), 16 deletions(-)
 rename android/tool/src/processing/app/tools/android/{Android.java => AndroidTool.java} (99%)

diff --git a/android/tool/src/processing/app/tools/android/Android.java b/android/tool/src/processing/app/tools/android/AndroidTool.java
similarity index 99%
rename from android/tool/src/processing/app/tools/android/Android.java
rename to android/tool/src/processing/app/tools/android/AndroidTool.java
index efe59fd8a..d97dce723 100644
--- a/android/tool/src/processing/app/tools/android/Android.java
+++ b/android/tool/src/processing/app/tools/android/AndroidTool.java
@@ -40,7 +40,7 @@ import processing.core.PApplet;
 // http://dl.google.com/android/android-sdk_r3-mac.zip
 // http://dl.google.com/android/repository/tools_r03-macosx.zip
 
-public class Android implements Tool {
+public class AndroidTool implements Tool {
   static String sdkPath;
 
   static String toolName = "android";
diff --git a/android/tool/src/processing/app/tools/android/Build.java b/android/tool/src/processing/app/tools/android/Build.java
index fa085ddf5..593189d50 100644
--- a/android/tool/src/processing/app/tools/android/Build.java
+++ b/android/tool/src/processing/app/tools/android/Build.java
@@ -160,7 +160,8 @@ public class Build {
         final File libsFolder = mkdirs(androidFolder, "libs");
         final File assetsFolder = mkdirs(androidFolder, "assets");
 
-        final InputStream input = PApplet.createInput(Android.getCoreZipFile());
+        final InputStream input = PApplet.createInput(AndroidTool
+            .getCoreZipFile());
         PApplet.saveStream(new File(libsFolder, "processing-core.jar"), input);
 
         try {
@@ -493,9 +494,9 @@ public class Build {
       // Windows needs backslashes escaped, or it will also accept forward
       // slashes in the build file. We're using the forward slashes since this
       // path gets concatenated with a lot of others that use forwards anyway.
-      writer.println("sdk.dir=" + Android.sdkPath.replace('\\', '/'));
+      writer.println("sdk.dir=" + AndroidTool.sdkPath.replace('\\', '/'));
     } else {
-      writer.println("sdk.dir=" + Android.sdkPath);
+      writer.println("sdk.dir=" + AndroidTool.sdkPath);
     }
     writer.flush();
     writer.close();
diff --git a/android/tool/src/processing/app/tools/android/Device.java b/android/tool/src/processing/app/tools/android/Device.java
index b77a0cd3e..098ddf917 100644
--- a/android/tool/src/processing/app/tools/android/Device.java
+++ b/android/tool/src/processing/app/tools/android/Device.java
@@ -71,13 +71,6 @@ public class Device {
 
   static boolean checkDefaults() {
     try {
-      // if (!avdDonut.exists()) {
-      // if (!avdDonut.create()) {
-      // Base.showWarning("Android Error",
-      // "An error occurred while running “android create avd”\n" +
-      // "to set up the default Android emulator.", null);
-      // }
-      // }
       if (!avdEclair.exists()) {
         if (!avdEclair.create()) {
           Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
@@ -92,7 +85,8 @@ public class Device {
   }
 
   protected boolean exists() throws IOException {
-    final ProcessHelper p = new ProcessHelper(Android.toolName, "list", "avds");
+    final ProcessHelper p = new ProcessHelper(AndroidTool.toolName, "list",
+                                              "avds");
     try {
       if (p.execute(true) == 0) {
         for (final String line : p.getStdout().split("\n")) {
@@ -113,7 +107,7 @@ public class Device {
   }
 
   protected boolean create() throws IOException {
-    final ProcessHelper p = new ProcessHelper(Android.toolName, "create",
+    final ProcessHelper p = new ProcessHelper(AndroidTool.toolName, "create",
                                               "avd", "-n", name, "-t", target,
                                               "-c", "64M");
 
@@ -240,7 +234,7 @@ public class Device {
       startIndex++;
       String[] devices = new String[lines.length - startIndex];
       int deviceIndex = 0;
-      for (int i = startIndex; i < lines.length - 1; i++) {
+      for (int i = startIndex; i < lines.length; i++) {
         final String line = lines[i];
         final int tab = line.indexOf('\t');
         if (tab != -1) {
diff --git a/android/tool/src/processing/app/tools/android/Reset.java b/android/tool/src/processing/app/tools/android/Reset.java
index 6871a4846..0a6729233 100644
--- a/android/tool/src/processing/app/tools/android/Reset.java
+++ b/android/tool/src/processing/app/tools/android/Reset.java
@@ -39,11 +39,11 @@ public class Reset implements Tool {
   }
 
   public void run() {
-    if (Android.sdkPath == null) {
+    if (AndroidTool.sdkPath == null) {
       JOptionPane.showMessageDialog(editor, "Before using the reset command, "
           + "you must first enable Android Mode.");
     } else {
-      Android.resetServer(editor);
+      AndroidTool.resetServer(editor);
     }
   }
 }
\ No newline at end of file