restore deprecated versions of getFont() and getImage()

benfry · benfry · commit 9055f15281e1 · 2012-09-10T16:47:01.000Z
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
@@ -500,6 +500,16 @@ public void setNative(Object font) {
   }
 
 
+  /**
+   * Use the getNative() method instead, which allows library interfaces to be
+   * written in a cross-platform fashion for desktop, Android, and others.
+   */
+  @Deprecated
+  public Font getFont() {
+    return font;
+  }
+
+
   /**
    * Return the native java.awt.Font associated with this PFont (if any).
    */
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
@@ -24,6 +24,7 @@
 
 package processing.core;
 
+import java.awt.Image;
 import java.awt.image.*;
 import java.io.*;
 import java.lang.reflect.Method;
@@ -265,7 +266,7 @@ protected void checkAlpha() {
    * @param img assumes a MediaTracker has been used to fully download
    * the data and the img is valid
    */
-  public PImage(java.awt.Image img) {
+  public PImage(Image img) {
     format = RGB;
     if (img instanceof BufferedImage) {
       BufferedImage bi = (BufferedImage) img;
@@ -291,10 +292,19 @@ public PImage(java.awt.Image img) {
   }
 
 
+  /**
+   * Use the getNative() method instead, which allows library interfaces to be
+   * written in a cross-platform fashion for desktop, Android, and others.
+   */
+  @Deprecated
+  public Image getImage() {
+    return (Image) getNative();
+  }
+
+
   /**
    * Returns a native BufferedImage from this PImage.
    */
-//  public java.awt.Image getImage() {
   public Object getNative() {
     loadPixels();
     int type = (format == RGB) ?
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,14 +1,14 @@
 0211 core
+X remove bad cast in PGL
+X new keyEvent methods not firing
+X   http://code.google.com/p/processing/issues/detail?id=1225
+X double check that new key and mouse events are being addressed correctly
+X restore deprecated versions of getFont() and getImage()
+X   Android getBitmap() and getTypeface() will not be restored
 
-_ new keyEvent methods not firing
-_   http://code.google.com/p/processing/issues/detail?id=1225
 
-_ remove subsetting stuff from PFont
-
-_ add deprecated versions of getFont, getImage, etc.
-
-
-_ double check that new key and mouse events are being addressed correctly
+_ remove subsetting stuff from PFont?
+_   or use hint(ENABLE_FONT_SUBSETTING)? 
 
 hint(OPENGL_ERRORS) should be the opposite to enable the reporting, no?
 
diff --git a/todo.txt b/todo.txt
@@ -3,7 +3,8 @@ X make file selectable from the OS X menubar
 X   http://code.google.com/p/processing/issues/detail?id=1215
 X make Mode menu into a radio button, so it cannot be de-selected
 X   http://code.google.com/p/processing/issues/detail?id=1227
-
+X no response with registerMethod keyEvent when key pressed or released
+X   http://code.google.com/p/processing/issues/detail?id=1225
 
 _ "Processing is damaged and should be put in the trash" for 2.0b2
 _   http://code.google.com/p/processing/issues/detail?id=1226
