From fbdca0632dcb0cbd41c1c802656cfc06cefcc0c2 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sat, 1 Sep 2012 18:44:56 +0000
Subject: [PATCH] more cleanups

---
 android/core/src/processing/core/PApplet.java |  2 +-
 android/todo.txt                              |  2 +-
 core/src/processing/core/PApplet.java         | 12 ++++++------
 core/todo.txt                                 |  2 +-
 todo.txt                                      |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java
index 18fff07ee..98818f00c 100644
--- a/android/core/src/processing/core/PApplet.java
+++ b/android/core/src/processing/core/PApplet.java
@@ -9226,7 +9226,7 @@ public class PApplet extends Activity implements PConstants, Runnable {
    * built with Processing.</P>
    */
   static public int blendColor(int c1, int c2, int mode) {
-    return PImage.blendColor(c1, c2, mode);
+    return PGraphics.blendColor(c1, c2, mode);
   }
 
 
diff --git a/android/todo.txt b/android/todo.txt
index e67a8bad9..7bf2ae580 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -1,4 +1,4 @@
-0208 android
+0208 android (2.0a9)
 X inherited PShape API changes from the desktop version
 
 
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 17ea00aa0..cb9c2c81e 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -11343,17 +11343,17 @@ public class PApplet extends Applet
    *
    * @webref shape:loading_displaying
    * @param shape the shape to display
-   * @param a x-coordinate of the shape
-   * @param b y-coordinate of the shape
+   * @param x x-coordinate of the shape
+   * @param y y-coordinate of the shape
    * @see PShape
    * @see PApplet#loadShape(String)
    * @see PGraphics#shapeMode(int)
    *
    * Convenience method to draw at a particular location.
    */
-  public void shape(PShape shape, float a, float b) {
-    if (recorder != null) recorder.shape(shape, a, b);
-    g.shape(shape, a, b);
+  public void shape(PShape shape, float x, float y) {
+    if (recorder != null) recorder.shape(shape, x, y);
+    g.shape(shape, x, y);
   }
 
 
@@ -14433,7 +14433,7 @@ public class PApplet extends Applet
    * @see PApplet#color(float, float, float, float)
    */
   static public int blendColor(int c1, int c2, int mode) {
-    return PImage.blendColor(c1, c2, mode);
+    return PGraphics.blendColor(c1, c2, mode);
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
index 287ff080f..2cf11d628 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,4 +1,4 @@
-0208 core 
+0208 core (2.0a9)
 X several constants moved out of PConstants and into PGraphics
 X API cleanup to PShape and unapproved methods
 
diff --git a/todo.txt b/todo.txt
index 464508e3a..7e605a173 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,4 @@
-0208 pde
+0208 pde (2.0a9)
 X Help menu broken when Processing has spaces in its path name in 2.0a8
 X   http://code.google.com/p/processing/issues/detail?id=1164