[WIP] make compatible with the new processing APIs

build.xml

@@ -36,16 +36,24 @@
 <!--
 	   classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
 -->
-    <javac source="1.6" 
-	   target="1.6" 
-	   destdir="bin" 
-	   encoding="UTF-8" 
+    <condition property="java-mode-built">
+      <available file="${processing.dir}/java/mode/JavaMode.jar" />
+    </condition>
+    <fail unless="java-mode-built" />
+    <copy file="${processing.dir}/java/mode/JavaMode.jar"
+      tofile="mode/JavaMode.jar" />
+
+    <javac source="1.6"
+	   target="1.6"
+	   destdir="bin"
+	   encoding="UTF-8"
 	   includeAntRuntime="false"
- 	   classpath="${processing.dir}/core/library/core.jar; 
+ 	   classpath="${processing.dir}/core/library/core.jar;
+          ${processing.dir}/java/mode/JavaMode.jar;
 		      ${processing.dir}/app/pde.jar;
 		      ${processing.dir}/app/lib/ant.jar;
 		      ${processing.dir}/app/lib/ant-launcher.jar;
-		      ${processing.dir}/app/lib/antlr.jar;
+		      ${processing.dir}/java/mode/antlr.jar;
 		      mode/org.eclipse.core.runtime-3.1.0.jar"
 	   debug="on">
       <src path="src" />

src/processing/mode/android/AndroidBuild.java

@@ -628,7 +628,8 @@ private void writeBuildXML(final File file, final String projectName) {
     writer.println("       <isset property=\"env.ANDROID_HOME\" />");
     writer.println("  </condition>");
 
-    writer.println("  <property name=\"ecj.jar\" value=\"" + Base.getToolsFolder() + "/../modes/java/mode/ecj.jar\" />");
+    writer.println("  <property name=\"jdtCompilerAdapter.jar\" value=\"" + Base.getToolsFolder() + "/../modes/java/mode/jdtCompilerAdapter.jar\" />");
+    writer.println("  <property name=\"jdt-core.jar\" value=\"" + Base.getToolsFolder() + "/../modes/java/mode/org.eclipse.jdt.core.jar\" />");
     writer.println("  <property name=\"build.compiler\" value=\"org.eclipse.jdt.core.JDTCompilerAdapter\" />");
 
     writer.println("  <mkdir dir=\"bin\" />");
@@ -655,7 +656,7 @@ private void writeBuildXML(final File file, final String projectName) {
     writer.println("                <src path=\"${source.absolute.dir}\" />");
     writer.println("                <src path=\"${gen.absolute.dir}\" />");
     writer.println("                <compilerarg line=\"${java.compilerargs}\" />");
-    writer.println("                <compilerclasspath path=\"${ecj.jar}\" />");
+    writer.println("                <compilerclasspath path=\"${jdtCompilerAdapter.jar};${jdt-core.jar}\" />");
     writer.println("            </javac>");
 
     writer.println("            <if condition=\"${build.is.instrumented}\">");

src/processing/mode/android/AndroidEditor.java

@@ -128,7 +128,7 @@ protected AndroidEditor(Base base, String path, EditorState state, Mode mode) th
 
 
   public EditorToolbar createToolbar() {
-    return new AndroidToolbar(this, base);
+    return new AndroidToolbar(this);
   }
 
 
@@ -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.activate(AndroidToolbar.RUN);
+          toolbar.activateRun();
           startIndeterminate();
           prepareRun();
           try {
@@ -522,9 +525,11 @@ public void run() {
     }
   }
 
-
+
+  @Override
   public void handleStop() {
-    toolbar.deactivate(AndroidToolbar.RUN);
+//    toolbar.deactivate(AndroidToolbar.RUN);
+    toolbar.deactivateRun();
     stopIndeterminate();
     androidMode.handleStop(this);
   }
@@ -538,7 +543,8 @@ public void handleExportProject() {
     if (handleExportCheckModified()) {
       new Thread() {
         public void run() {
-          toolbar.activate(AndroidToolbar.EXPORT);
+//          toolbar.activate(AndroidToolbar.EXPORT);
+          toolbar.activateRun();
           startIndeterminate();
           statusNotice("Exporting a debug version of the sketch...");
           AndroidBuild build = new AndroidBuild(sketch, androidMode);
@@ -554,7 +560,8 @@ public void run() {
             statusError(e);
           }
           stopIndeterminate();
-          toolbar.deactivate(AndroidToolbar.EXPORT);
+//          toolbar.deactivate(AndroidToolbar.EXPORT);
+          toolbar.deactivateRun();
         }
       }.start();
     }

src/processing/mode/android/AndroidToolbar.java

@@ -20,12 +20,12 @@
 
 package processing.mode.android;
 
-import java.awt.Image;
+import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 
+import javax.swing.Box;
 import javax.swing.JPopupMenu;
 
-import processing.app.Base;
 import processing.app.Editor;
 import processing.app.EditorToolbar;
 
@@ -39,21 +39,21 @@ public class AndroidToolbar extends EditorToolbar {
   static protected final int OPEN   = 3;
   static protected final int SAVE   = 4;
   static protected final int EXPORT = 5;
+
+  AndroidEditor aeditor;;
 
 
-  public AndroidToolbar(Editor editor, Base base) {
-    super(editor, base);
+  public AndroidToolbar(Editor editor) {
+    super(editor);
+    this.aeditor = (AndroidEditor) 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);
-    }
+
+  @Override
+  public void addModeButtons(Box box) {
+	  //TODO: What to write here ?
   }
 
-
   static public String getTitle(int index, boolean shift) {
     switch (index) {
     case RUN:    return !shift ? "Run on Device" : "Run in Emulator";
@@ -111,4 +111,21 @@ public void handlePressed(MouseEvent e, int sel) {
       break;
     }
   }
+
+
+  @Override
+  public void handleStop() {
+	aeditor.handleStop();
+  }
+
+
+  @Override
+  public void handleRun(int modifiers) {
+	boolean shift = (modifiers & InputEvent.SHIFT_MASK) != 0;
+	if (!shift) {
+      aeditor.handleRunDevice();
+    } else {
+      aeditor.handleRunEmulator();
+    }
+  }
 }