move loadImage() into PSurface

Author: benfry

core/src/processing/awt/ShimAWT.java

@@ -47,7 +47,13 @@ public ShimAWT(PApplet sketch) {
   */
 
 
-  static public PImage loadImage(PApplet sketch, String filename, String extension) {
+  static public PImage loadImage(PApplet sketch, String filename, Object... args) {
+    String extension = null;
+    if (args != null && args.length > 0) {
+      // the only one that's supported for now
+      extension = (String) args[0];
+    }
+
     if (extension == null) {
       String lower = filename.toLowerCase();
       int dot = filename.lastIndexOf('.');

core/src/processing/core/PApplet.java

@@ -5322,7 +5322,7 @@ public PImage loadImage(String filename, String extension) {
       g.awaitAsyncSaveCompletion(filename);
     }
 
-    return ShimAWT.loadImage(this, filename, extension);
+    return surface.loadImage(filename, extension);
   }
 
 

core/src/processing/core/PSurface.java

@@ -55,6 +55,10 @@ public interface PSurface {
 
   //
 
+  public PImage loadImage(String path, Object... args);
+
+  //
+
   public void selectInput(String prompt, String callback,
                           File file, Object callbackObject);
 

core/src/processing/core/PSurfaceNone.java

@@ -24,6 +24,8 @@
 
 import java.io.File;
 
+import processing.awt.ShimAWT;
+
 /**
  * Surface that's not really visible. Used for PDF and friends, or as a base
  * class for other drawing surfaces. It includes the standard rendering loop.
@@ -55,6 +57,11 @@ public int displayDensity(int display) {
   }
 
 
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
   public void selectInput(String prompt, String callback, File file,
                           Object callbackObject) {
   }

core/src/processing/javafx/PSurfaceFX.java

@@ -224,6 +224,12 @@ public double prefHeight(double width) {
   }
 
 
+  // TODO rewrite before 4.0 release
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
   @Override
   public void selectInput(String prompt, String callbackMethod,
                           File file, Object callbackObject) {

core/src/processing/opengl/PSurfaceJOGL.java

@@ -69,7 +69,6 @@
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.FPSAnimator;
 
-import processing.awt.ShimAWT;
 import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PGraphics;
@@ -78,13 +77,14 @@
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
 
+// have this removed by 4.0 final
+import processing.awt.ShimAWT;
+
 
 public class PSurfaceJOGL implements PSurface {
   /** Selected GL profile */
   public static GLProfile profile;
 
-  ShimAWT shim;
-
   public PJOGL pgl;
 
   protected GLWindow window;
@@ -136,6 +136,12 @@ public int displayDensity(int display) {
   */
 
 
+  // TODO rewrite before 4.0 release
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
   @Override
   public void selectInput(String prompt, String callbackMethod,
                           File file, Object callbackObject) {

core/todo.txt

@@ -13,8 +13,7 @@ X move selectInput/Output/Folder to ShimAWT class
 X remove the java.awt.Frame object from PApplet
 X move loadImage() into ShimAWT
 X desktopFile() and desktopPath() methods are supported, unless we find they're trouble
-
-_ move ShimAWT.loadImage() to the PSurface subclasses
+X move ShimAWT.loadImage() to the PSurface subclasses
 
 api changes
 _ static versions of selectInput/selectOutput/selectFolder in PApplet have been removed