updated to recent changes in editor API

Author: codeanticode

src/processing/mode/android/AndroidEditor.java

@@ -446,7 +446,8 @@ public void showReference(String filename) {
   public void statusError(String what) {
     super.statusError(what);
 //    new Exception("deactivating RUN").printStackTrace();
-    toolbar.deactivate(AndroidToolbar.RUN);
+//    toolbar.deactivate(AndroidToolbar.RUN);
+    toolbar.deactivateRun();
   }
 
 
@@ -462,7 +463,8 @@ public void sketchStopped() {
   public void handleRunEmulator() {
     new Thread() {
       public void run() {
-        toolbar.activate(AndroidToolbar.RUN);
+//        toolbar.activate(AndroidToolbar.RUN);
+        toolbar.activateRun();
         startIndeterminate();
         prepareRun();
         try {
@@ -506,7 +508,8 @@ public void handleRunDevice() {
     } else {
       new Thread() {
         public void run() {
-          toolbar.activate(AndroidToolbar.RUN);
+          toolbar.activateRun();
+//          toolbar.activate(AndroidToolbar.RUN);
           startIndeterminate();
           prepareRun();
           try {
@@ -524,7 +527,8 @@ public void run() {
 
 
   public void handleStop() {
-    toolbar.deactivate(AndroidToolbar.RUN);
+    toolbar.deactivateRun();
+//    toolbar.deactivate(AndroidToolbar.RUN);
     stopIndeterminate();
     androidMode.handleStop(this);
   }
@@ -538,7 +542,8 @@ public void handleExportProject() {
     if (handleExportCheckModified()) {
       new Thread() {
         public void run() {
-          toolbar.activate(AndroidToolbar.EXPORT);
+//          toolbar.activate(AndroidToolbar.EXPORT);
+          ((AndroidToolbar)toolbar).activateExport();
           startIndeterminate();
           statusNotice("Exporting a debug version of the sketch...");
           AndroidBuild build = new AndroidBuild(sketch, androidMode);
@@ -554,7 +559,8 @@ public void run() {
             statusError(e);
           }
           stopIndeterminate();
-          toolbar.deactivate(AndroidToolbar.EXPORT);
+//          toolbar.deactivate(AndroidToolbar.EXPORT);
+          ((AndroidToolbar)toolbar).deactivateExport();
         }
       }.start();
     }

src/processing/mode/android/AndroidToolbar.java

@@ -42,16 +42,18 @@ public class AndroidToolbar extends EditorToolbar {
 
 
   public AndroidToolbar(Editor editor, Base base) {
-    super(editor, base);
+    super(editor);
   }
 
 
-  public void init() {
-    Image[][] images = loadImages();
-    for (int i = 0; i < 6; i++) {
-      addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
-    }
-  }
+  // TODO:
+  // Buttons are initialized in createButtons, see code of EditorToolbar.rebuild()
+//  public void init() {
+//    Image[][] images = loadImages();
+//    for (int i = 0; i < 6; i++) {
+//      addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
+//    }
+//  }
 
 
   static public String getTitle(int index, boolean shift) {
@@ -111,4 +113,28 @@ public void handlePressed(MouseEvent e, int sel) {
       break;
     }
   }
+
+
+  @Override
+  public void handleRun(int modifiers) {
+    // TODO Auto-generated method stub
+    
+  }
+
+
+  @Override
+  public void handleStop() {
+    // TODO Auto-generated method stub
+   
+  }
+  
+  
+  public void activateExport() {
+    // TODO added to match the new API in EditorToolbar (activateRun, etc).
+  }
+
+
+  public void deactivateExport() {
+    // TODO added to match the new API in EditorToolbar (activateRun, etc).
+  }    
 }