From da8871fa35c4cd7293799e3957eb610b6fccf259 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sat, 22 Jan 2011 16:49:49 +0000
Subject: [PATCH] moving to new system

---
 .../tools/android/{AndroidMode.java => AndroidEditor.java}  | 6 +++---
 android/tool/src/processing/app/tools/android/Build.java    | 4 ++--
 android/tool/src/processing/app/tools/android/Manifest.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename android/tool/src/processing/app/tools/android/{AndroidMode.java => AndroidEditor.java} (99%)

diff --git a/android/tool/src/processing/app/tools/android/AndroidMode.java b/android/tool/src/processing/app/tools/android/AndroidEditor.java
similarity index 99%
rename from android/tool/src/processing/app/tools/android/AndroidMode.java
rename to android/tool/src/processing/app/tools/android/AndroidEditor.java
index 5fc1d4a39..530ff5d9b 100644
--- a/android/tool/src/processing/app/tools/android/AndroidMode.java
+++ b/android/tool/src/processing/app/tools/android/AndroidEditor.java
@@ -41,7 +41,7 @@ import javax.swing.JMenuItem;
 import processing.app.*;
 
 import processing.core.PApplet;
-import processing.mode.java.JavaMode;
+import processing.mode.java.*;
 import processing.mode.java.runner.Runner;
 
 // http://dl.google.com/android/repository/repository.xml
@@ -49,7 +49,7 @@ import processing.mode.java.runner.Runner;
 // http://dl.google.com/android/repository/tools_r03-macosx.zip
 
 
-public class AndroidMode extends JavaMode implements DeviceListener {  
+public class AndroidEditor extends JavaEditor implements DeviceListener {  
   private AndroidSDK sdk;
   private Editor editor;
   private Build build;
@@ -74,7 +74,7 @@ public class AndroidMode extends JavaMode implements DeviceListener {
   JCheckBoxMenuItem toggleItem;
   
   
-  public AndroidMode(Base base, File folder) {
+  public AndroidEditor(Base base, File folder) {
     super(base, folder);
   }
 
diff --git a/android/tool/src/processing/app/tools/android/Build.java b/android/tool/src/processing/app/tools/android/Build.java
index 30fe3e005..7178b163d 100644
--- a/android/tool/src/processing/app/tools/android/Build.java
+++ b/android/tool/src/processing/app/tools/android/Build.java
@@ -98,7 +98,7 @@ class Build extends processing.mode.java.Build {
         final File assetsFolder = mkdirs(tempBuildFolder, "assets");
 
         final InputStream input = 
-          PApplet.createInput(AndroidMode.getCoreZipLocation());
+          PApplet.createInput(AndroidEditor.getCoreZipLocation());
         PApplet.saveStream(new File(libsFolder, "processing-core.jar"), input);
 
         try {
@@ -154,7 +154,7 @@ class Build extends processing.mode.java.Build {
     File androidFolder = new File(sketch.getFolder(), "android");
     if (androidFolder.exists()) {
 //      Date mod = new Date(androidFolder.lastModified());
-      String stamp = AndroidMode.getDateStamp(androidFolder.lastModified());
+      String stamp = AndroidEditor.getDateStamp(androidFolder.lastModified());
       File dest = new File(sketch.getFolder(), "android." + stamp);
       boolean result = androidFolder.renameTo(dest);
       if (!result) {
diff --git a/android/tool/src/processing/app/tools/android/Manifest.java b/android/tool/src/processing/app/tools/android/Manifest.java
index 7ca67795e..6201d9b8c 100644
--- a/android/tool/src/processing/app/tools/android/Manifest.java
+++ b/android/tool/src/processing/app/tools/android/Manifest.java
@@ -234,7 +234,7 @@ public class Manifest {
         
         // remove the old manifest file, rename it with date stamp
         long lastModified = manifestFile.lastModified();
-        String stamp = AndroidMode.getDateStamp(lastModified);
+        String stamp = AndroidEditor.getDateStamp(lastModified);
         File dest = new File(sketch.getFolder(), MANIFEST_XML + "." + stamp);
         boolean moved = manifestFile.renameTo(dest);
         if (!moved) {