moving to new system

This commit is contained in:
benfry
2011-01-22 16:49:49 +00:00
parent 72b34fc4f8
commit da8871fa35
3 changed files with 6 additions and 6 deletions
@@ -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);
}
@@ -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) {
@@ -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) {