fix methods setup so that android also auto-adds methods from PGraphics/PImage

android/core/build.xml

@@ -18,6 +18,11 @@
   </target>
 
   <target name="actual_build" if="env.ANDROID_SDK">
+    <taskdef name="methods" 
+	     classname="PAppletMethods" 
+	     classpath="../../core/methods/methods.jar" />
+    <methods dir="${basedir}/src/processing/core" recorder="false" />
+
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   encoding="UTF-8"

android/todo.txt

@@ -1,4 +1,5 @@
 0206 android
+X add full PAppletMethods implementation to Android
 
 
 _ Android OPENGL renderer + JAVA2D PGraphics results in PTexture exception

core/build.xml

@@ -10,7 +10,7 @@
     <taskdef name="methods" 
 	     classname="PAppletMethods" 
 	     classpath="methods/methods.jar" />
-    <methods dir="${basedir}/src/processing/core" />
+    <methods dir="${basedir}/src/processing/core" recorder="true" />
 
     <mkdir dir="bin" />
     <javac target="1.6" 

core/methods/src/PAppletMethods.java

@@ -19,6 +19,7 @@ import org.apache.tools.ant.Task;
 public class PAppletMethods extends Task {
 
   private File baseDir;
+  private boolean includeRecorder;
 
 
   public PAppletMethods() {
@@ -30,6 +31,11 @@ public class PAppletMethods extends Task {
   }
 
 
+  public void setRecorder(boolean rec) {
+    includeRecorder = rec;
+  }
+
+
   public void execute() throws BuildException {
     // Do a bunch of checks...
     if (baseDir == null) {
@@ -247,7 +253,7 @@ public class PAppletMethods extends Task {
         gline += ");";
         rline += ");";
 
-        if (!gotStatic && returns.equals("")) {
+        if (!gotStatic && returns.equals("") && includeRecorder) {
           out.append(rline);
           out.append('\n');
         }

core/todo.txt

@@ -1,6 +1,7 @@
 0206 core (2.0a7)
 X change appletViewer back to 'online'
 
+
 constants/hints
 _ bring PConstants back in line w/ previous 1.5 (can't renumber)
 _ consider enable("mipmaps") instead of hint(ENABLE_MIPMAPS)