picrate 1.2.4-java → 2.1.1-java

data/src/main/java/processing/core/PApplet.java

@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2012-20 The Processing Foundation
   Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
@@ -24,48 +24,6 @@
 
 package processing.core;
 
-// dummy object for backwards compatibility, plus the select methods
-import java.awt.Frame;
-
-// before calling settings() to get displayWidth/Height
-import java.awt.DisplayMode;
-// handleSettings() and displayDensity()
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-// used to present the fullScreen() warning about Spaces on OS X
-import javax.swing.JOptionPane;
-
-// inside runSketch() to warn users about headless
-import java.awt.HeadlessException;
-import java.awt.Toolkit;
-
-// used by loadImage()
-import java.awt.Image;
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import javax.imageio.ImageIO;
-// allows us to remove our own MediaTracker code
-import javax.swing.ImageIcon;
-
-// used by selectInput(), selectOutput(), selectFolder()
-import java.awt.EventQueue;
-import java.awt.FileDialog;
-import javax.swing.JFileChooser;
-
-// set the look and feel, if specified
-import javax.swing.UIManager;
-
-// used by link()
-import java.awt.Desktop;
-
-// used by desktopFile() method
-import javax.swing.filechooser.FileSystemView;
-
-// loadXML() error handling
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.SAXException;
-
 import java.io.*;
 import java.lang.reflect.*;
 import java.net.*;
@@ -80,6 +38,13 @@ import java.util.concurrent.ThreadFactory;
 import java.util.regex.*;
 import java.util.zip.*;
 
+// loadXML() error handling
+import javax.xml.parsers.ParserConfigurationException;
+import org.xml.sax.SAXException;
+
+// TODO have this removed by 4.0 final
+import processing.awt.ShimAWT;
+
 import processing.data.*;
 import processing.event.*;
 import processing.opengl.*;
@@ -87,34 +52,34 @@ import processing.opengl.*;
 
 /**
  * Base class for all sketches that use processing.core.
- * <p/>
+ *
  * The <A HREF="https://github.com/processing/processing/wiki/Window-Size-and-Full-Screen">
  * Window Size and Full Screen</A> page on the Wiki has useful information
  * about sizing, multiple displays, full screen, etc.
- * <p/>
+ *
  * Processing uses active mode rendering. All animation tasks happen on the
  * "Processing Animation Thread". The setup() and draw() methods are handled
  * by that thread, and events (like mouse movement and key presses, which are
  * fired by the event dispatch thread or EDT) are queued to be safely handled
  * at the end of draw().
- * <p/>
+ *
  * Starting with 3.0a6, blit operations are on the EDT, so as not to cause
  * GUI problems with Swing and AWT. In the case of the default renderer, the
  * sketch renders to an offscreen image, then the EDT is asked to bring that
  * image to the screen.
- * <p/>
+ *
  * For code that needs to run on the EDT, use EventQueue.invokeLater(). When
  * doing so, be careful to synchronize between that code and the Processing
  * animation thread. That is, you can't call Processing methods from the EDT
  * or at any random time from another thread. Use of a callback function or
  * the registerXxx() methods in PApplet can help ensure that your code doesn't
  * do something naughty.
- * <p/>
+ *
  * As of Processing 3.0, we have removed Applet as the base class for PApplet.
  * This means that we can remove lots of legacy code, however one downside is
  * that it's no longer possible (without extra code) to embed a PApplet into
  * another Java application.
- * <p/>
+ *
  * As of Processing 3.0, we have discontinued support for versions of Java
  * prior to 1.8. We don't have enough people to support it, and for a
  * project of our (tiny) size, we should be focusing on the future, rather
@@ -122,45 +87,38 @@ import processing.opengl.*;
  */
 public class PApplet implements PConstants {
   /** Full name of the Java version (i.e. 1.5.0_11). */
-  static public final String javaVersionName =
+  static public final String JAVA_VERSION_NAME =
     System.getProperty("java.version");
 
-  static public final int javaPlatform;
+  static public final int JAVA_PLATFORM;
   static {
-    String version = javaVersionName;
-    if (javaVersionName.startsWith("1.")) {
+    String version = JAVA_VERSION_NAME;
+    if (JAVA_VERSION_NAME.startsWith("1.")) {
       version = version.substring(2);
-      javaPlatform = parseInt(version.substring(0, version.indexOf('.')));
+      JAVA_PLATFORM = parseInt(version.substring(0, version.indexOf('.')));
     } else {
       // Remove -xxx and .yyy from java.version (@see JEP-223)
-      javaPlatform = parseInt(version.replaceAll("-.*","").replaceAll("\\..*",""));
+      JAVA_PLATFORM = parseInt(version.replaceAll("-.*","").replaceAll("\\..*",""));
     }
   }
 
   /**
-   * Do not use; javaPlatform or javaVersionName are better options.
-   * For instance, javaPlatform is useful when you need a number for
-   * comparison, i.e. "if (javaPlatform >= 9)".
+   * Do not use; JAVA_PLATFORM or JAVA_VERSION_NAME are better options.
+   * For instance, JAVA_PLATFORM is useful when you need a number for
+   * comparison, i.e. "if (JAVA_PLATFORM >= 9)".
    */
   @Deprecated
-  public static final float javaVersion = 1 + javaPlatform / 10f;
+  public static final float JAVA_VERSION = 1 + JAVA_PLATFORM / 10f;
 
   /**
-   * Current platform in use, one of the
-   * PConstants WINDOWS, MACOSX, MACOS9, LINUX or OTHER.
+   * Current platform in use, one of the PConstants WINDOWS, MACOS, LINUX or OTHER.
    */
   static public int platform;
 
   static {
-    String osname = System.getProperty("os.name");
-
-    if (osname.indexOf("Mac") != -1) {
-      platform = MACOSX;
+    final String name = System.getProperty("os.name");
 
-    } else if (osname.indexOf("Windows") != -1) {
-      platform = WINDOWS;
-
-    } else if (osname.equals("Linux")) {  // true for the ibm vm
+ if (name.equals("Linux")) {  // true for the ibm vm
       platform = LINUX;
 
     } else {
@@ -185,7 +143,7 @@ public class PApplet implements PConstants {
    * example, if the current screen resolution is 1024x768,
    * <b>displayWidth</b> is 1024 and <b>displayHeight</b> is 768. These
    * dimensions are useful when exporting full-screen applications.
-   * <br /><br />
+   *
    * To ensure that the sketch takes over the entire screen, use "Present"
    * instead of "Run". Otherwise the window will still have a frame border
    * around it and not be placed in the upper corner of the screen. On Mac OS
@@ -202,7 +160,7 @@ public class PApplet implements PConstants {
    * example, if the current screen resolution is 1024x768,
    * <b>displayWidth</b> is 1024 and <b>displayHeight</b> is 768. These
    * dimensions are useful when exporting full-screen applications.
-   * <br /><br />
+   *
    * To ensure that the sketch takes over the entire screen, use "Present"
    * instead of "Run". Otherwise the window will still have a frame border
    * around it and not be placed in the upper corner of the screen. On Mac OS
@@ -237,24 +195,6 @@ public class PApplet implements PConstants {
   static public final int DEFAULT_WIDTH = 100;
   static public final int DEFAULT_HEIGHT = 100;
 
-//  /**
-//   * Exception thrown when size() is called the first time.
-//   * <p>
-//   * This is used internally so that setup() is forced to run twice
-//   * when the renderer is changed. This is the only way for us to handle
-//   * invoking the new renderer while also in the midst of rendering.
-//   */
-//  static public class RendererChangeException extends RuntimeException { }
-
-  /**
-   * true if no size() command has been executed. This is used to wait until
-   * a size has been set before placing in the window and showing it.
-   */
-//  public boolean defaultSize;
-
-//  /** Storage for the current renderer size to avoid re-allocation. */
-//  Dimension currentSize = new Dimension();
-
   /**
    * ( begin auto-generated from pixels.xml )
    *
@@ -265,8 +205,8 @@ public class PApplet implements PConstants {
    * values. The <b>index</b> value defines the position of a value within
    * the array. For example, the statement <b>color b = pixels[230]</b> will
    * set the variable <b>b</b> to be equal to the value at that location in
-   * the array.<br />
-   * <br />
+   * the array.
+   *
    * Before accessing this array, the data must loaded with the
    * <b>loadPixels()</b> function. After the array data has been modified,
    * the <b>updatePixels()</b> function must be run to update the changes.
@@ -281,6 +221,9 @@ public class PApplet implements PConstants {
    * @see PApplet#get(int, int, int, int)
    * @see PApplet#set(int, int, int)
    * @see PImage
+   * @see PApplet#pixelDensity(int)
+   * @see PApplet#pixelWidth
+   * @see PApplet#pixelHeight
    */
   public int[] pixels;
 
@@ -420,8 +363,8 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from pmouseX.xml )
    *
    * The system variable <b>pmouseX</b> always contains the horizontal
-   * position of the mouse in the frame previous to the current frame.<br />
-   * <br />
+   * position of the mouse in the frame previous to the current frame.
+   *
    * You may find that <b>pmouseX</b> and <b>pmouseY</b> have different
    * values inside <b>draw()</b> and inside events like <b>mousePressed()</b>
    * and <b>mouseMoved()</b>. This is because they're used for different
@@ -578,7 +521,7 @@ public class PApplet implements PConstants {
    *
    * The system variable <b>key</b> always contains the value of the most
    * recent key on the keyboard that was used (either pressed or released).
-   * <br/> <br/>
+   *
    * For non-ASCII keys, use the <b>keyCode</b> variable. The keys included
    * in the ASCII specification (BACKSPACE, TAB, ENTER, RETURN, ESC, and
    * DELETE) do not require checking to see if they key is coded, and you
@@ -613,7 +556,7 @@ public class PApplet implements PConstants {
    * for these keys, it's first necessary to check and see if the key is
    * coded. This is done with the conditional "if (key == CODED)" as shown in
    * the example.
-   * <br/> <br/>
+   *
    * The keys included in the ASCII specification (BACKSPACE, TAB, ENTER,
    * RETURN, ESC, and DELETE) do not require checking to see if they key is
    * coded, and you should simply use the <b>key</b> variable instead of
@@ -621,7 +564,7 @@ public class PApplet implements PConstants {
    * ENTER key is commonly used on PCs and Unix and the RETURN key is used
    * instead on Macintosh. Check for both ENTER and RETURN to make sure your
    * program will work for all platforms.
-   * <br/> <br/>
+   *
    * For users familiar with Java, the values for UP and DOWN are simply
    * shorter versions of Java's KeyEvent.VK_UP and KeyEvent.VK_DOWN. Other
    * keyCode values can be found in the Java <a
@@ -751,6 +694,9 @@ public class PApplet implements PConstants {
    */
   protected boolean exitCalled;
 
+  // ok to be static because it's not possible to mix enabled/disabled
+  static protected boolean disableAWT;
+
   // messages to send if attached as an external vm
 
   /**
@@ -773,6 +719,9 @@ public class PApplet implements PConstants {
   /** Used by the PDE to suggest a display (set in prefs, passed on Run) */
   static public final String ARGS_DISPLAY = "--display";
 
+  /** Disable AWT so that LWJGL and others can run */
+  static public final String ARGS_DISABLE_AWT = "--disable-awt";
+
 //  static public final String ARGS_SPAN_DISPLAYS = "--span";
 
   static public final String ARGS_BGCOLOR = "--bgcolor";
@@ -830,75 +779,11 @@ public class PApplet implements PConstants {
   }
 
 
-  /**
-   * A dummy frame to keep compatibility with 2.x code
-   * and encourage users to update.
-   */
-  public Frame frame;
-
-
-//  public Frame getFrame() {
-//    return frame;
-//  }
-//
-//
-//  public void setFrame(Frame frame) {
-//    this.frame = frame;
-//  }
-
-
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-
-
 //  /**
-//   * Applet initialization. This can do GUI work because the components have
-//   * not been 'realized' yet: things aren't visible, displayed, etc.
+//   * A dummy frame to keep compatibility with 2.x code
+//   * and encourage users to update.
 //   */
-//  public void init() {
-////    println("init() called " + Integer.toHexString(hashCode()));
-//    // using a local version here since the class variable is deprecated
-////    Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-////    screenWidth = screen.width;
-////    screenHeight = screen.height;
-//
-//    defaultSize = true;
-//    finished = false; // just for clarity
-//
-//    // this will be cleared by draw() if it is not overridden
-//    looping = true;
-//    redraw = true;  // draw this guy at least once
-//    firstMouse = true;
-//
-//    // calculated dynamically on first call
-////    // Removed in 2.1.2, brought back for 2.1.3. Usually sketchPath is set
-////    // inside runSketch(), but if this sketch takes care of calls to init()
-////    // when PApplet.main() is not used (i.e. it's in a Java application).
-////    // THe path needs to be set here so that loadXxxx() functions work.
-////    if (sketchPath == null) {
-////      sketchPath = calcSketchPath();
-////    }
-//
-//    // set during Surface.initFrame()
-////    // Figure out the available display width and height.
-////    // No major problem if this fails, we have to try again anyway in
-////    // handleDraw() on the first (== 0) frame.
-////    checkDisplaySize();
-//
-////    // Set the default size, until the user specifies otherwise
-////    int w = sketchWidth();
-////    int h = sketchHeight();
-////    defaultSize = (w == DEFAULT_WIDTH) && (h == DEFAULT_HEIGHT);
-////
-////    g = makeGraphics(w, h, sketchRenderer(), null, true);
-////    // Fire component resize event
-////    setSize(w, h);
-////    setPreferredSize(new Dimension(w, h));
-////
-////    width = g.width;
-////    height = g.height;
-//
-//    surface.startThread();
-//  }
+//  public Frame frame;
 
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -907,12 +792,11 @@ public class PApplet implements PConstants {
   boolean insideSettings;
 
   String renderer = JAVA2D;
-//  int quality = 2;
   int smooth = 1;  // default smoothing (whatever that means for the renderer)
 
   boolean fullScreen;
   int display = -1;  // use default
-  GraphicsDevice[] displayDevices;
+//  GraphicsDevice[] displayDevices;
   // Unlike the others above, needs to be public to support
   // the pixelWidth and pixelHeight fields.
   public int pixelDensity = 1;
@@ -954,73 +838,17 @@ public class PApplet implements PConstants {
   void handleSettings() {
     insideSettings = true;
 
-    // Need the list of display devices to be queried already for usage below.
-    // https://github.com/processing/processing/issues/3295
-    // https://github.com/processing/processing/issues/3296
-    // Not doing this from a static initializer because it may cause
-    // PApplet to cache and the values to stick through subsequent runs.
-    // Instead make it a runtime thing and a local variable.
-    GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-    GraphicsDevice device = ge.getDefaultScreenDevice();
-    displayDevices = ge.getScreenDevices();
-
-    // Default or unparsed will be -1, spanning will be 0, actual displays will
-    // be numbered from 1 because it's too weird to say "display 0" in prefs.
-    if (display > 0 && display <= displayDevices.length) {
-      device = displayDevices[display-1];
+    if (!disableAWT) {
+      displayWidth = ShimAWT.getDisplayWidth();
+      displayHeight = ShimAWT.getDisplayHeight();
+    } else {
+      // https://github.com/processing/processing4/issues/57
+      System.err.println("AWT disabled, displayWidth/displayHeight will be 0");
     }
-    // Set displayWidth and displayHeight for people still using those.
-    DisplayMode displayMode = device.getDisplayMode();
-    displayWidth = displayMode.getWidth();
-    displayHeight = displayMode.getHeight();
 
     // Here's where size(), fullScreen(), smooth(N) and noSmooth() might
     // be called, conjuring up the demons of various rendering configurations.
     settings();
-
-    if (display == SPAN && platform == MACOSX) {
-      // Make sure "Displays have separate Spaces" is unchecked
-      // in System Preferences > Mission Control
-      Process p = exec("defaults", "read", "com.apple.spaces", "spans-displays");
-      BufferedReader outReader = createReader(p.getInputStream());
-      BufferedReader errReader = createReader(p.getErrorStream());
-      StringBuilder stdout = new StringBuilder();
-      StringBuilder stderr = new StringBuilder();
-      String line = null;
-      try {
-        while ((line = outReader.readLine()) != null) {
-          stdout.append(line);
-        }
-        while ((line = errReader.readLine()) != null) {
-          stderr.append(line);
-        }
-      } catch (IOException e) {
-        printStackTrace(e);
-      }
-
-      int resultCode = -1;
-      try {
-        resultCode = p.waitFor();
-      } catch (InterruptedException e) { }
-
-      String result = trim(stdout.toString());
-      if ("0".equals(result)) {
-        EventQueue.invokeLater(new Runnable() {
-          public void run() {
-            checkLookAndFeel();
-            final String msg =
-              "To use fullScreen(SPAN), first turn off “Displays have separate spaces”\n" +
-              "in System Preferences \u2192 Mission Control. Then log out and log back in.";
-            JOptionPane.showMessageDialog(null, msg, "Apple's Defaults Stink",
-                                          JOptionPane.WARNING_MESSAGE);
-          }
-        });
-      } else if (!"1".equals(result)) {
-        System.err.println("Could not check the status of “Displays have separate spaces.”");
-        System.err.format("Received message '%s' and result code %d.%n", trim(stderr.toString()), resultCode);
-      }
-    }
-
     insideSettings = false;
   }
 
@@ -1061,17 +889,6 @@ public class PApplet implements PConstants {
   }
 
 
-  // Named quality instead of smooth to avoid people trying to set (or get)
-  // the current smooth level this way. Also that smooth(number) isn't really
-  // public or well-known API. It's specific to the capabilities of the
-  // rendering surface, and somewhat independent of whether the sketch is
-  // smoothing at any given time. It's also a bit like getFill() would return
-  // true/false for whether fill was enabled, getFillColor() would return the
-  // color itself. Or at least that's what I can recall at the moment. [fry]
-//  public int sketchQuality() {
-//    //return 2;
-//    return quality;
-//  }
   // smoothing 1 is default.. 0 is none.. 2,4,8 depend on renderer
   final public int sketchSmooth() {
     return smooth;
@@ -1079,20 +896,10 @@ public class PApplet implements PConstants {
 
 
   final public boolean sketchFullScreen() {
-    //return false;
     return fullScreen;
   }
 
 
-//  // Could be named 'screen' instead of display since it's the people using
-//  // full screen who will be looking for it. On the other hand, screenX/Y/Z
-//  // makes things confusing, and if 'displayIndex' exists...
-//  public boolean sketchSpanDisplays() {
-//    //return false;
-//    return spanDisplays;
-//  }
-
-
   // Numbered from 1, SPAN (0) means all displays, -1 means the default display
   final public int sketchDisplay() {
     return display;
@@ -1100,13 +907,11 @@ public class PApplet implements PConstants {
 
 
   final public String sketchOutputPath() {
-    //return null;
     return outputPath;
   }
 
 
   final public OutputStream sketchOutputStream() {
-    //return null;
     return outputStream;
   }
 
@@ -1141,8 +946,16 @@ public class PApplet implements PConstants {
     if (display != SPAN && (fullScreen || present)) {
       return displayDensity(display);
     }
+
+    int displayCount = 0;
+    if (!disableAWT) {
+      displayCount = ShimAWT.getDisplayCount();
+    } else {
+      // https://github.com/processing/processing4/issues/57
+      System.err.println("display count needs to be implemented for non-AWT");
+    }
     // walk through all displays, use 2 if any display is 2
-    for (int i = 0; i < displayDevices.length; i++) {
+    for (int i = 0; i < displayCount; i++) {
       if (displayDensity(i+1) == 2) {
         return 2;
       }
@@ -1151,70 +964,37 @@ public class PApplet implements PConstants {
     return 1;
   }
 
+
  /**
   * @param display the display number to check
+  * (1-indexed to match the Preferences dialog box)
   */
   public int displayDensity(int display) {
-    if (PApplet.platform == PConstants.MACOSX) {
-      // This should probably be reset each time there's a display change.
-      // A 5-minute search didn't turn up any such event in the Java 7 API.
-      // Also, should we use the Toolkit associated with the editor window?
-      final String javaVendor = System.getProperty("java.vendor");
-      if (javaVendor.contains("Oracle")) {
-        GraphicsDevice device;
-        GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
-
-        if (display == -1) {
-          device = env.getDefaultScreenDevice();
-
-        } else if (display == SPAN) {
-          throw new RuntimeException("displayDensity() only works with specific display numbers");
-
-        } else {
-          GraphicsDevice[] devices = env.getScreenDevices();
-          if (display > 0 && display <= devices.length) {
-            device = devices[display - 1];
-          } else {
-            if (devices.length == 1) {
-              System.err.println("Only one display is currently known, use displayDensity(1).");
-            } else {
-              System.err.format("Your displays are numbered %d through %d, " +
-                "pass one of those numbers to displayDensity()%n", 1, devices.length);
-            }
-            throw new RuntimeException("Display " + display + " does not exist.");
-          }
-        }
-
-        try {
-          Field field = device.getClass().getDeclaredField("scale");
-          if (field != null) {
-            field.setAccessible(true);
-            Object scale = field.get(device);
-
-            if (scale instanceof Integer && ((Integer)scale).intValue() == 2) {
-              return 2;
-            }
-          }
-        } catch (Exception ignore) { }
-      }
-    } else if (PApplet.platform == PConstants.WINDOWS ||
-        PApplet.platform == PConstants.LINUX) {
-      if (suggestedDensity == -1) {
-        // TODO: detect and return DPI scaling using JNA; Windows has
-        //   a system-wide value, not sure how it works on Linux
-        return 1;
-      } else if (suggestedDensity == 1 || suggestedDensity == 2) {
-        return suggestedDensity;
-      }
+    if (!disableAWT) {
+      return ShimAWT.getDisplayDensity(display);
     }
-    return 1;
+    /*
+    if (display > 0 && display <= displayDevices.length) {
+      GraphicsConfiguration graphicsConfig =
+        displayDevices[display - 1].getDefaultConfiguration();
+      AffineTransform tx = graphicsConfig.getDefaultTransform();
+      return (int) Math.round(tx.getScaleX());
+    }
+
+    System.err.println("Display " + display + " does not exist, " +
+                       "returning 1 for displayDensity(" + display + ")");
+    */
+    // https://github.com/processing/processing4/issues/57
+    System.err.println("displayDensity() unavailable because AWT is disabled");
+    return 1;  // not the end of the world, so don't throw a RuntimeException
   }
 
 
  /**
   * @webref environment
   * @param density 1 or 2
-  *
+  * @see PApplet#pixelWidth
+  * @see PApplet#pixelHeight
   */
   public void pixelDensity(int density) {
     //println(density + " " + this.pixelDensity);
@@ -1317,7 +1097,7 @@ public class PApplet implements PConstants {
    * Called by the browser or applet viewer to inform this applet that it
    * should start its execution. It is called after the init method and
    * each time the applet is revisited in a Web page.
-   * <p/>
+   *
    * Called explicitly via the first call to PApplet.paint(), because
    * PAppletGL needs to have a usable screen before getting things rolling.
    */
@@ -1333,7 +1113,7 @@ public class PApplet implements PConstants {
   /**
    * Called by the browser or applet viewer to inform
    * this applet that it should stop its execution.
-   * <p/>
+   *
    * Unfortunately, there are no guarantees from the Java spec
    * when or if stop() will be called (i.e. on browser quit,
    * or when moving between web pages), and it's not always called.
@@ -1392,7 +1172,7 @@ public class PApplet implements PConstants {
 //   * Called by the browser or applet viewer to inform this applet
 //   * that it is being reclaimed and that it should destroy
 //   * any resources that it has allocated.
-//   * <p/>
+//   *
 //   * destroy() supposedly gets called as the applet viewer
 //   * is shutting down the applet. stop() is called
 //   * first, and then destroy() to really get rid of things.
@@ -1425,6 +1205,7 @@ public class PApplet implements PConstants {
     Object[] emptyArgs = new Object[] { };
 
 
+    @SuppressWarnings("unused")
     void handle() {
       handle(emptyArgs);
     }
@@ -1434,7 +1215,7 @@ public class PApplet implements PConstants {
       for (int i = 0; i < count; i++) {
         try {
           methods[i].invoke(objects[i], args);
-        } catch (Exception e) {
+        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
           // check for wrapped exception, get root exception
           Throwable t;
           if (e instanceof InvocationTargetException) {
@@ -1571,13 +1352,13 @@ public class PApplet implements PConstants {
       die("There is no public " + name + "() method in the class " +
           o.getClass().getName());
 
-    } catch (Exception e) {
+    } catch (SecurityException e) {
       die("Could not register " + name + " + () for " + o, e);
     }
   }
 
 
-  private void registerWithArgs(String name, Object o, Class<?> cargs[]) {
+  private void registerWithArgs(String name, Object o, Class<?>[] cargs) {
     Class<?> c = o.getClass();
     try {
       Method method = c.getMethod(name, cargs);
@@ -1593,7 +1374,7 @@ public class PApplet implements PConstants {
       die("There is no public " + name + "() method in the class " +
           o.getClass().getName());
 
-    } catch (Exception e) {
+    } catch (SecurityException e) {
       die("Could not register " + name + " + () for " + o, e);
     }
   }
@@ -1611,8 +1392,6 @@ public class PApplet implements PConstants {
         die("No registered methods with the name " + name + "() were found.");
       }
       try {
-//      Method method = o.getClass().getMethod(name, new Class[] {});
-//      meth.remove(o, method);
         meth.remove(target);
       } catch (Exception e) {
         die("Could not unregister " + name + "() for " + target, e);
@@ -1620,18 +1399,7 @@ public class PApplet implements PConstants {
     }
   }
 
-
-  protected void handleMethods(String methodName) {
-    synchronized (registerLock) {
-      RegisteredMethods meth = registerMap.get(methodName);
-      if (meth != null) {
-        meth.handle();
-      }
-    }
-  }
-
-
-  protected void handleMethods(String methodName, Object[] args) {
+  protected void handleMethods(String methodName, Object...args) {
     synchronized (registerLock) {
       RegisteredMethods meth = registerMap.get(methodName);
       if (meth != null) {
@@ -1939,41 +1707,41 @@ public class PApplet implements PConstants {
    * <b>size()</b> function must be the first line in <b>setup()</b>. If
    * <b>size()</b> is not used, the default size of the window is 100x100
    * pixels. The system variables <b>width</b> and <b>height</b> are set by
-   * the parameters passed to this function.<br />
-   * <br />
+   * the parameters passed to this function.
+   *
    * Do not use variables as the parameters to <b>size()</b> function,
    * because it will cause problems when exporting your sketch. When
    * variables are used, the dimensions of your sketch cannot be determined
    * during export. Instead, employ numeric values in the <b>size()</b>
    * statement, and then use the built-in <b>width</b> and <b>height</b>
    * variables inside your program when the dimensions of the display window
-   * are needed.<br />
-   * <br />
+   * are needed.
+   *
    * The <b>size()</b> function can only be used once inside a sketch, and
-   * cannot be used for resizing.<br/>
-   * <br/> <b>renderer</b> parameter selects which rendering engine to use.
+   * cannot be used for resizing.
+   *  <b>renderer</b> parameter selects which rendering engine to use.
    * For example, if you will be drawing 3D shapes, use <b>P3D</b>, if you
    * want to export images from a program as a PDF file use <b>PDF</b>. A
-   * brief description of the three primary renderers follows:<br />
-   * <br />
+   * brief description of the three primary renderers follows:
+   *
    * <b>P2D</b> (Processing 2D) - The default renderer that supports two
-   * dimensional drawing.<br />
-   * <br />
+   * dimensional drawing.
+   *
    * <b>P3D</b> (Processing 3D) - 3D graphics renderer that makes use of
-   * OpenGL-compatible graphics hardware.<br />
-   * <br />
+   * OpenGL-compatible graphics hardware.
+   *
    * <b>PDF</b> - The PDF renderer draws 2D graphics directly to an Acrobat
    * PDF file. This produces excellent results when you need vector shapes
    * for high resolution output or printing. You must first use Import
    * Library &rarr; PDF to make use of the library. More information can be
-   * found in the PDF library reference.<br />
-   * <br />
+   * found in the PDF library reference.
+   *
    * The P3D renderer doesn't support <b>strokeCap()</b> or
    * <b>strokeJoin()</b>, which can lead to ugly results when using
    * <b>strokeWeight()</b>. (<a
    * href="http://code.google.com/p/processing/issues/detail?id=123">Issue
-   * 123</a>) <br />
-   * <br />
+   * 123</a>)
+   *
    * The maximum width and height is limited by your operating system, and is
    * usually the width and height of your actual screen. On some machines it
    * may simply be the number of pixels on your current screen, meaning that
@@ -1981,8 +1749,8 @@ public class PApplet implements PConstants {
    * same number of pixels. This varies widely so you'll have to try
    * different rendering modes and sizes until you get what you're looking
    * for. If you need something larger, use <b>createGraphics</b> to create a
-   * non-visible drawing surface.<br />
-   * <br />
+   * non-visible drawing surface.
+   *
    * Again, the <b>size()</b> function must be the first line of the code (or
    * first item inside setup). Any code that appears before the <b>size()</b>
    * command may run more than once, which can lead to confusing results.
@@ -2004,6 +1772,9 @@ public class PApplet implements PConstants {
    * @param height height of the display window in units of pixels
    * @see PApplet#width
    * @see PApplet#height
+   * @see PApplet#setup()
+   * @see PApplet#settings()
+   * @see PApplet#fullScreen()
    */
   public void size(int width, int height) {
     // Check to make sure the width/height have actually changed. It's ok to
@@ -2133,12 +1904,12 @@ public class PApplet implements PConstants {
    * P3D. Use this class if you need to draw into an off-screen graphics
    * buffer. The PDF renderer requires the filename parameter. The DXF
    * renderer should not be used with <b>createGraphics()</b>, it's only
-   * built for use with <b>beginRaw()</b> and <b>endRaw()</b>.<br />
-   * <br />
+   * built for use with <b>beginRaw()</b> and <b>endRaw()</b>.
+   *
    * It's important to call any drawing functions between <b>beginDraw()</b>
    * and <b>endDraw()</b> statements. This is also true for any functions
-   * that affect drawing, such as <b>smooth()</b> or <b>colorMode()</b>.<br/>
-   * <br/> the main drawing surface which is completely opaque, surfaces
+   * that affect drawing, such as <b>smooth()</b> or <b>colorMode()</b>.
+   *  the main drawing surface which is completely opaque, surfaces
    * created with <b>createGraphics()</b> can have transparency. This makes
    * it possible to draw into a graphics and maintain the alpha channel. By
    * using <b>save()</b> to write a PNG or TGA file, the transparency of the
@@ -2259,7 +2030,7 @@ public class PApplet implements PConstants {
       Class<?> rendererClass =
         Thread.currentThread().getContextClassLoader().loadClass(renderer);
 
-      Constructor<?> constructor = rendererClass.getConstructor(new Class[] { });
+      Constructor<?> constructor = rendererClass.getConstructor();
       PGraphics pg = (PGraphics) constructor.newInstance();
 
       pg.setParent(this);
@@ -2351,10 +2122,10 @@ public class PApplet implements PConstants {
    * fresh buffer of pixels to play with. Set the size of the buffer with the
    * <b>width</b> and <b>height</b> parameters. The <b>format</b> parameter
    * defines how the pixels are stored. See the PImage reference for more information.
-   * <br/> <br/>
+   *
    * Be sure to include all three parameters, specifying only the width and
    * height (but no format) will produce a strange error.
-   * <br/> <br/>
+   *
    * Advanced users please note that createImage() should be used instead of
    * the syntax <tt>new PImage()</tt>.
    *
@@ -2530,11 +2301,11 @@ public class PApplet implements PConstants {
    * the program to update the display window only when necessary, for
    * example when an event registered by <b>mousePressed()</b> or
    * <b>keyPressed()</b> occurs.
-   * <br/><br/> structuring a program, it only makes sense to call redraw()
+   *  structuring a program, it only makes sense to call redraw()
    * within events such as <b>mousePressed()</b>. This is because
    * <b>redraw()</b> does not run <b>draw()</b> immediately (it only sets a
    * flag that indicates an update is needed).
-   * <br/><br/> <b>redraw()</b> within <b>draw()</b> has no effect because
+   *  <b>redraw()</b> within <b>draw()</b> has no effect because
    * <b>draw()</b> is continuously called anyway.
    *
    * ( end auto-generated )
@@ -2588,7 +2359,7 @@ public class PApplet implements PConstants {
    * <b>draw()</b>. If <b>loop()</b> is called, the code in <b>draw()</b>
    * begin to run continuously again. If using <b>noLoop()</b> in
    * <b>setup()</b>, it should be the last line inside the block.
-   * <br/> <br/>
+   *
    * When <b>noLoop()</b> is used, it's not possible to manipulate or access
    * the screen inside event handling functions such as <b>mousePressed()</b>
    * or <b>keyPressed()</b>. Instead, use those functions to call
@@ -2596,7 +2367,7 @@ public class PApplet implements PConstants {
    * can update the screen properly. This means that when noLoop() has been
    * called, no drawing can happen, and functions like saveFrame() or
    * loadPixels() may not be used.
-   * <br/> <br/>
+   *
    * Note that if the sketch is resized, <b>redraw()</b> will be called to
    * update the sketch, even after <b>noLoop()</b> has been specified.
    * Otherwise, the sketch would enter an odd state until <b>loop()</b> was called.
@@ -2688,23 +2459,6 @@ public class PApplet implements PConstants {
 
     int button = event.getButton();
 
-    // If running on Mac OS, allow ctrl-click as right mouse.
-    if (PApplet.platform == PConstants.MACOSX && event.getButton() == PConstants.LEFT) {
-      if (action == MouseEvent.PRESS && event.isControlDown()) {
-        macosxLeftButtonWithCtrlPressed = true;
-      }
-      if (macosxLeftButtonWithCtrlPressed) {
-        button = PConstants.RIGHT;
-        event = new MouseEvent(event.getNative(), event.getMillis(),
-                               event.getAction(), event.getModifiers(),
-                               event.getX(), event.getY(),
-                               button, event.getCount());
-      }
-      if (action == MouseEvent.RELEASE) {
-        macosxLeftButtonWithCtrlPressed = false;
-      }
-    }
-
     // Get the (already processed) button code
     mouseButton = button;
 
@@ -2743,7 +2497,7 @@ public class PApplet implements PConstants {
       break;
     }
 
-    handleMethods("mouseEvent", new Object[] { event });
+    handleMethods("mouseEvent", event);
 
     switch (action) {
     case MouseEvent.PRESS:
@@ -3015,7 +2769,7 @@ public class PApplet implements PConstants {
     }
     */
 
-    handleMethods("keyEvent", new Object[] { event });
+    handleMethods("keyEvent", event);
 
     // if someone else wants to intercept the key, they should
     // set key to zero (or something besides the ESC).
@@ -3024,21 +2778,6 @@ public class PApplet implements PConstants {
       if (key == ESC) {
         exit();
       }
-      // When running tethered to the Processing application, respond to
-      // Ctrl-W (or Cmd-W) events by closing the sketch. Not enabled when
-      // running independently, because this sketch may be one component
-      // embedded inside an application that has its own close behavior.
-      if (external &&
-          event.getKeyCode() == 'W' &&
-          ((event.isMetaDown() && platform == MACOSX) ||
-           (event.isControlDown() && platform != MACOSX))) {
-        // Can't use this native stuff b/c the native event might be NEWT
-//      if (external && event.getNative() instanceof java.awt.event.KeyEvent &&
-//          ((java.awt.event.KeyEvent) event.getNative()).getModifiers() ==
-//            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() &&
-//          event.getKeyCode() == 'W') {
-        exit();
-      }
     }
   }
 
@@ -3049,7 +2788,7 @@ public class PApplet implements PConstants {
    *
    * The <b>keyPressed()</b> function is called once every time a key is
    * pressed. The key that was pressed is stored in the <b>key</b> variable.
-   * <br/> <br/>
+   *
    * For non-ASCII keys, use the <b>keyCode</b> variable. The keys included
    * in the ASCII specification (BACKSPACE, TAB, ENTER, RETURN, ESC, and
    * DELETE) do not require checking to see if they key is coded, and you
@@ -3058,7 +2797,7 @@ public class PApplet implements PConstants {
    * commonly used on PCs and Unix and the RETURN key is used instead on
    * Macintosh. Check for both ENTER and RETURN to make sure your program
    * will work for all platforms.
-   * <br/> <br/>
+   *
    * Because of how operating systems handle key repeats, holding down a key
    * may cause multiple calls to keyPressed() (and keyReleased() as well).
    * The rate of repeat is set by the operating system and how each computer
@@ -3431,17 +3170,9 @@ public class PApplet implements PConstants {
    * @param url the complete URL, as a String in quotes
    */
   public void link(String url) {
-    try {
-      if (Desktop.isDesktopSupported()) {
-        Desktop.getDesktop().browse(new URI(url));
-      } else {
-        // Just pass it off to open() and hope for the best
-        launch(url);
-      }
-    } catch (IOException e) {
-      printStackTrace(e);
-    } catch (URISyntaxException e) {
-      printStackTrace(e);
+    if (!surface.openLink(url)) {
+      // Just pass it off to launch() and hope for the best
+      launch(url);
     }
   }
 
@@ -3458,25 +3189,25 @@ public class PApplet implements PConstants {
    * of an executable in the system's PATH. In most cases, using a full path
    * is the best option, rather than relying on the system PATH. Be sure to
    * make the file executable before attempting to open it (chmod +x).
-   * <br/> <br/>
+   *
    * The <b>args</b> parameter is a String or String array which is passed to
    * the command line. If you have multiple parameters, e.g. an application
    * and a document, or a command with multiple switches, use the version
    * that takes a String array, and place each individual item in a separate
    * element.
-   * <br/> <br/>
+   *
    * If args is a String (not an array), then it can only be a single file or
    * application with no parameters. It's not the same as executing that
    * String using a shell. For instance, launch("javac -help") will not work
    * properly.
-   * <br/> <br/>
+   *
    * This function behaves differently on each platform. On Windows, the
    * parameters are sent to the Windows shell via "cmd /c". On Mac OS X, the
    * "open" command is used (type "man open" in Terminal.app for
    * documentation). On Linux, it first tries gnome-open, then kde-open, but
    * if neither are available, it sends the command to the shell without any
    * alterations.
-   * <br/> <br/>
+   *
    * For users familiar with Java, this is not quite the same as
    * Runtime.exec(), because the launcher command is prepended. Instead, the
    * <b>exec(String[])</b> function is a shortcut for
@@ -3490,17 +3221,7 @@ public class PApplet implements PConstants {
   static public Process launch(String... args) {
     String[] params = null;
 
-    if (platform == WINDOWS) {
-      // just launching the .html file via the shell works
-      // but make sure to chmod +x the .html files first
-      // also place quotes around it in case there's a space
-      // in the user.dir part of the url
-      params = new String[] { "cmd", "/c" };
-
-    } else if (platform == MACOSX) {
-      params = new String[] { "open" };
-
-    } else if (platform == LINUX) {
+  if (platform == LINUX) {
       // xdg-open is in the Free Desktop Specification and really should just
       // work on desktop Linux. Not risking it though.
       final String[] launchers = { "xdg-open", "gnome-open", "kde-open" };
@@ -3511,7 +3232,7 @@ public class PApplet implements PConstants {
           /*int result =*/ p.waitFor();
           // Not installed will throw an IOException (JDK 1.4.2, Ubuntu 7.04)
           openLauncher = launcher;
-        } catch (Exception e) { }
+        } catch (IOException | InterruptedException e) { }
       }
       if (openLauncher == null) {
         System.err.println("Could not find xdg-open, gnome-open, or kde-open: " +
@@ -3755,12 +3476,12 @@ public class PApplet implements PConstants {
    * Quits/stops/exits the program. Programs without a <b>draw()</b> function
    * exit automatically after the last line has run, but programs with
    * <b>draw()</b> run continuously until the program is manually stopped or
-   * <b>exit()</b> is run.<br />
-   * <br />
+   * <b>exit()</b> is run.
+   *
    * Rather than terminating immediately, <b>exit()</b> will cause the sketch
    * to exit after <b>draw()</b> has completed (or after <b>setup()</b>
-   * completes if called during the <b>setup()</b> function).<br />
-   * <br />
+   * completes if called during the <b>setup()</b> function).
+   *
    * For Java programmers, this is <em>not</em> the same as System.exit().
    * Further, System.exit() should not be used because closing out an
    * application while <b>draw()</b> is running may cause a crash
@@ -3833,17 +3554,6 @@ public class PApplet implements PConstants {
       // run dispose() methods registered by libraries
       handleMethods("dispose");
     }
-
-    if (platform == MACOSX) {
-      try {
-        final String td = "processing.core.ThinkDifferent";
-        final Class<?> thinkDifferent = getClass().getClassLoader().loadClass(td);
-        thinkDifferent.getMethod("cleanup").invoke(null);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-
   }
 
 
@@ -3853,15 +3563,15 @@ public class PApplet implements PConstants {
 
   /**
    * Call a method in the current class based on its name.
-   * <p/>
+   *
    * Note that the function being called must be public. Inside the PDE,
    * 'public' is automatically added, but when used without the preprocessor,
    * (like from Eclipse) you'll have to do it yourself.
    */
   public void method(String name) {
     try {
-      Method method = getClass().getMethod(name, new Class[] {});
-      method.invoke(this, new Object[] { });
+      Method method = getClass().getMethod(name);
+      method.invoke(this);
 
     } catch (IllegalArgumentException e) {
       e.printStackTrace();
@@ -3882,7 +3592,7 @@ public class PApplet implements PConstants {
    * Launch a new thread and call the specified function from that new thread.
    * This is a very simple way to do a thread without needing to get into
    * classes, runnables, etc.
-   * <p/>
+   *
    * Note that the function being called must be public. Inside the PDE,
    * 'public' is automatically added, but when used without the preprocessor,
    * (like from Eclipse) you'll have to do it yourself.
@@ -3896,13 +3606,7 @@ public class PApplet implements PConstants {
    * @see PApplet#noLoop()
    */
   public void thread(final String name) {
-    Thread later = new Thread() {
-      @Override
-      public void run() {
-        method(name);
-      }
-    };
-    later.start();
+    new Thread(() -> method(name)).start();
   }
 
 
@@ -3924,7 +3628,7 @@ public class PApplet implements PConstants {
    * which may be opened by selecting "Show sketch folder" from the "Sketch"
    * menu. It is not possible to use <b>save()</b> while running the program
    * in a web browser.
-   * <br/> images saved from the main drawing window will be opaque. To save
+   *  images saved from the main drawing window will be opaque. To save
    * images without a background, use <b>createGraphics()</b>.
    *
    * ( end auto-generated )
@@ -3964,14 +3668,14 @@ public class PApplet implements PConstants {
    * sequences can be loaded into programs such as Apple's QuickTime software
    * and made into movies. These files are saved to the sketch's folder,
    * which may be opened by selecting "Show sketch folder" from the "Sketch"
-   * menu.<br />
-   * <br />
+   * menu.
+   *
    * It is not possible to use saveXxxxx() functions inside a web browser
    * unless the sketch is <a
    * href="http://wiki.processing.org/w/Sign_an_Applet">signed applet</A>. To
    * save a file back to a server, see the <a
    * href="http://wiki.processing.org/w/Saving_files_to_a_web-server">save to
-   * web</A> code snippet on the Processing Wiki.<br/>
+   * web</A> code snippet on the Processing Wiki.
    * <br/ >
    * All images saved from the main drawing window will be opaque. To save
    * images without a background, use <b>createGraphics()</b>.
@@ -4049,7 +3753,7 @@ public class PApplet implements PConstants {
    * to load an image as the cursor if you are exporting your program for the
    * Web and not all MODES work with all Web browsers. The values for
    * parameters <b>x</b> and <b>y</b> must be less than the dimensions of the image.
-   * <br /> <br />
+   *
    * Setting or hiding the cursor generally does not work with "Present" mode
    * (when running full-screen).
    *
@@ -4110,15 +3814,15 @@ public class PApplet implements PConstants {
    * helpful for looking at the data a program is producing. The companion
    * function <b>println()</b> works like <b>print()</b>, but creates a new
    * line of text for each call to the function. Individual elements can be
-   * separated with quotes ("") and joined with the addition operator (+).<br />
-   * <br />
+   * separated with quotes ("") and joined with the addition operator (+).
+   *
    * Beginning with release 0125, to print the contents of an array, use
    * println(). There's no sensible way to do a <b>print()</b> of an array,
    * because there are too many possibilities for how to separate the data
    * (spaces, commas, etc). If you want to print an array as a single line,
    * use <b>join()</b>. With <b>join()</b>, you can choose any delimiter you
-   * like and <b>print()</b> the result.<br />
-   * <br />
+   * like and <b>print()</b> the result.
+   *
    * Using <b>print()</b> on an object will output <b>null</b>, a memory
    * location that may look like "@10be08," or the result of the
    * <b>toString()</b> method from the object that's being printed. Advanced
@@ -4213,7 +3917,7 @@ public class PApplet implements PConstants {
    * to this function creates a new line of output. Individual elements can
    * be separated with quotes ("") and joined with the string concatenation
    * operator (+). See <b>print()</b> for more about what to expect in the output.
-   * <br/><br/> <b>println()</b> on an array (by itself) will write the
+   *  <b>println()</b> on an array (by itself) will write the
    * contents of the array to the console. This is often helpful for looking
    * at the data a program is producing. A new line is put between each
    * element of the array. This function can only print one dimensional
@@ -5023,9 +4727,9 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from norm.xml )
    *
    * Normalizes a number from another range into a value between 0 and 1.
-   * <br/> <br/>
+   *
    * Identical to map(value, low, high, 0, 1);
-   * <br/> <br/>
+   *
    * Numbers outside the range are not clamped to 0 and 1, because
    * out-of-range values are often intentional and useful.
    *
@@ -5048,7 +4752,7 @@ public class PApplet implements PConstants {
    * the number '25' is converted from a value in the range 0..100 into
    * a value that ranges from the left edge (0) to the right edge (width)
    * of the screen.
-   * <br/> <br/>
+   *
    * Numbers outside the range are not clamped to 0 and 1, because
    * out-of-range values are often intentional and useful.
    *
@@ -5258,11 +4962,12 @@ public class PApplet implements PConstants {
   /**
    * ( begin auto-generated from noise.xml )
    *
-   * Returns the Perlin noise value at specified coordinates.Perlin noise is
- a random sequence generator producing a more natural ordered, harmonic
- succession of numbers compared to the standard <b>random()</b> function. It was invented by Ken Perlin in the 1980s and been used since in
- graphical applications to produce procedural textures, natural motion,
- shapes, terrains etc.<br /><br /> The main difference to the
+   * Returns the Perlin noise value at specified coordinates. Perlin noise is
+   * a random sequence generator producing a more natural ordered, harmonic
+   * succession of numbers compared to the standard <b>random()</b> function.
+   * It was invented by Ken Perlin in the 1980s and been used since in
+   * graphical applications to produce procedural textures, natural motion,
+   * shapes, terrains etc. The main difference to the
    * <b>random()</b> function is that Perlin noise is defined in an infinite
    * n-dimensional space where each pair of coordinates corresponds to a
    * fixed semi-random value (fixed only for the lifespan of the program).
@@ -5270,11 +4975,11 @@ public class PApplet implements PConstants {
    * compute 1D, 2D and 3D noise, depending on the number of coordinates
    * given. The noise value can be animated by moving through the noise space
    * as demonstrated in the example above. The 2nd and 3rd dimension can also
-   * be interpreted as time.<br /><br />The actual noise is structured
+   * be interpreted as time.The actual noise is structured
    * similar to an audio signal, in respect to the function's use of
    * frequencies. Similar to the concept of harmonics in physics, perlin
    * noise is computed over several octaves which are added together for the
-   * final result. <br /><br />Another way to adjust the character of the
+   * final result. Another way to adjust the character of the
    * resulting sequence is the scale of the input coordinates. As the
    * function works within an infinite space the value of the coordinates
    * doesn't matter as such, only the distance between successive coordinates
@@ -5285,7 +4990,6 @@ public class PApplet implements PConstants {
    *
    * ( end auto-generated )
    *
-   * @return
    * @webref math:random
    * @param x x-coordinate in noise space
    * @param y y-coordinate in noise space
@@ -5306,7 +5010,7 @@ public class PApplet implements PConstants {
       // [toxi 031112]
       // noise broke due to recent change of cos table in PGraphics
       // this will take care of it
-      perlin_cosTable = PGraphics.COS_LUT;
+      perlin_cosTable = PGraphics.cosLUT;
       perlin_TWOPI = perlin_PI = PGraphics.SINCOS_LENGTH;
       perlin_PI >>= 1;
     }
@@ -5361,7 +5065,7 @@ public class PApplet implements PConstants {
   }
 
   // [toxi 031112]
-  // now adjusts to the size of the COS_LUT used via
+  // now adjusts to the size of the cosLUT used via
   // the new variables, defined above
   private float noise_fsc(float i) {
     // using bagel's cosine table instead
@@ -5387,7 +5091,7 @@ public class PApplet implements PConstants {
    * parameter. Eg. a falloff factor of 0.75 means each octave will now have
    * 75% impact (25% less) of the previous lower octave. Any value between
    * 0.0 and 1.0 is valid, however note that values greater than 0.5 might
-   * result in greater than 1.0 values returned by <b>noise()</b>.<br /><br
+   * result in greater than 1.0 values returned by <b>noise()</b>.<br
    * />By changing these parameters, the signal created by the <b>noise()</b>
    * function can be adapted to fit very specific needs and characteristics.
    *
@@ -5437,8 +5141,6 @@ public class PApplet implements PConstants {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  protected String[] loadImageFormats;
-
   /**
    * ( begin auto-generated from loadImage.xml )
    *
@@ -5447,23 +5149,23 @@ public class PApplet implements PConstants {
    * be loaded. To load correctly, images must be located in the data
    * directory of the current sketch. In most cases, load all images in
    * <b>setup()</b> to preload them at the start of the program. Loading
-   * images inside <b>draw()</b> will reduce the speed of a program.<br/>
-   * <br/> <b>filename</b> parameter can also be a URL to a file found
+   * images inside <b>draw()</b> will reduce the speed of a program.
+   *  <b>filename</b> parameter can also be a URL to a file found
    * online. For security reasons, a Processing sketch found online can only
    * download files from the same server from which it came. Getting around
    * this restriction requires a <a
    * href="http://wiki.processing.org/w/Sign_an_Applet">signed
-   * applet</a>.<br/>
-   * <br/> <b>extension</b> parameter is used to determine the image type in
+   * applet</a>.
+   *  <b>extension</b> parameter is used to determine the image type in
    * cases where the image filename does not end with a proper extension.
    * Specify the extension as the second parameter to <b>loadImage()</b>, as
-   * shown in the third example on this page.<br/>
-   * <br/> an image is not loaded successfully, the <b>null</b> value is
+   * shown in the third example on this page.
+   *  an image is not loaded successfully, the <b>null</b> value is
    * returned and an error message will be printed to the console. The error
    * message does not halt the program, however the null value may cause a
    * NullPointerException if your code does not check whether the value
-   * returned from <b>loadImage()</b> is null.<br/>
-   * <br/> on the type of error, a <b>PImage</b> object may still be
+   * returned from <b>loadImage()</b> is null.
+   *  on the type of error, a <b>PImage</b> object may still be
    * returned, but the width and height of the image will be set to -1. This
    * happens if bad image data is returned or cannot be decoded properly.
    * Sometimes this happens with image URLs that produce a 403 error or that
@@ -5480,29 +5182,14 @@ public class PApplet implements PConstants {
    * @see PGraphics#background(float, float, float, float)
    */
   public PImage loadImage(String filename) {
-//    return loadImage(filename, null, null);
     return loadImage(filename, null);
   }
 
-//  /**
-//   * @param extension the type of image to load, for example "png", "gif", "jpg"
-//   */
-//  public PImage loadImage(String filename, String extension) {
-//    return loadImage(filename, extension, null);
-//  }
-
-//  /**
-//   * @nowebref
-//   */
-//  public PImage loadImage(String filename, Object params) {
-//    return loadImage(filename, null, params);
-//  }
 
   /**
    * @param extension type of image to load, for example "png", "gif", "jpg"
    */
-  public PImage loadImage(String filename, String extension) { //, Object params) {
-
+  public PImage loadImage(String filename, String extension) {
     // awaitAsyncSaveCompletion() has to run on the main thread, because P2D
     // and P3D call GL functions. If this runs on background, requestImage()
     // already called awaitAsyncSaveCompletion() on the main thread.
@@ -5510,127 +5197,7 @@ public class PApplet implements PConstants {
       g.awaitAsyncSaveCompletion(filename);
     }
 
-    if (extension == null) {
-      String lower = filename.toLowerCase();
-      int dot = filename.lastIndexOf('.');
-      if (dot == -1) {
-        extension = "unknown";  // no extension found
-
-      } else {
-        extension = lower.substring(dot + 1);
-
-        // check for, and strip any parameters on the url, i.e.
-        // filename.jpg?blah=blah&something=that
-        int question = extension.indexOf('?');
-        if (question != -1) {
-          extension = extension.substring(0, question);
-        }
-      }
-    }
-
-    // just in case. them users will try anything!
-    extension = extension.toLowerCase();
-
-    if (extension.equals("tga")) {
-      try {
-        PImage image = loadImageTGA(filename);
-//        if (params != null) {
-//          image.setParams(g, params);
-//        }
-        return image;
-      } catch (IOException e) {
-        printStackTrace(e);
-        return null;
-      }
-    }
-
-    if (extension.equals("tif") || extension.equals("tiff")) {
-      byte bytes[] = loadBytes(filename);
-      PImage image =  (bytes == null) ? null : PImage.loadTIFF(bytes);
-//      if (params != null) {
-//        image.setParams(g, params);
-//      }
-      return image;
-    }
-
-    // For jpeg, gif, and png, load them using createImage(),
-    // because the javax.imageio code was found to be much slower.
-    // http://dev.processing.org/bugs/show_bug.cgi?id=392
-    try {
-      if (extension.equals("jpg") || extension.equals("jpeg") ||
-          extension.equals("gif") || extension.equals("png") ||
-          extension.equals("unknown")) {
-        byte bytes[] = loadBytes(filename);
-        if (bytes == null) {
-          return null;
-        } else {
-          //Image awtImage = Toolkit.getDefaultToolkit().createImage(bytes);
-          Image awtImage = new ImageIcon(bytes).getImage();
-
-          if (awtImage instanceof BufferedImage) {
-            BufferedImage buffImage = (BufferedImage) awtImage;
-            int space = buffImage.getColorModel().getColorSpace().getType();
-            if (space == ColorSpace.TYPE_CMYK) {
-              System.err.println(filename + " is a CMYK image, " +
-                                 "only RGB images are supported.");
-              return null;
-              /*
-              // wishful thinking, appears to not be supported
-              // https://community.oracle.com/thread/1272045?start=0&tstart=0
-              BufferedImage destImage =
-                new BufferedImage(buffImage.getWidth(),
-                                  buffImage.getHeight(),
-                                  BufferedImage.TYPE_3BYTE_BGR);
-              ColorConvertOp op = new ColorConvertOp(null);
-              op.filter(buffImage, destImage);
-              image = new PImage(destImage);
-              */
-            }
-          }
-
-          PImage image = new PImage(awtImage);
-          if (image.width == -1) {
-            System.err.println("The file " + filename +
-                               " contains bad image data, or may not be an image.");
-          }
-
-          // if it's a .gif image, test to see if it has transparency
-          if (extension.equals("gif") || extension.equals("png") ||
-              extension.equals("unknown")) {
-            image.checkAlpha();
-          }
-
-//          if (params != null) {
-//            image.setParams(g, params);
-//          }
-          image.parent = this;
-          return image;
-        }
-      }
-    } catch (Exception e) {
-      // show error, but move on to the stuff below, see if it'll work
-      printStackTrace(e);
-    }
-
-    if (loadImageFormats == null) {
-      loadImageFormats = ImageIO.getReaderFormatNames();
-    }
-    if (loadImageFormats != null) {
-      for (int i = 0; i < loadImageFormats.length; i++) {
-        if (extension.equals(loadImageFormats[i])) {
-          return loadImageIO(filename);
-//          PImage image = loadImageIO(filename);
-//          if (params != null) {
-//            image.setParams(g, params);
-//          }
-//          return image;
-        }
-      }
-    }
-
-    // failed, could not load image after all those attempts
-    System.err.println("Could not find a method to load " + filename);
-    return null;
+    return surface.loadImage(filename, extension);
   }
 
 
@@ -5653,8 +5220,8 @@ public class PApplet implements PConstants {
    * loading the image, its width and height will be set to -1. You'll know
    * when the image has loaded properly because its width and height will be
    * greater than 0. Asynchronous image loading (particularly when
-   * downloading from a server) can dramatically improve performance.<br />
-   * <br/> <b>extension</b> parameter is used to determine the image type in
+   * downloading from a server) can dramatically improve performance.
+   *  <b>extension</b> parameter is used to determine the image type in
    * cases where the image filename does not end with a proper extension.
    * Specify the extension as the second parameter to <b>requestImage()</b>.
    *
@@ -5676,11 +5243,7 @@ public class PApplet implements PConstants {
 
     // if the image loading thread pool hasn't been created, create it
     if (requestImagePool == null) {
-      ThreadFactory factory = new ThreadFactory() {
-        public Thread newThread(Runnable r) {
-          return new Thread(r, REQUEST_IMAGE_THREAD_PREFIX);
-        }
-      };
+      ThreadFactory factory = r -> new Thread(r, REQUEST_IMAGE_THREAD_PREFIX);
       requestImagePool = Executors.newFixedThreadPool(4, factory);
     }
     requestImagePool.execute(() -> {
@@ -5706,250 +5269,6 @@ public class PApplet implements PConstants {
   }
 
 
-  /**
-   * Use Java 1.4 ImageIO methods to load an image.
-   */
-  protected PImage loadImageIO(String filename) {
-    InputStream stream = createInput(filename);
-    if (stream == null) {
-      System.err.println("The image " + filename + " could not be found.");
-      return null;
-    }
-
-    try {
-      BufferedImage bi = ImageIO.read(stream);
-      PImage outgoing = new PImage(bi.getWidth(), bi.getHeight());
-      outgoing.parent = this;
-
-      bi.getRGB(0, 0, outgoing.width, outgoing.height,
-                outgoing.pixels, 0, outgoing.width);
-
-      // check the alpha for this image
-      // was gonna call getType() on the image to see if RGB or ARGB,
-      // but it's not actually useful, since gif images will come through
-      // as TYPE_BYTE_INDEXED, which means it'll still have to check for
-      // the transparency. also, would have to iterate through all the other
-      // types and guess whether alpha was in there, so.. just gonna stick
-      // with the old method.
-      outgoing.checkAlpha();
-
-      stream.close();
-      // return the image
-      return outgoing;
-
-    } catch (Exception e) {
-      printStackTrace(e);
-      return null;
-    }
-  }
-
-
-  /**
-   * Targa image loader for RLE-compressed TGA files.
-   * <p>
-   * Rewritten for 0115 to read/write RLE-encoded targa images.
-   * For 0125, non-RLE encoded images are now supported, along with
-   * images whose y-order is reversed (which is standard for TGA files).
-   * <p>
-   * A version of this function is in MovieMaker.java. Any fixes here
-   * should be applied over in MovieMaker as well.
-   * <p>
-   * Known issue with RLE encoding and odd behavior in some apps:
-   * https://github.com/processing/processing/issues/2096
-   * Please help!
-   */
-  protected PImage loadImageTGA(String filename) throws IOException {
-    InputStream is = createInput(filename);
-    if (is == null) return null;
-
-    byte header[] = new byte[18];
-    int offset = 0;
-    do {
-      int count = is.read(header, offset, header.length - offset);
-      if (count == -1) return null;
-      offset += count;
-    } while (offset < 18);
-
-    /*
-      header[2] image type code
-      2  (0x02) - Uncompressed, RGB images.
-      3  (0x03) - Uncompressed, black and white images.
-      10 (0x0A) - Run-length encoded RGB images.
-      11 (0x0B) - Compressed, black and white images. (grayscale?)
-
-      header[16] is the bit depth (8, 24, 32)
-
-      header[17] image descriptor (packed bits)
-      0x20 is 32 = origin upper-left
-      0x28 is 32 + 8 = origin upper-left + 32 bits
-
-        7  6  5  4  3  2  1  0
-      128 64 32 16  8  4  2  1
-    */
-
-    int format = 0;
-
-    if (((header[2] == 3) || (header[2] == 11)) &&  // B&W, plus RLE or not
-        (header[16] == 8) &&  // 8 bits
-        ((header[17] == 0x8) || (header[17] == 0x28))) {  // origin, 32 bit
-      format = ALPHA;
-
-    } else if (((header[2] == 2) || (header[2] == 10)) &&  // RGB, RLE or not
-               (header[16] == 24) &&  // 24 bits
-               ((header[17] == 0x20) || (header[17] == 0))) {  // origin
-      format = RGB;
-
-    } else if (((header[2] == 2) || (header[2] == 10)) &&
-               (header[16] == 32) &&
-               ((header[17] == 0x8) || (header[17] == 0x28))) {  // origin, 32
-      format = ARGB;
-    }
-
-    if (format == 0) {
-      System.err.println("Unknown .tga file format for " + filename);
-                         //" (" + header[2] + " " +
-                         //(header[16] & 0xff) + " " +
-                         //hex(header[17], 2) + ")");
-      return null;
-    }
-
-    int w = ((header[13] & 0xff) << 8) + (header[12] & 0xff);
-    int h = ((header[15] & 0xff) << 8) + (header[14] & 0xff);
-    PImage outgoing = createImage(w, h, format);
-
-    // where "reversed" means upper-left corner (normal for most of
-    // the modernized world, but "reversed" for the tga spec)
-    //boolean reversed = (header[17] & 0x20) != 0;
-    // https://github.com/processing/processing/issues/1682
-    boolean reversed = (header[17] & 0x20) == 0;
-
-    if ((header[2] == 2) || (header[2] == 3)) {  // not RLE encoded
-      if (reversed) {
-        int index = (h-1) * w;
-        switch (format) {
-        case ALPHA:
-          for (int y = h-1; y >= 0; y--) {
-            for (int x = 0; x < w; x++) {
-              outgoing.pixels[index + x] = is.read();
-            }
-            index -= w;
-          }
-          break;
-        case RGB:
-          for (int y = h-1; y >= 0; y--) {
-            for (int x = 0; x < w; x++) {
-              outgoing.pixels[index + x] =
-                is.read() | (is.read() << 8) | (is.read() << 16) |
-                0xff000000;
-            }
-            index -= w;
-          }
-          break;
-        case ARGB:
-          for (int y = h-1; y >= 0; y--) {
-            for (int x = 0; x < w; x++) {
-              outgoing.pixels[index + x] =
-                is.read() | (is.read() << 8) | (is.read() << 16) |
-                (is.read() << 24);
-            }
-            index -= w;
-          }
-        }
-      } else {  // not reversed
-        int count = w * h;
-        switch (format) {
-        case ALPHA:
-          for (int i = 0; i < count; i++) {
-            outgoing.pixels[i] = is.read();
-          }
-          break;
-        case RGB:
-          for (int i = 0; i < count; i++) {
-            outgoing.pixels[i] =
-              is.read() | (is.read() << 8) | (is.read() << 16) |
-              0xff000000;
-          }
-          break;
-        case ARGB:
-          for (int i = 0; i < count; i++) {
-            outgoing.pixels[i] =
-              is.read() | (is.read() << 8) | (is.read() << 16) |
-              (is.read() << 24);
-          }
-          break;
-        }
-      }
-
-    } else {  // header[2] is 10 or 11
-      int index = 0;
-      int px[] = outgoing.pixels;
-
-      while (index < px.length) {
-        int num = is.read();
-        boolean isRLE = (num & 0x80) != 0;
-        if (isRLE) {
-          num -= 127;  // (num & 0x7F) + 1
-          int pixel = 0;
-          switch (format) {
-          case ALPHA:
-            pixel = is.read();
-            break;
-          case RGB:
-            pixel = 0xFF000000 |
-              is.read() | (is.read() << 8) | (is.read() << 16);
-            //(is.read() << 16) | (is.read() << 8) | is.read();
-            break;
-          case ARGB:
-            pixel = is.read() |
-              (is.read() << 8) | (is.read() << 16) | (is.read() << 24);
-            break;
-          }
-          for (int i = 0; i < num; i++) {
-            px[index++] = pixel;
-            if (index == px.length) break;
-          }
-        } else {  // write up to 127 bytes as uncompressed
-          num += 1;
-          switch (format) {
-          case ALPHA:
-            for (int i = 0; i < num; i++) {
-              px[index++] = is.read();
-            }
-            break;
-          case RGB:
-            for (int i = 0; i < num; i++) {
-              px[index++] = 0xFF000000 |
-                is.read() | (is.read() << 8) | (is.read() << 16);
-              //(is.read() << 16) | (is.read() << 8) | is.read();
-            }
-            break;
-          case ARGB:
-            for (int i = 0; i < num; i++) {
-              px[index++] = is.read() | //(is.read() << 24) |
-                (is.read() << 8) | (is.read() << 16) | (is.read() << 24);
-              //(is.read() << 16) | (is.read() << 8) | is.read();
-            }
-            break;
-          }
-        }
-      }
-
-      if (!reversed) {
-        int[] temp = new int[w];
-        for (int y = 0; y < h/2; y++) {
-          int z = (h-1) - y;
-          System.arraycopy(px, y*w, temp, 0, w);
-          System.arraycopy(px, z*w, px, y*w, w);
-          System.arraycopy(temp, 0, px, z*w, w);
-        }
-      }
-    }
-    is.close();
-    return outgoing;
-  }
-
-
-
   //////////////////////////////////////////////////////////////
 
   // DATA I/O
@@ -6004,13 +5323,7 @@ public class PApplet implements PConstants {
 
       // can't use catch-all exception, since it might catch the
       // RuntimeException about the incorrect case sensitivity
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-
-    } catch (ParserConfigurationException e) {
-      throw new RuntimeException(e);
-
-    } catch (SAXException e) {
+    } catch (IOException | ParserConfigurationException | SAXException e) {
       throw new RuntimeException(e);
     }
   }
@@ -6241,10 +5554,9 @@ public class PApplet implements PConstants {
       String optionStr = Table.extensionOptions(true, filename, options);
       String[] optionList = trim(split(optionStr, ','));
 
-      Table dictionary = null;
       for (String opt : optionList) {
         if (opt.startsWith("dictionary=")) {
-          dictionary = loadTable(opt.substring(opt.indexOf('=') + 1), "tsv");
+          Table dictionary = loadTable(opt.substring(opt.indexOf('=') + 1), "tsv");
           return dictionary.typedParse(createInput(filename), optionStr);
         }
       }
@@ -6314,19 +5626,19 @@ public class PApplet implements PConstants {
    * fonts must be located in the data directory of the current sketch. To
    * create a font to use with Processing, select "Create Font..." from the
    * Tools menu. This will create a font in the format Processing requires
-   * and also adds it to the current sketch's data directory.<br />
-   * <br />
+   * and also adds it to the current sketch's data directory.
+   *
    * Like <b>loadImage()</b> and other functions that load data, the
    * <b>loadFont()</b> function should not be used inside <b>draw()</b>,
    * because it will slow down the sketch considerably, as the font will be
-   * re-loaded from the disk (or network) on each frame.<br />
-   * <br />
+   * re-loaded from the disk (or network) on each frame.
+   *
    * For most renderers, Processing displays fonts using the .vlw font
    * format, which uses images for each letter, rather than defining them
    * through vector data. When <b>hint(ENABLE_NATIVE_FONTS)</b> is used with
    * the JAVA2D renderer, the native version of a font will be used if it is
-   * installed on the user's machine.<br />
-   * <br />
+   * installed on the user's machine.
+   *
    * Using <b>createFont()</b> (instead of loadFont) enables vector data to
    * be used with the JAVA2D (default) renderer setting. This can be helpful
    * when many font sizes are needed, or when using any renderer based on
@@ -6374,7 +5686,7 @@ public class PApplet implements PConstants {
    * file inside the sketches "data" folder. This function is an advanced
    * feature for precise control. On most occasions you should create fonts
    * through selecting "Create Font..." from the Tools menu.
-   * <br /><br />
+   *
    * Use the <b>PFont.list()</b> method to first determine the names for the
    * fonts recognized by the computer and are compatible with this function.
    * Because of limitations in Java, not all fonts can be used and some might
@@ -6384,12 +5696,12 @@ public class PApplet implements PConstants {
    * because other people might not have the font installed on their
    * computer. Only fonts that can legally be distributed should be included
    * with a sketch.
-   * <br /><br />
+   *
    * The <b>size</b> parameter states the font size you want to generate. The
    * <b>smooth</b> parameter specifies if the font should be antialiased or
    * not, and the <b>charset</b> parameter is an array of chars that
    * specifies the characters to generate.
-   * <br /><br />
+   *
    * This function creates a bitmapped version of a font in the same manner
    * as the Create Font tool. It loads a font by name, and converts it to a
    * series of images based on the size of the font. When possible, the
@@ -6454,25 +5766,6 @@ public class PApplet implements PConstants {
   */
 
 
-  static private boolean lookAndFeelCheck;
-
-  /**
-   * Initialize the Look & Feel if it hasn't been already.
-   * Call this before using any Swing-related code in PApplet methods.
-   */
-  static private void checkLookAndFeel() {
-    if (!lookAndFeelCheck) {
-      if (platform == WINDOWS) {
-        // Windows is defaulting to Metal or something else awful.
-        // Which also is not scaled properly with HiDPI interfaces.
-        try {
-          UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (Exception e) { }
-      }
-      lookAndFeelCheck = true;
-    }
-  }
-
   /**
    * Open a platform-specific file chooser dialog to select a file for input.
    * After the selection is made, the selected File will be passed to the
@@ -6514,10 +5807,12 @@ public class PApplet implements PConstants {
 
   public void selectInput(String prompt, String callback,
                           File file, Object callbackObject) {
-    selectInput(prompt, callback, file, callbackObject, null, this);  //selectFrame());
+    //selectInput(prompt, callback, file, callbackObject, null, this);
+    surface.selectInput(prompt, callback, file, callbackObject);
   }
 
 
+  /*
   static public void selectInput(String prompt, String callbackMethod,
                                  File file, Object callbackObject, Frame parent,
                                  PApplet sketch) {
@@ -6529,6 +5824,7 @@ public class PApplet implements PConstants {
                                  File file, Object callbackObject, Frame parent) {
     selectImpl(prompt, callbackMethod, file, callbackObject, parent, FileDialog.LOAD, null);
   }
+  */
 
 
   /**
@@ -6550,10 +5846,12 @@ public class PApplet implements PConstants {
 
   public void selectOutput(String prompt, String callback,
                            File file, Object callbackObject) {
-    selectOutput(prompt, callback, file, callbackObject, null, this); //selectFrame());
+    //selectOutput(prompt, callback, file, callbackObject, null, this);
+    surface.selectOutput(prompt, callback, file, callbackObject);
   }
 
 
+  /*
   static public void selectOutput(String prompt, String callbackMethod,
                                   File file, Object callbackObject, Frame parent) {
     selectImpl(prompt, callbackMethod, file, callbackObject, parent, FileDialog.SAVE, null);
@@ -6621,6 +5919,7 @@ public class PApplet implements PConstants {
       }
     });
   }
+  */
 
 
   /**
@@ -6642,10 +5941,12 @@ public class PApplet implements PConstants {
 
   public void selectFolder(String prompt, String callback,
                            File file, Object callbackObject) {
-    selectFolder(prompt, callback, file, callbackObject, null, this); //selectFrame());
+    //selectFolder(prompt, callback, file, callbackObject, null, this);
+    surface.selectFolder(prompt, callback, file, callbackObject);
   }
 
 
+  /*
   static public void selectFolder(final String prompt,
                                   final String callbackMethod,
                                   final File defaultSelection,
@@ -6671,7 +5972,7 @@ public class PApplet implements PConstants {
           (sketch.g instanceof PGraphicsOpenGL) && (platform == WINDOWS);
         if (hide) sketch.surface.setVisible(false);
 
-        if (platform == MACOSX && useNativeSelect != false) {
+        if (platform == MACOS && useNativeSelect != false) {
           FileDialog fileDialog =
             new FileDialog(parentFrame, prompt, FileDialog.LOAD);
           if (defaultSelection != null) {
@@ -6704,16 +6005,17 @@ public class PApplet implements PConstants {
       }
     });
   }
+  */
 
 
-  static private void selectCallback(File selectedFile,
-                                     String callbackMethod,
-                                     Object callbackObject) {
+  static public void selectCallback(File selectedFile,
+                                    String callbackMethod,
+                                    Object callbackObject) {
     try {
       Class<?> callbackClass = callbackObject.getClass();
       Method selectMethod =
-        callbackClass.getMethod(callbackMethod, new Class[] { File.class });
-      selectMethod.invoke(callbackObject, new Object[] { selectedFile });
+        callbackClass.getMethod(callbackMethod, File.class);
+      selectMethod.invoke(callbackObject, selectedFile);
 
     } catch (IllegalAccessException iae) {
       System.err.println(callbackMethod + "() must be public");
@@ -6727,7 +6029,6 @@ public class PApplet implements PConstants {
   }
 
 
-
   //////////////////////////////////////////////////////////////
 
   // LISTING DIRECTORIES
@@ -6891,7 +6192,7 @@ public class PApplet implements PConstants {
    * Creates a <b>BufferedReader</b> object that can be used to read files
    * line-by-line as individual <b>String</b> objects. This is the complement
    * to the <b>createWriter()</b> function.
-   * <br/> <br/>
+   *
    * Starting with Processing release 0134, all files loaded and saved by the
    * Processing API use UTF-8 encoding. In previous releases, the default
    * encoding for your platform was used, which causes problems when files
@@ -6967,7 +6268,7 @@ public class PApplet implements PConstants {
    * to write to it. For the file to be made correctly, it should be flushed
    * and must be closed with its <b>flush()</b> and <b>close()</b> methods
    * (see above example).
-   * <br/> <br/>
+   *
    * Starting with Processing release 0134, all files loaded and saved by the
    * Processing API use UTF-8 encoding. In previous releases, the default
    * encoding for your platform was used, which causes problems when files
@@ -7035,28 +6336,28 @@ public class PApplet implements PConstants {
    * It's useful if you want to use the facilities provided by PApplet to
    * easily open files from the data folder or from a URL, but want an
    * InputStream object so that you can use other parts of Java to take more
-   * control of how the stream is read.<br />
-   * <br />
-   * The filename passed in can be:<br />
-   * - A URL, for instance <b>openStream("http://processing.org/")</b><br />
-   * - A file in the sketch's <b>data</b> folder<br />
+   * control of how the stream is read.
+   *
+   * The filename passed in can be:
+   * - A URL, for instance <b>openStream("http://processing.org/")</b>
+   * - A file in the sketch's <b>data</b> folder
    * - The full path to a file to be opened locally (when running as an
-   * application)<br />
-   * <br />
+   * application)
+   *
    * If the requested item doesn't exist, null is returned. If not online,
    * this will also check to see if the user is asking for a file whose name
    * isn't properly capitalized. If capitalization is different, an error
    * will be printed to the console. This helps prevent issues that appear
    * when a sketch is exported to the web, where case sensitivity matters, as
    * opposed to running from inside the Processing Development Environment on
-   * Windows or Mac OS, where case sensitivity is preserved but ignored.<br />
-   * <br />
+   * Windows or Mac OS, where case sensitivity is preserved but ignored.
+   *
    * If the file ends with <b>.gz</b>, the stream will automatically be gzip
    * decompressed. If you don't want the automatic decompression, use the
    * related function <b>createInputRaw()</b>.
-   * <br />
-   * In earlier releases, this function was called <b>openStream()</b>.<br />
-   * <br />
+   *
+   * In earlier releases, this function was called <b>openStream()</b>.
+   *
    *
    * ( end auto-generated )
    *
@@ -7173,7 +6474,7 @@ public class PApplet implements PConstants {
       }
     }
 
-    InputStream stream = null;
+    InputStream stream;
 
     // Moved this earlier than the getResourceAsStream() checks, because
     // calling getResourceAsStream() on a directory lists its contents.
@@ -7207,17 +6508,15 @@ public class PApplet implements PConstants {
                                        filename + ". Rename the file " +
                                        "or change your code.");
           }
-        } catch (IOException e) { }
+        } catch (IOException ignored) { }
       }
 
       // if this file is ok, may as well just load it
-      stream = new FileInputStream(file);
-      if (stream != null) return stream;
+      return new FileInputStream(file);
 
       // have to break these out because a general Exception might
       // catch the RuntimeException being thrown above
-    } catch (IOException ioe) {
-    } catch (SecurityException se) { }
+    } catch (IOException | SecurityException ignored) { }
 
     // Using getClassLoader() prevents java from converting dots
     // to slashes or requiring a slash at the beginning.
@@ -7255,21 +6554,18 @@ public class PApplet implements PConstants {
       // an application, or as a signed applet
       try {  // first try to catch any security exceptions
         try {
-          stream = new FileInputStream(dataPath(filename));
-          if (stream != null) return stream;
-        } catch (IOException e2) { }
+          return new FileInputStream(dataPath(filename));
+        } catch (IOException ignored) { }
 
         try {
-          stream = new FileInputStream(sketchPath(filename));
-          if (stream != null) return stream;
-        } catch (Exception e) { }  // ignored
+          return new FileInputStream(sketchPath(filename));
+        } catch (Exception ignored) { }
 
         try {
-          stream = new FileInputStream(filename);
-          if (stream != null) return stream;
-        } catch (IOException e1) { }
+          return new FileInputStream(filename);
+        } catch (IOException ignored) { }
 
-      } catch (SecurityException se) { }  // online, whups
+      } catch (SecurityException ignored) { }  // online, whups
 
     } catch (Exception e) {
       printStackTrace(e);
@@ -7311,8 +6607,8 @@ public class PApplet implements PConstants {
    *
    * Reads the contents of a file or url and places it in a byte array. If a
    * file is specified, it must be located in the sketch's "data"
-   * directory/folder.<br />
-   * <br />
+   * directory/folder.
+   *
    * The filename parameter can also be a URL to a file found online. For
    * security reasons, a Processing sketch found online can only download
    * files from the same server from which it came. Getting around this
@@ -7361,7 +6657,7 @@ public class PApplet implements PConstants {
           }
 
           if (input != null) {
-            byte[] buffer = null;
+            byte[] buffer;
             if (length != -1) {
               buffer = new byte[length];
               int count;
@@ -7522,20 +6818,20 @@ public class PApplet implements PConstants {
    *
    * Reads the contents of a file or url and creates a String array of its
    * individual lines. If a file is specified, it must be located in the
-   * sketch's "data" directory/folder.<br />
-   * <br />
+   * sketch's "data" directory/folder.
+   *
    * The filename parameter can also be a URL to a file found online. For
    * security reasons, a Processing sketch found online can only download
    * files from the same server from which it came. Getting around this
    * restriction requires a <a
    * href="http://wiki.processing.org/w/Sign_an_Applet">signed applet</a>.
-   * <br />
+   *
    * If the file is not available or an error occurs, <b>null</b> will be
    * returned and an error message will be printed to the console. The error
    * message does not halt the program, however the null value may cause a
    * NullPointerException if your code does not check whether the value
    * returned is null.
-   * <br/> <br/>
+   *
    * Starting with Processing release 0134, all files loaded and saved by the
    * Processing API use UTF-8 encoding. In previous releases, the default
    * encoding for your platform was used, which causes problems when files
@@ -7584,25 +6880,20 @@ public class PApplet implements PConstants {
    * @nowebref
    */
   static public String[] loadStrings(InputStream input) {
-    try {
-      BufferedReader reader =
-        new BufferedReader(new InputStreamReader(input, "UTF-8"));
-      return loadStrings(reader);
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    return null;
+    BufferedReader reader =
+      new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
+    return loadStrings(reader);
   }
 
 
   static public String[] loadStrings(BufferedReader reader) {
     try {
-      String lines[] = new String[100];
+      String[] lines = new String[100];
       int lineCount = 0;
-      String line = null;
+      String line;
       while ((line = reader.readLine()) != null) {
         if (lineCount == lines.length) {
-          String temp[] = new String[lineCount << 1];
+          String[] temp = new String[lineCount << 1];
           System.arraycopy(lines, 0, temp, 0, lineCount);
           lines = temp;
         }
@@ -7615,7 +6906,7 @@ public class PApplet implements PConstants {
       }
 
       // resize array to appropriate amount for these lines
-      String output[] = new String[lineCount];
+      String[] output = new String[lineCount];
       System.arraycopy(lines, 0, output, 0, lineCount);
       return output;
 
@@ -7639,16 +6930,16 @@ public class PApplet implements PConstants {
    * Similar to <b>createInput()</b>, this creates a Java <b>OutputStream</b>
    * for a given filename or path. The file will be created in the sketch
    * folder, or in the same folder as an exported application.
-   * <br /><br />
+   *
    * If the path does not exist, intermediate folders will be created. If an
    * exception occurs, it will be printed to the console, and <b>null</b>
    * will be returned.
-   * <br /><br />
+   *
    * This function is a convenience over the Java approach that requires you
    * to 1) create a FileOutputStream object, 2) determine the exact file
    * location, and 3) handle exceptions. Exceptions are handled internally by
    * the function, which is more appropriate for "sketch" projects.
-   * <br /><br />
+   *
    * If the output filename ends with <b>.gz</b>, the output will be
    * automatically GZIP compressed as it is written.
    *
@@ -7686,8 +6977,8 @@ public class PApplet implements PConstants {
    *
    * Save the contents of a stream to a file in the sketch folder. This is
    * basically <b>saveBytes(blah, loadBytes())</b>, but done more efficiently
-   * (and with less confusing syntax).<br />
-   * <br />
+   * (and with less confusing syntax).
+   *
    * When using the <b>targetFile</b> parameter, it writes to a <b>File</b>
    * object for greater control over the file location. (Note that unlike
    * some other functions, this will not automatically compress or uncompress
@@ -7707,7 +6998,7 @@ public class PApplet implements PConstants {
   /**
    * Identical to the other saveStream(), but writes to a File
    * object, for greater control over the file location.
-   * <p/>
+   *
    * Note that unlike other api methods, this will not automatically
    * compress or uncompress gzip files.
    */
@@ -7735,24 +7026,23 @@ public class PApplet implements PConstants {
 
       saveStream(targetStream, source);
       targetStream.close();
-      targetStream = null;
 
       if (target.exists()) {
         if (!target.delete()) {
-          System.err.println("Could not replace " +
-                             target.getAbsolutePath() + ".");
+          System.err.println("Could not replace " + target);
         }
       }
       if (!tempFile.renameTo(target)) {
-        System.err.println("Could not rename temporary file " +
-                           tempFile.getAbsolutePath());
+        System.err.println("Could not rename temporary file " + tempFile);
         return false;
       }
       return true;
 
     } catch (IOException e) {
       if (tempFile != null) {
-        tempFile.delete();
+        if (!tempFile.delete()) {
+          System.err.println("Could not rename temporary file " + tempFile);
+        }
       }
       e.printStackTrace();
       return false;
@@ -7783,8 +7073,8 @@ public class PApplet implements PConstants {
    * Opposite of <b>loadBytes()</b>, will write an entire array of bytes to a
    * file. The data is saved in binary format. This file is saved to the
    * sketch's folder, which is opened by selecting "Show sketch folder" from
-   * the "Sketch" menu.<br />
-   * <br />
+   * the "Sketch" menu.
+   *
    * It is not possible to use saveXxxxx() functions inside a web browser
    * unless the sketch is <a
    * href="http://wiki.processing.org/w/Sign_an_Applet">signed applet</A>. To
@@ -7816,7 +7106,9 @@ public class PApplet implements PConstants {
   static private File createTempFile(File file) throws IOException {
     File parentDir = file.getParentFile();
     if (!parentDir.exists()) {
-      parentDir.mkdirs();
+      if (!parentDir.mkdirs()) {
+        throw new IOException("Could not make directories for " + parentDir);
+      }
     }
     String name = file.getName();
     String prefix;
@@ -7847,25 +7139,29 @@ public class PApplet implements PConstants {
       tempFile = createTempFile(file);
 
       OutputStream output = createOutput(tempFile);
-      saveBytes(output, data);
-      output.close();
-      output = null;
+      if (output != null) {
+        saveBytes(output, data);
+        output.close();
+      } else {
+        System.err.println("Could not write to " + tempFile);
+      }
 
       if (file.exists()) {
         if (!file.delete()) {
-          System.err.println("Could not replace " + file.getAbsolutePath());
+          System.err.println("Could not replace " + file);
         }
       }
 
       if (!tempFile.renameTo(file)) {
-        System.err.println("Could not rename temporary file " +
-                           tempFile.getAbsolutePath());
+        System.err.println("Could not rename temporary file " + tempFile);
       }
 
     } catch (IOException e) {
       System.err.println("error saving bytes to " + file);
       if (tempFile != null) {
-        tempFile.delete();
+        if (!tempFile.delete()) {
+          System.err.println("Could not delete temporary file " + tempFile);
+        }
       }
       e.printStackTrace();
     }
@@ -7894,14 +7190,14 @@ public class PApplet implements PConstants {
    *
    * Writes an array of strings to a file, one line per string. This file is
    * saved to the sketch's folder, which is opened by selecting "Show sketch
-   * folder" from the "Sketch" menu.<br />
-   * <br />
+   * folder" from the "Sketch" menu.
+   *
    * It is not possible to use saveXxxxx() functions inside a web browser
    * unless the sketch is <a
    * href="http://wiki.processing.org/w/Sign_an_Applet">signed applet</A>. To
    * save a file back to a server, see the <a
    * href="http://wiki.processing.org/w/Saving_files_to_a_web-server">save to
-   * web</A> code snippet on the Processing Wiki.<br/>
+   * web</A> code snippet on the Processing Wiki.
    * <br/ >
    * Starting with Processing 1.0, all files loaded and saved by the
    * Processing API use UTF-8 encoding. In previous releases, the default
@@ -7916,7 +7212,7 @@ public class PApplet implements PConstants {
    * @see PApplet#loadBytes(String)
    * @see PApplet#saveBytes(String, byte[])
    */
-  public void saveStrings(String filename, String data[]) {
+  public void saveStrings(String filename, String[] data) {
     saveStrings(saveFile(filename), data);
   }
 
@@ -7924,7 +7220,7 @@ public class PApplet implements PConstants {
   /**
    * @nowebref
    */
-  static public void saveStrings(File file, String data[]) {
+  static public void saveStrings(File file, String[] data) {
     saveStrings(createOutput(file), data);
   }
 
@@ -7960,13 +7256,7 @@ public class PApplet implements PConstants {
 
       // Workaround for bug in Java for OS X from Oracle (7u51)
       // https://github.com/processing/processing/issues/2181
-      if (platform == MACOSX) {
-        if (jarPath.contains("Contents/Java/")) {
-          String appPath = jarPath.substring(0, jarPath.indexOf(".app") + 4);
-          File containingFolder = new File(appPath).getParentFile();
-          folder = containingFolder.getAbsolutePath();
-        }
-      } else {
+
         // Working directory may not be set properly, try some options
         // https://github.com/processing/processing/issues/2195
         if (jarPath.contains("/lib/")) {
@@ -7974,8 +7264,7 @@ public class PApplet implements PConstants {
           folder = new File(jarPath, "../..").getCanonicalPath();
         }
       }
-    } catch (Exception e) {
-      e.printStackTrace();
+     catch (IOException | URISyntaxException e) {
     }
     return folder;
   }
@@ -7993,11 +7282,11 @@ public class PApplet implements PConstants {
    * Prepend the sketch folder path to the filename (or path) that is
    * passed in. External libraries should use this function to save to
    * the sketch folder.
-   * <p/>
+   *
    * Note that when running as an applet inside a web browser,
    * the sketchPath will be set to null, because security restrictions
    * prevent applets from accessing that information.
-   * <p/>
+   *
    * This will also cause an error if the sketch is not inited properly,
    * meaning that init() was never called on the PApplet when hosted
    * my some other main() or by other code. For proper use of init(),
@@ -8026,7 +7315,7 @@ public class PApplet implements PConstants {
   /**
    * Returns a path inside the applet folder to save to. Like sketchPath(),
    * but creates any in-between folders so that things save properly.
-   * <p/>
+   *
    * All saveXxxx() functions use the path to the sketch folder, rather than
    * its data folder. Once exported, the data folder will be found inside the
    * jar file of the exported application or applet. In this case, it's not
@@ -8054,17 +7343,15 @@ public class PApplet implements PConstants {
 
   static File desktopFolder;
 
-  /** Not a supported function. For testing use only. */
   static public File desktopFile(String what) {
     if (desktopFolder == null) {
       // Should work on Linux and OS X (on OS X, even with the localized version).
       desktopFolder = new File(System.getProperty("user.home"), "Desktop");
       if (!desktopFolder.exists()) {
-        if (platform == WINDOWS) {
-          FileSystemView filesys = FileSystemView.getFileSystemView();
-          desktopFolder = filesys.getHomeDirectory();
+        if (platform == WINDOWS && !disableAWT) {
+          desktopFolder = ShimAWT.getWindowsDesktop();
         } else {
-          throw new UnsupportedOperationException("Could not find a suitable desktop foldder");
+          throw new UnsupportedOperationException("Could not find a suitable Desktop foldder");
         }
       }
     }
@@ -8072,7 +7359,6 @@ public class PApplet implements PConstants {
   }
 
 
-  /** Not a supported function. For testing use only. */
   static public String desktopPath(String what) {
     return desktopFile(what).getAbsolutePath();
   }
@@ -8208,11 +7494,7 @@ public class PApplet implements PConstants {
   // using toURI() and URI.toURL()."
   // https://docs.oracle.com/javase/8/docs/api/java/net/URL.html
   static public String urlDecode(String str) {
-    try {
-      return URLDecoder.decode(str, "UTF-8");
-    } catch (UnsupportedEncodingException e) {  // safe per the JDK source
-      return null;
-    }
+    return URLDecoder.decode(str, StandardCharsets.UTF_8);
   }
 
 
@@ -8238,7 +7520,7 @@ public class PApplet implements PConstants {
    * @param list array to sort
    * @see PApplet#reverse(boolean[])
    */
-  static public byte[] sort(byte list[]) {
+  static public byte[] sort(byte[] list) {
     return sort(list, list.length);
   }
 
@@ -8252,7 +7534,7 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public char[] sort(char list[]) {
+  static public char[] sort(char[] list) {
     return sort(list, list.length);
   }
 
@@ -8263,7 +7545,7 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public int[] sort(int list[]) {
+  static public int[] sort(int[] list) {
     return sort(list, list.length);
   }
 
@@ -8274,7 +7556,7 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public float[] sort(float list[]) {
+  static public float[] sort(float[] list) {
     return sort(list, list.length);
   }
 
@@ -8285,7 +7567,7 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public String[] sort(String list[]) {
+  static public String[] sort(String[] list) {
     return sort(list, list.length);
   }
 
@@ -8381,7 +7663,7 @@ public class PApplet implements PConstants {
    * Increases the size of an array. By default, this function doubles the
    * size of the array, but the optional <b>newSize</b> parameter provides
    * precise control over the increase in size.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) expand(originalArray)</em>.
@@ -8392,85 +7674,85 @@ public class PApplet implements PConstants {
    * @param list the array to expand
    * @see PApplet#shorten(boolean[])
    */
-  static public boolean[] expand(boolean list[]) {
+  static public boolean[] expand(boolean[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   /**
    * @param newSize new size for the array
    */
-  static public boolean[] expand(boolean list[], int newSize) {
-    boolean temp[] = new boolean[newSize];
+  static public boolean[] expand(boolean[] list, int newSize) {
+    boolean[] temp = new boolean[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public byte[] expand(byte list[]) {
+  static public byte[] expand(byte[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public byte[] expand(byte list[], int newSize) {
-    byte temp[] = new byte[newSize];
+  static public byte[] expand(byte[] list, int newSize) {
+    byte[] temp = new byte[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public char[] expand(char list[]) {
+  static public char[] expand(char[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public char[] expand(char list[], int newSize) {
-    char temp[] = new char[newSize];
+  static public char[] expand(char[] list, int newSize) {
+    char[] temp = new char[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public int[] expand(int list[]) {
+  static public int[] expand(int[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public int[] expand(int list[], int newSize) {
-    int temp[] = new int[newSize];
+  static public int[] expand(int[] list, int newSize) {
+    int[] temp = new int[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public long[] expand(long list[]) {
+  static public long[] expand(long[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public long[] expand(long list[], int newSize) {
-    long temp[] = new long[newSize];
+  static public long[] expand(long[] list, int newSize) {
+    long[] temp = new long[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public float[] expand(float list[]) {
+  static public float[] expand(float[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public float[] expand(float list[], int newSize) {
-    float temp[] = new float[newSize];
+  static public float[] expand(float[] list, int newSize) {
+    float[] temp = new float[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public double[] expand(double list[]) {
+  static public double[] expand(double[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public double[] expand(double list[], int newSize) {
-    double temp[] = new double[newSize];
+  static public double[] expand(double[] list, int newSize) {
+    double[] temp = new double[newSize];
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
   }
 
-  static public String[] expand(String list[]) {
+  static public String[] expand(String[] list) {
     return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
-  static public String[] expand(String list[], int newSize) {
-    String temp[] = new String[newSize];
+  static public String[] expand(String[] list, int newSize) {
+    String[] temp = new String[newSize];
     // in case the new size is smaller than list.length
     System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
     return temp;
@@ -8501,7 +7783,7 @@ public class PApplet implements PConstants {
    * Expands an array by one element and adds data to the new position. The
    * datatype of the <b>element</b> parameter must be the same as the
    * datatype of the array.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) append(originalArray, element)</em>.
@@ -8514,31 +7796,31 @@ public class PApplet implements PConstants {
    * @see PApplet#shorten(boolean[])
    * @see PApplet#expand(boolean[])
    */
-  static public byte[] append(byte array[], byte value) {
+  static public byte[] append(byte[] array, byte value) {
     array = expand(array, array.length + 1);
     array[array.length-1] = value;
     return array;
   }
 
-  static public char[] append(char array[], char value) {
+  static public char[] append(char[] array, char value) {
     array = expand(array, array.length + 1);
     array[array.length-1] = value;
     return array;
   }
 
-  static public int[] append(int array[], int value) {
+  static public int[] append(int[] array, int value) {
     array = expand(array, array.length + 1);
     array[array.length-1] = value;
     return array;
   }
 
-  static public float[] append(float array[], float value) {
+  static public float[] append(float[] array, float value) {
     array = expand(array, array.length + 1);
     array[array.length-1] = value;
     return array;
   }
 
-  static public String[] append(String array[], String value) {
+  static public String[] append(String[] array, String value) {
     array = expand(array, array.length + 1);
     array[array.length-1] = value;
     return array;
@@ -8556,7 +7838,7 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from shorten.xml )
    *
    * Decreases an array by one element and returns the shortened array.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) shorten(originalArray)</em>.
@@ -8568,27 +7850,27 @@ public class PApplet implements PConstants {
    * @see PApplet#append(byte[], byte)
    * @see PApplet#expand(boolean[])
    */
-  static public boolean[] shorten(boolean list[]) {
+  static public boolean[] shorten(boolean[] list) {
     return subset(list, 0, list.length-1);
   }
 
-  static public byte[] shorten(byte list[]) {
+  static public byte[] shorten(byte[] list) {
     return subset(list, 0, list.length-1);
   }
 
-  static public char[] shorten(char list[]) {
+  static public char[] shorten(char[] list) {
     return subset(list, 0, list.length-1);
   }
 
-  static public int[] shorten(int list[]) {
+  static public int[] shorten(int[] list) {
     return subset(list, 0, list.length-1);
   }
 
-  static public float[] shorten(float list[]) {
+  static public float[] shorten(float[] list) {
     return subset(list, 0, list.length-1);
   }
 
-  static public String[] shorten(String list[]) {
+  static public String[] shorten(String[] list) {
     return subset(list, 0, list.length-1);
   }
 
@@ -8605,7 +7887,7 @@ public class PApplet implements PConstants {
    * parameters must be of the same datatype. The <b>array</b> parameter
    * defines the array which will be modified and the second parameter
    * defines the data which will be inserted.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) splice(array1, array2, index)</em>.
@@ -8618,9 +7900,9 @@ public class PApplet implements PConstants {
    * @see PApplet#concat(boolean[], boolean[])
    * @see PApplet#subset(boolean[], int, int)
    */
-  static final public boolean[] splice(boolean list[],
+  static final public boolean[] splice(boolean[] list,
                                        boolean value, int index) {
-    boolean outgoing[] = new boolean[list.length + 1];
+    boolean[] outgoing = new boolean[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8628,9 +7910,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public boolean[] splice(boolean list[],
-                                       boolean value[], int index) {
-    boolean outgoing[] = new boolean[list.length + value.length];
+  static final public boolean[] splice(boolean[] list,
+                                       boolean[] value, int index) {
+    boolean[] outgoing = new boolean[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8638,9 +7920,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public byte[] splice(byte list[],
+  static final public byte[] splice(byte[] list,
                                     byte value, int index) {
-    byte outgoing[] = new byte[list.length + 1];
+    byte[] outgoing = new byte[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8648,9 +7930,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public byte[] splice(byte list[],
-                                    byte value[], int index) {
-    byte outgoing[] = new byte[list.length + value.length];
+  static final public byte[] splice(byte[] list,
+                                    byte[] value, int index) {
+    byte[] outgoing = new byte[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8659,9 +7941,9 @@ public class PApplet implements PConstants {
   }
 
 
-  static final public char[] splice(char list[],
+  static final public char[] splice(char[] list,
                                     char value, int index) {
-    char outgoing[] = new char[list.length + 1];
+    char[] outgoing = new char[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8669,9 +7951,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public char[] splice(char list[],
-                                    char value[], int index) {
-    char outgoing[] = new char[list.length + value.length];
+  static final public char[] splice(char[] list,
+                                    char[] value, int index) {
+    char[] outgoing = new char[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8679,9 +7961,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public int[] splice(int list[],
+  static final public int[] splice(int[] list,
                                    int value, int index) {
-    int outgoing[] = new int[list.length + 1];
+    int[] outgoing = new int[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8689,9 +7971,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public int[] splice(int list[],
-                                   int value[], int index) {
-    int outgoing[] = new int[list.length + value.length];
+  static final public int[] splice(int[] list,
+                                   int[] value, int index) {
+    int[] outgoing = new int[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8699,9 +7981,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public float[] splice(float list[],
+  static final public float[] splice(float[] list,
                                      float value, int index) {
-    float outgoing[] = new float[list.length + 1];
+    float[] outgoing = new float[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8709,9 +7991,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public float[] splice(float list[],
-                                     float value[], int index) {
-    float outgoing[] = new float[list.length + value.length];
+  static final public float[] splice(float[] list,
+                                     float[] value, int index) {
+    float[] outgoing = new float[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8719,9 +8001,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public String[] splice(String list[],
+  static final public String[] splice(String[] list,
                                       String value, int index) {
-    String outgoing[] = new String[list.length + 1];
+    String[] outgoing = new String[list.length + 1];
     System.arraycopy(list, 0, outgoing, 0, index);
     outgoing[index] = value;
     System.arraycopy(list, index, outgoing, index + 1,
@@ -8729,9 +8011,9 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static final public String[] splice(String list[],
-                                      String value[], int index) {
-    String outgoing[] = new String[list.length + value.length];
+  static final public String[] splice(String[] list,
+                                      String[] value, int index) {
+    String[] outgoing = new String[list.length + value.length];
     System.arraycopy(list, 0, outgoing, 0, index);
     System.arraycopy(value, 0, outgoing, index, value.length);
     System.arraycopy(list, index, outgoing, index + value.length,
@@ -8777,7 +8059,7 @@ public class PApplet implements PConstants {
    * from the <b>offset</b> to the end of the array. When specifying the
    * <b>offset</b> remember the first array element is 0. This function does
    * not change the source array.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) subset(originalArray, 0, 4)</em>.
@@ -8900,7 +8182,7 @@ public class PApplet implements PConstants {
    * Concatenates two arrays. For example, concatenating the array { 1, 2, 3
    * } and the array { 4, 5, 6 } yields { 1, 2, 3, 4, 5, 6 }. Both parameters
    * must be arrays of the same datatype.
-   * <br/> <br/>
+   *
    * When using an array of objects, the data returned from the function must
    * be cast to the object array's data type. For example: <em>SomeClass[]
    * items = (SomeClass[]) concat(array1, array2)</em>.
@@ -8912,43 +8194,43 @@ public class PApplet implements PConstants {
   * @see PApplet#splice(boolean[], boolean, int)
   * @see PApplet#arrayCopy(Object, int, Object, int, int)
   */
-  static public boolean[] concat(boolean a[], boolean b[]) {
-    boolean c[] = new boolean[a.length + b.length];
+  static public boolean[] concat(boolean[] a, boolean[] b) {
+    boolean[] c = new boolean[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
   }
 
-  static public byte[] concat(byte a[], byte b[]) {
-    byte c[] = new byte[a.length + b.length];
+  static public byte[] concat(byte[] a, byte[] b) {
+    byte[] c = new byte[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
   }
 
-  static public char[] concat(char a[], char b[]) {
-    char c[] = new char[a.length + b.length];
+  static public char[] concat(char[] a, char[] b) {
+    char[] c = new char[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
   }
 
-  static public int[] concat(int a[], int b[]) {
-    int c[] = new int[a.length + b.length];
+  static public int[] concat(int[] a, int[] b) {
+    int[] c = new int[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
   }
 
-  static public float[] concat(float a[], float b[]) {
-    float c[] = new float[a.length + b.length];
+  static public float[] concat(float[] a, float[] b) {
+    float[] c = new float[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
   }
 
-  static public String[] concat(String a[], String b[]) {
-    String c[] = new String[a.length + b.length];
+  static public String[] concat(String[] a, String[] b) {
+    String[] c = new String[a.length + b.length];
     System.arraycopy(a, 0, c, 0, a.length);
     System.arraycopy(b, 0, c, a.length, b.length);
     return c;
@@ -8977,8 +8259,8 @@ public class PApplet implements PConstants {
   * @param list booleans[], bytes[], chars[], ints[], floats[], or Strings[]
   * @see PApplet#sort(String[], int)
   */
-  static public boolean[] reverse(boolean list[]) {
-    boolean outgoing[] = new boolean[list.length];
+  static public boolean[] reverse(boolean[] list) {
+    boolean[] outgoing = new boolean[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -8986,8 +8268,8 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public byte[] reverse(byte list[]) {
-    byte outgoing[] = new byte[list.length];
+  static public byte[] reverse(byte[] list) {
+    byte[] outgoing = new byte[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -8995,8 +8277,8 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public char[] reverse(char list[]) {
-    char outgoing[] = new char[list.length];
+  static public char[] reverse(char[] list) {
+    char[] outgoing = new char[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -9004,8 +8286,8 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public int[] reverse(int list[]) {
-    int outgoing[] = new int[list.length];
+  static public int[] reverse(int[] list) {
+    int[] outgoing = new int[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -9013,8 +8295,8 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public float[] reverse(float list[]) {
-    float outgoing[] = new float[list.length];
+  static public float[] reverse(float[] list) {
+    float[] outgoing = new float[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -9022,8 +8304,8 @@ public class PApplet implements PConstants {
     return outgoing;
   }
 
-  static public String[] reverse(String list[]) {
-    String outgoing[] = new String[list.length];
+  static public String[] reverse(String[] list) {
+    String[] outgoing = new String[list.length];
     int length1 = list.length - 1;
     for (int i = 0; i < list.length; i++) {
       outgoing[i] = list[length1 - i];
@@ -9129,7 +8411,7 @@ public class PApplet implements PConstants {
    * The splitTokens() function splits a String at one or many character
    * "tokens." The <b>tokens</b> parameter specifies the character or
    * characters to be used as a boundary.
-   * <br/> <br/>
+   *
    * If no <b>tokens</b> character is specified, any whitespace character is
    * used to split. Whitespace characters include tab (\\t), line feed (\\n),
    * carriage return (\\r), form feed (\\f), and space. To convert a String
@@ -9146,7 +8428,7 @@ public class PApplet implements PConstants {
    */
   static public String[] splitTokens(String value, String delim) {
     StringTokenizer toker = new StringTokenizer(value, delim);
-    String pieces[] = new String[toker.countTokens()];
+    String[] pieces = new String[toker.countTokens()];
 
     int index = 0;
     while (toker.hasMoreTokens()) {
@@ -9163,15 +8445,15 @@ public class PApplet implements PConstants {
    * string as the divider. The <b>delim</b> parameter specifies the
    * character or characters that mark the boundaries between each piece. A
    * String[] array is returned that contains each of the pieces.
-   * <br/> <br/>
+   *
    * If the result is a set of numbers, you can convert the String[] array to
    * to a float[] or int[] array using the datatype conversion functions
    * <b>int()</b> and <b>float()</b> (see example above).
-   * <br/> <br/>
+   *
    * The <b>splitTokens()</b> function works in a similar fashion, except
    * that it splits using a range of characters instead of a specific
    * character or sequence.
-   * <!-- /><br />
+   * <!-- />
    * This function uses regular expressions to determine how the <b>delim</b>
    * parameter divides the <b>str</b> parameter. Therefore, if you use
    * characters such parentheses and brackets that are used with regular
@@ -9196,10 +8478,10 @@ public class PApplet implements PConstants {
     if (value == null) return null;
     //return split(what, String.valueOf(delim));  // huh
 
-    char chars[] = value.toCharArray();
+    char[] chars = value.toCharArray();
     int splitCount = 0; //1;
-    for (int i = 0; i < chars.length; i++) {
-      if (chars[i] == delim) splitCount++;
+    for (char ch : chars) {
+      if (ch == delim) splitCount++;
     }
     // make sure that there is something in the input string
     //if (chars.length > 0) {
@@ -9208,12 +8490,12 @@ public class PApplet implements PConstants {
       // on second thought, i don't agree with this, will disable
     //}
     if (splitCount == 0) {
-      String splits[] = new String[1];
+      String[] splits = new String[1];
       splits[0] = value;
       return splits;
     }
     //int pieceCount = splitCount + 1;
-    String splits[] = new String[splitCount + 1];
+    String[] splits = new String[splitCount + 1];
     int splitIndex = 0;
     int startIndex = 0;
     for (int i = 0; i < chars.length; i++) {
@@ -9251,7 +8533,7 @@ public class PApplet implements PConstants {
   static Pattern matchPattern(String regexp) {
     Pattern p = null;
     if (matchPatterns == null) {
-      matchPatterns = new LinkedHashMap<String, Pattern>(16, 0.75f, true) {
+      matchPatterns = new LinkedHashMap<>(16, 0.75f, true) {
         @Override
         protected boolean removeEldestEntry(Map.Entry<String, Pattern> eldest) {
           // Limit the number of match patterns at 10 most recently used
@@ -9276,8 +8558,8 @@ public class PApplet implements PConstants {
    * text, and return matching groups (elements found inside parentheses) as
    * a String array. No match will return null. If no groups are specified in
    * the regexp, but the sequence matches, an array of length one (with the
-   * matched text as the first element of the array) will be returned.<br />
-   * <br />
+   * matched text as the first element of the array) will be returned.
+   *
    * To use the function, first check to see if the result is null. If the
    * result is null, then the sequence did not match. If the sequence did
    * match, an array is returned.
@@ -9285,8 +8567,8 @@ public class PApplet implements PConstants {
    * then the contents of each will be returned in the array.
    * Element [0] of a regexp match returns the entire matching string, and
    * the match groups start at element [1] (the first group is [1], the
-   * second [2], and so on).<br />
-   * <br />
+   * second [2], and so on).
+   *
    * The syntax can be found in the reference for Java's <a
    * href="http://download.oracle.com/javase/6/docs/api/">Pattern</a> class.
    * For regular expression syntax, read the <a
@@ -9326,8 +8608,8 @@ public class PApplet implements PConstants {
    * as a two-dimensional String array. No matches will return null. If no
    * groups are specified in the regexp, but the sequence matches, a two
    * dimensional array is still returned, but the second dimension is only of
-   * length one.<br />
-   * <br />
+   * length one.
+   *
    * To use the function, first check to see if the result is null. If the
    * result is null, then the sequence did not match at all. If the sequence
    * did match, a 2D array is returned. If there are groups (specified by
@@ -9336,8 +8618,8 @@ public class PApplet implements PConstants {
    * Assuming, a loop with counter variable i, element [i][0] of a regexp
    * match returns the entire matching string, and the match groups start at
    * element [i][1] (the first group is [i][1], the second [i][2], and so
-   * on).<br />
-   * <br />
+   * on).
+   *
    * The syntax can be found in the reference for Java's <a
    * href="http://download.oracle.com/javase/6/docs/api/">Pattern</a> class.
    * For regular expression syntax, read the <a
@@ -9454,8 +8736,8 @@ public class PApplet implements PConstants {
    * to zero will return false, and any other value will return true.
    * @return array of boolean elements
    */
-  static final public boolean[] parseBoolean(int what[]) {
-    boolean outgoing[] = new boolean[what.length];
+  static final public boolean[] parseBoolean(int[] what) {
+    boolean[] outgoing = new boolean[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (what[i] != 0);
     }
@@ -9473,8 +8755,8 @@ public class PApplet implements PConstants {
   }
   */
 
-  static final public boolean[] parseBoolean(String what[]) {
-    boolean outgoing[] = new boolean[what.length];
+  static final public boolean[] parseBoolean(String[] what) {
+    boolean[] outgoing = new boolean[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = Boolean.parseBoolean(what[i]);
     }
@@ -9508,32 +8790,32 @@ public class PApplet implements PConstants {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-  static final public byte[] parseByte(boolean what[]) {
-    byte outgoing[] = new byte[what.length];
+  static final public byte[] parseByte(boolean[] what) {
+    byte[] outgoing = new byte[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = what[i] ? (byte)1 : 0;
     }
     return outgoing;
   }
 
-  static final public byte[] parseByte(char what[]) {
-    byte outgoing[] = new byte[what.length];
+  static final public byte[] parseByte(char[] what) {
+    byte[] outgoing = new byte[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (byte) what[i];
     }
     return outgoing;
   }
 
-  static final public byte[] parseByte(int what[]) {
-    byte outgoing[] = new byte[what.length];
+  static final public byte[] parseByte(int[] what) {
+    byte[] outgoing = new byte[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (byte) what[i];
     }
     return outgoing;
   }
 
-  static final public byte[] parseByte(float what[]) {
-    byte outgoing[] = new byte[what.length];
+  static final public byte[] parseByte(float[] what) {
+    byte[] outgoing = new byte[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (byte) what[i];
     }
@@ -9588,8 +8870,8 @@ public class PApplet implements PConstants {
   }
   */
 
-  static final public char[] parseChar(byte what[]) {
-    char outgoing[] = new char[what.length];
+  static final public char[] parseChar(byte[] what) {
+    char[] outgoing = new char[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (char) (what[i] & 0xff);
     }
@@ -9605,8 +8887,8 @@ public class PApplet implements PConstants {
   }
 
   /*
-  static final public char[] parseChar(float what[]) {  // nonsensical
-    char outgoing[] = new char[what.length];
+  static final public char[] parseChar(int[] what) {
+    char[] outgoing = new char[what.length];
     for (int i = 0; i < what.length; i++) {
       outgoing[i] = (char) what[i];
     }
@@ -9676,32 +8958,32 @@ public class PApplet implements PConstants {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-  static final public int[] parseInt(boolean what[]) {
-    int list[] = new int[what.length];
+  static final public int[] parseInt(boolean[] what) {
+    int[] list = new int[what.length];
     for (int i = 0; i < what.length; i++) {
       list[i] = what[i] ? 1 : 0;
     }
     return list;
   }
 
-  static final public int[] parseInt(byte what[]) {  // note this unsigns
-    int list[] = new int[what.length];
+  static final public int[] parseInt(byte[] what) {  // note this unsigns
+    int[] list = new int[what.length];
     for (int i = 0; i < what.length; i++) {
       list[i] = (what[i] & 0xff);
     }
     return list;
   }
 
-  static final public int[] parseInt(char what[]) {
-    int list[] = new int[what.length];
+  static final public int[] parseInt(char[] what) {
+    int[] list = new int[what.length];
     for (int i = 0; i < what.length; i++) {
       list[i] = what[i];
     }
     return list;
   }
 
-  static public int[] parseInt(float what[]) {
-    int inties[] = new int[what.length];
+  static public int[] parseInt(float[] what) {
+    int[] inties = new int[what.length];
     for (int i = 0; i < what.length; i++) {
       inties[i] = (int)what[i];
     }
@@ -9717,7 +8999,7 @@ public class PApplet implements PConstants {
    *
    * numbers will contain { 1, 300, 44 }
    */
-  static public int[] parseInt(String what[]) {
+  static public int[] parseInt(String[] what) {
     return parseInt(what, 0);
   }
 
@@ -9731,8 +9013,8 @@ public class PApplet implements PConstants {
    *
    * numbers will contain { 1, 300, 9999, 44 }
    */
-  static public int[] parseInt(String what[], int missing) {
-    int output[] = new int[what.length];
+  static public int[] parseInt(String[] what, int missing) {
+    int[] output = new int[what.length];
     for (int i = 0; i < what.length; i++) {
       try {
         output[i] = Integer.parseInt(what[i]);
@@ -9773,46 +9055,28 @@ public class PApplet implements PConstants {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-  /*
-  static final public float[] parseFloat(boolean what[]) {
-    float floaties[] = new float[what.length];
-    for (int i = 0; i < what.length; i++) {
-      floaties[i] = what[i] ? 1 : 0;
-    }
-    return floaties;
-  }
-
-  static final public float[] parseFloat(char what[]) {
-    float floaties[] = new float[what.length];
-    for (int i = 0; i < what.length; i++) {
-      floaties[i] = (char) what[i];
-    }
-    return floaties;
-  }
-  */
-
-  static final public float[] parseFloat(byte what[]) {
-    float floaties[] = new float[what.length];
+  static final public float[] parseFloat(byte[] what) {
+    float[] floaties = new float[what.length];
     for (int i = 0; i < what.length; i++) {
       floaties[i] = what[i];
     }
     return floaties;
   }
 
-  static final public float[] parseFloat(int what[]) {
-    float floaties[] = new float[what.length];
+  static final public float[] parseFloat(int[] what) {
+    float[] floaties = new float[what.length];
     for (int i = 0; i < what.length; i++) {
       floaties[i] = what[i];
     }
     return floaties;
   }
 
-  static final public float[] parseFloat(String what[]) {
+  static final public float[] parseFloat(String[] what) {
     return parseFloat(what, Float.NaN);
   }
 
-  static final public float[] parseFloat(String what[], float missing) {
-    float output[] = new float[what.length];
+  static final public float[] parseFloat(String[] what, float missing) {
+    float[] output = new float[what.length];
     for (int i = 0; i < what.length; i++) {
       try {
         output[i] = Float.parseFloat(what[i]);
@@ -9847,32 +9111,32 @@ public class PApplet implements PConstants {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-  static final public String[] str(boolean x[]) {
-    String s[] = new String[x.length];
+  static final public String[] str(boolean[] x) {
+    String[] s = new String[x.length];
     for (int i = 0; i < x.length; i++) s[i] = String.valueOf(x[i]);
     return s;
   }
 
-  static final public String[] str(byte x[]) {
-    String s[] = new String[x.length];
+  static final public String[] str(byte[] x) {
+    String[] s = new String[x.length];
     for (int i = 0; i < x.length; i++) s[i] = String.valueOf(x[i]);
     return s;
   }
 
-  static final public String[] str(char x[]) {
-    String s[] = new String[x.length];
+  static final public String[] str(char[] x) {
+    String[] s = new String[x.length];
     for (int i = 0; i < x.length; i++) s[i] = String.valueOf(x[i]);
     return s;
   }
 
-  static final public String[] str(int x[]) {
-    String s[] = new String[x.length];
+  static final public String[] str(int[] x) {
+    String[] s = new String[x.length];
     for (int i = 0; i < x.length; i++) s[i] = String.valueOf(x[i]);
     return s;
   }
 
-  static final public String[] str(float x[]) {
-    String s[] = new String[x.length];
+  static final public String[] str(float[] x) {
+    String[] s = new String[x.length];
     for (int i = 0; i < x.length; i++) s[i] = String.valueOf(x[i]);
     return s;
   }
@@ -9912,7 +9176,7 @@ public class PApplet implements PConstants {
    * Utility function for formatting numbers into strings. There are two
    * versions, one for formatting floats and one for formatting ints. The
    * values for the <b>digits</b>, <b>left</b>, and <b>right</b> parameters
-   * should always be positive integers.<br /><br />As shown in the above
+   * should always be positive integers.As shown in the above
    * example, <b>nf()</b> is used to add zeros to the left and/or right of a
    * number. This is typically for aligning a list of numbers. To
    * <em>remove</em> digits from a floating-point number, use the
@@ -9929,8 +9193,8 @@ public class PApplet implements PConstants {
    * @see <a href="https://processing.org/reference/intconvert_.html">int(float)</a>
    */
 
-  static public String[] nf(int nums[], int digits) {
-    String formatted[] = new String[nums.length];
+  static public String[] nf(int[] nums, int digits) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nf(nums[i], digits);
     }
@@ -9962,7 +9226,7 @@ public class PApplet implements PConstants {
    * appropriate commas to mark units of 1000. There are two versions, one
    * for formatting ints and one for formatting an array of ints. The value
    * for the <b>digits</b> parameter should always be a positive integer.
-   * <br/><br/>
+   *
    * For a non-US locale, this will insert periods instead of commas, or
    * whatever is apprioriate for that region.
    *
@@ -9973,8 +9237,8 @@ public class PApplet implements PConstants {
    * @see PApplet#nfp(float, int, int)
    * @see PApplet#nfs(float, int, int)
    */
-  static public String[] nfc(int nums[]) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfc(int[] nums) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfc(nums[i]);
     }
@@ -10033,8 +9297,8 @@ public class PApplet implements PConstants {
   /**
    * @param nums the numbers to format
    */
-  static public String[] nfs(int nums[], int digits) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfs(int[] nums, int digits) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfs(nums[i], digits);
     }
@@ -10071,8 +9335,8 @@ public class PApplet implements PConstants {
   /**
    * @param nums the numbers to format
    */
-  static public String[] nfp(int nums[], int digits) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfp(int[] nums, int digits) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfp(nums[i], digits);
     }
@@ -10093,8 +9357,8 @@ public class PApplet implements PConstants {
    * @param left number of digits to the left of the decimal point
    * @param right number of digits to the right of the decimal point
    */
-  static public String[] nf(float nums[], int left, int right) {
-    String formatted[] = new String[nums.length];
+  static public String[] nf(float[] nums, int left, int right) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nf(nums[i], left, right);
     }
@@ -10126,8 +9390,8 @@ public class PApplet implements PConstants {
   /**
    * @param right number of digits to the right of the decimal point
   */
-  static public String[] nfc(float nums[], int right) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfc(float[] nums, int right) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfc(nums[i], right);
     }
@@ -10160,8 +9424,8 @@ public class PApplet implements PConstants {
   * @param left the number of digits to the left of the decimal point
   * @param right the number of digits to the right of the decimal point
   */
-  static public String[] nfs(float nums[], int left, int right) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfs(float[] nums, int left, int right) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfs(nums[i], left, right);
     }
@@ -10176,8 +9440,8 @@ public class PApplet implements PConstants {
   * @param left the number of digits to the left of the decimal point
   * @param right the number of digits to the right of the decimal point
   */
-  static public String[] nfp(float nums[], int left, int right) {
-    String formatted[] = new String[nums.length];
+  static public String[] nfp(float[] nums, int left, int right) {
+    String[] formatted = new String[nums.length];
     for (int i = 0; i < formatted.length; i++) {
       formatted[i] = nfp(nums[i], left, right);
     }
@@ -10202,7 +9466,7 @@ public class PApplet implements PConstants {
    * equivalent hexadecimal notation. For example color(0, 102, 153) will
    * convert to the String "FF006699". This function can help make your geeky
    * debugging sessions much happier.
-   * <br/> <br/>
+   *
    * Note that the maximum number of digits is 8, because an int value can
    * only represent up to 32 bits. Specifying more than eight digits will
    * simply shorten the string to eight anyway.
@@ -10303,7 +9567,7 @@ public class PApplet implements PConstants {
    * equivalent binary notation. For example color(0, 102, 153, 255) will
    * convert to the String "11111111000000000110011010011001". This function
    * can help make your geeky debugging sessions much happier.
-   * <br/> <br/>
+   *
    * Note that the maximum number of digits is 32, because an int value can
    * only represent up to 32 bits. Specifying more than 32 digits will simply
    * shorten the string to 32 anyway.
@@ -10655,36 +9919,12 @@ public class PApplet implements PConstants {
   }
 
 
-  // Moving this back off the EDT for alpha 10. Not sure if we're helping or
-  // hurting, but unless we do, errors inside settings() are never passed
+  // Moving this back off the EDT for 3.0 alpha 10. Not sure if we're helping
+  // or hurting, but unless we do, errors inside settings() are never passed
   // through to the PDE. There are other ways around that, no doubt, but I'm
   // also suspecting that these "not showing up" bugs might be EDT issues.
   static public void runSketch(final String[] args,
                                final PApplet constructedSketch) {
-//    EventQueue.invokeLater(new Runnable() {
-//      public void run() {
-//        runSketchEDT(args, constructedSketch);
-//      }
-//    });
-//  }
-//
-//
-//  /**
-//   * Moving this to the EDT for 3.0a6 because that's the proper thing to do
-//   * when messing with Swing components. But mostly we're AWT, so who knows.
-//   */
-//  static protected void runSketchEDT(final String[] args,
-//                                     final PApplet constructedSketch) {
-    // Supposed to help with flicker, but no effect on OS X.
-    // TODO IIRC this helped on Windows, but need to double check.
-    System.setProperty("sun.awt.noerasebackground", "true");
-
-    // Remove 60fps limit on the JavaFX "pulse" timer
-    System.setProperty("javafx.animation.fullspeed", "true");
-
-    // Doesn't seem to do anything helpful here (that can't be done via Runner)
-    //System.setProperty("com.apple.mrj.application.apple.menu.about.name", "potato");
-
     Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
       public void uncaughtException(Thread t, Throwable e) {
         e.printStackTrace();
@@ -10713,16 +9953,6 @@ public class PApplet implements PConstants {
     }
     */
 
-    // Catch any HeadlessException to provide more useful feedback
-    try {
-      // Call validate() while resize events are in progress
-      Toolkit.getDefaultToolkit().setDynamicLayout(true);
-    } catch (HeadlessException e) {
-      System.err.println("Cannot run sketch without a display. Read this for possible solutions:");
-      System.err.println("https://github.com/processing/processing/wiki/Running-without-a-Display");
-      System.exit(1);
-    }
-
     // So that the system proxy setting are used by default
     System.setProperty("java.net.useSystemProxies", "true");
 
@@ -10769,6 +9999,9 @@ public class PApplet implements PConstants {
             displayNum = -1;  // use the default
           }
 
+        } else if (param.equals(ARGS_DISABLE_AWT)) {
+          disableAWT = true;
+
         } else if (param.equals(ARGS_WINDOW_COLOR)) {
           if (value.charAt(0) == '#' && value.length() == 7) {
             value = value.substring(1);
@@ -10822,16 +10055,9 @@ public class PApplet implements PConstants {
       argIndex++;
     }
 
-//    // Now that sketch path is passed in args after the sketch name
-//    // it's not set in the above loop(the above loop breaks after
-//    // finding sketch name). So setting sketch path here.
-//    // https://github.com/processing/processing/commit/0a14835e6f5f4766b022e73a8fe562318636727c
-//    // TODO this is a hack added for PDE X and needs to be removed [fry 141104]
-//    for (int i = 0; i < args.length; i++) {
-//      if (args[i].startsWith(ARGS_SKETCH_FOLDER)){
-//        folder = args[i].substring(args[i].indexOf('=') + 1);
-//      }
-//    }
+    if (!disableAWT) {
+      ShimAWT.initRun();
+    }
 
     final PApplet sketch;
     if (constructedSketch != null) {
@@ -10844,25 +10070,12 @@ public class PApplet implements PConstants {
       } catch (RuntimeException re) {
         // Don't re-package runtime exceptions
         throw re;
-      } catch (Exception e) {
+      } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
         // Package non-runtime exceptions so we can throw them freely
         throw new RuntimeException(e);
       }
     }
 
-    if (platform == MACOSX) {
-      try {
-        final String td = "processing.core.ThinkDifferent";
-        Class<?> thinkDifferent =
-          Thread.currentThread().getContextClassLoader().loadClass(td);
-        Method method =
-          thinkDifferent.getMethod("init", new Class[] { PApplet.class });
-        method.invoke(null, new Object[] { sketch });
-      } catch (Exception e) {
-        e.printStackTrace();  // That's unfortunate
-      }
-    }
-
     // Set the suggested display that's coming from the command line
     // (and most likely, from the PDE's preference setting).
     sketch.display = displayNum;
@@ -10890,25 +10103,7 @@ public class PApplet implements PConstants {
     }
 
     // Call the settings() method which will give us our size() call
-//    try {
     sketch.handleSettings();
-//    } catch (Throwable t) {
-//      System.err.println("I think I'm gonna hurl");
-//    }
-
-////    sketch.spanDisplays = spanDisplays;
-//    // If spanning screens, that means we're also full screen.
-////    fullScreen |= spanDisplays;
-//    if (spanDisplays) {
-//      displayIndex = SPAN;
-////      fullScreen = true;
-//    }
-
-//    // If the applet doesn't call for full screen, but the command line does,
-//    // enable it. Conversely, if the command line does not, don't disable it.
-//    // Query the applet to see if it wants to be full screen all the time.
-//    //fullScreen |= sketch.sketchFullScreen();
-//    sketch.fullScreen |= fullScreen;
 
     sketch.external = external;
 
@@ -10917,22 +10112,6 @@ public class PApplet implements PConstants {
     }
 
     final PSurface surface = sketch.initSurface();
-//      sketch.initSurface(windowColor, displayIndex, fullScreen, spanDisplays);
-
-    /*
-    // Wait until the applet has figured out its width. In a static mode app,
-    // everything happens inside setup(), so this will be after setup() has
-    // completed, and the empty draw() has set "finished" to true.
-    while (sketch.defaultSize && !sketch.finished) {
-      //System.out.println("default size");
-      try {
-        Thread.sleep(5);
-
-      } catch (InterruptedException e) {
-        //System.out.println("interrupt");
-      }
-    }
-    */
 
     if (present) {
       if (hideStop) {
@@ -10951,14 +10130,6 @@ public class PApplet implements PConstants {
 
     sketch.showSurface();
     sketch.startSurface();
-    /*
-    if (sketch.getGraphics().displayable()) {
-      surface.setVisible(true);
-    }
-
-    //sketch.init();
-    surface.startThread();
-    */
   }
 
 
@@ -10982,61 +10153,63 @@ public class PApplet implements PConstants {
 
     // Create fake Frame object to warn user about the changes
     if (g.displayable()) {
-      frame = new Frame() {
-        @Override
-        public void setResizable(boolean resizable) {
-          deprecationWarning("setResizable");
-          surface.setResizable(resizable);
-        }
-
-        @Override
-        public void setVisible(boolean visible) {
-          deprecationWarning("setVisible");
-          surface.setVisible(visible);
-        }
-
-        @Override
-        public void setTitle(String title) {
-          deprecationWarning("setTitle");
-          surface.setTitle(title);
-        }
-
-        @Override
-        public void setUndecorated(boolean ignored) {
-          throw new RuntimeException("'frame' has been removed from Processing 3, " +
-            "use fullScreen() to get an undecorated full screen frame");
-        }
+      /*
+      if (!disableAWT) {
+        frame = new Frame() {
+          @Override
+          public void setResizable(boolean resizable) {
+            deprecationWarning("setResizable");
+            surface.setResizable(resizable);
+          }
 
-        // Can't override this one because it's called by Window's constructor
-        /*
-        @Override
-        public void setLocation(int x, int y) {
-          deprecationWarning("setLocation");
-          surface.setLocation(x, y);
-        }
-        */
+          @Override
+          public void setVisible(boolean visible) {
+            deprecationWarning("setVisible");
+            surface.setVisible(visible);
+          }
 
-        @Override
-        public void setSize(int w, int h) {
-          deprecationWarning("setSize");
-          surface.setSize(w, h);
-        }
+          @Override
+          public void setTitle(String title) {
+            deprecationWarning("setTitle");
+            surface.setTitle(title);
+          }
 
-        private void deprecationWarning(String method) {
-          PGraphics.showWarning("Use surface." + method + "() instead of " +
-                                "frame." + method + " in Processing 3");
-          //new Exception(method).printStackTrace(System.out);
-        }
-      };
+          @Override
+          public void setUndecorated(boolean ignored) {
+            throw new RuntimeException("'frame' has been removed from Processing 3, " +
+              "use fullScreen() to get an undecorated full screen frame");
+          }
+          */
+          /*
+          // Can't override this one because it's called by Window's constructor
+          @Override
+          public void setLocation(int x, int y) {
+            deprecationWarning("setLocation");
+            surface.setLocation(x, y);
+          }
+          */
+          /*
+          @Override
+          public void setSize(int w, int h) {
+            deprecationWarning("setSize");
+            surface.setSize(w, h);
+          }
 
-      surface.initFrame(this); //, backgroundColor, displayNum, fullScreen, spanDisplays);
-      surface.setTitle("Picrate 1.2 Sketch");
+          private void deprecationWarning(String method) {
+            PGraphics.showWarning("Use surface." + method + "() instead of " +
+                                  "frame." + method + " in Processing 3");
+            //new Exception(method).printStackTrace(System.out);
+          }
+        };
+      }
+      */
+      surface.initFrame(this);
+      surface.setTitle("Picrate 2.0 Sketch");
 
     } else {
       surface.initOffscreen(this);  // for PDF/PSurfaceNone and friends
     }
 
-//    init();
     return surface;
   }
 
@@ -11068,16 +10241,6 @@ public class PApplet implements PConstants {
 //  }
 
 
-  /** Convenience method, should only be called by PSurface subclasses. */
-  static public void hideMenuBar() {
-    if (PApplet.platform == PConstants.MACOSX) {
-      // Call some native code to remove the menu bar on OS X. Not necessary
-      // on Linux and Windows, who are happy to make full screen windows.
-      japplemenubar.JAppleMenuBar.hide();
-    }
-  }
-
-
   /**
    * Convenience method for Python Mode to run an already-constructed sketch.
    * This makes it makes it easy to launch a sketch in Jython:
@@ -11098,7 +10261,7 @@ public class PApplet implements PConstants {
   }
 
 
-  /** Convenience method for PiCrate */
+  /** Run the PiCrate sketch */
   public void runPicrate() {
     runSketch(new String[0]);
   }
@@ -11115,7 +10278,7 @@ public class PApplet implements PConstants {
    * requires two parameters, the first is the renderer and the second is the
    * file name. This function is always used with <b>endRecord()</b> to stop
    * the recording process and close the file.
-   * <br /> <br />
+   *
    * Note that beginRecord() will only pick up any settings that happen after
    * it has been called. For instance, if you call textFont() before
    * beginRecord(), then that font will not be set for the file that you're
@@ -11176,21 +10339,21 @@ public class PApplet implements PConstants {
    * hundreds of triangles, rather than a single object. Or that a
    * multi-segment line shape (such as a curve) will be rendered as
    * individual segments.
-   * <br /><br />
+   *
    * When using <b>beginRaw()</b> and <b>endRaw()</b>, it's possible to write
    * to either a 2D or 3D renderer. For instance, <b>beginRaw()</b> with the
    * PDF library will write the geometry as flattened triangles and lines,
    * even if recording from the <b>P3D</b> renderer.
-   * <br /><br />
+   *
    * If you want a background to show up in your files, use <b>rect(0, 0,
    * width, height)</b> after setting the <b>fill()</b> to the background
    * color. Otherwise the background will not be rendered to the file because
    * the background is not shape.
-   * <br /><br />
+   *
    * Using <b>hint(ENABLE_DEPTH_SORT)</b> can improve the appearance of 3D
    * geometry drawn to 2D file formats. See the <b>hint()</b> reference for
    * more details.
-   * <br /><br />
+   *
    * See examples in the reference for the <b>PDF</b> and <b>DXF</b>
    * libraries for more information.
    *
@@ -11261,7 +10424,7 @@ public class PApplet implements PConstants {
    * Loads the pixel data for the display window into the <b>pixels[]</b>
    * array. This function must always be called before reading from or
    * writing to <b>pixels[]</b>.
-   * <br/><br/> renderers may or may not seem to require <b>loadPixels()</b>
+   *  renderers may or may not seem to require <b>loadPixels()</b>
    * or <b>updatePixels()</b>. However, the rule is that any time you want to
    * manipulate the <b>pixels[]</b> array, you must first call
    * <b>loadPixels()</b>, and after changes have been made, call
@@ -11291,14 +10454,14 @@ public class PApplet implements PConstants {
    * Use in conjunction with <b>loadPixels()</b>. If you're only reading
    * pixels from the array, there's no need to call <b>updatePixels()</b>
    * unless there are changes.
-   * <br/><br/> renderers may or may not seem to require <b>loadPixels()</b>
+   *  renderers may or may not seem to require <b>loadPixels()</b>
    * or <b>updatePixels()</b>. However, the rule is that any time you want to
    * manipulate the <b>pixels[]</b> array, you must first call
    * <b>loadPixels()</b>, and after changes have been made, call
    * <b>updatePixels()</b>. Even if the renderer may not seem to use this
    * function in the current Processing release, this will always be subject
    * to change.
-   * <br/> <br/>
+   *
    * Currently, none of the renderers use the additional parameters to
    * <b>updatePixels()</b>, however this may be implemented in the future.
    *
@@ -11380,12 +10543,12 @@ public class PApplet implements PConstants {
    * specifies a position in 2D and the <b>vertex()</b> function with three
    * parameters specifies a position in 3D. Each shape will be outlined with
    * the current stroke color and filled with the fill color.
-   * <br/> <br/>
+   *
    * Transformations such as <b>translate()</b>, <b>rotate()</b>, and
    * <b>scale()</b> do not work within <b>beginShape()</b>. It is also not
    * possible to use other shapes, such as <b>ellipse()</b> or <b>rect()</b>
    * within <b>beginShape()</b>.
-   * <br/> <br/>
+   *
    * The P3D renderer settings allow <b>stroke()</b> and <b>fill()</b>
    * settings to be altered per-vertex, however the default P2D renderer does
    * not. Settings such as <b>strokeWeight()</b>, <b>strokeCap()</b>, and
@@ -11525,7 +10688,7 @@ public class PApplet implements PConstants {
    * Sets a texture to be applied to vertex points. The <b>texture()</b>
    * function must be called between <b>beginShape()</b> and
    * <b>endShape()</b> and before any calls to <b>vertex()</b>.
-   * <br/> <br/>
+   *
    * When textures are in use, the fill color is ignored. Instead, use tint()
    * to specify the color of the texture as it is applied to the shape.
    *
@@ -11590,11 +10753,11 @@ public class PApplet implements PConstants {
    * All shapes are constructed by connecting a series of vertices.
    * <b>vertex()</b> is used to specify the vertex coordinates for points,
    * lines, triangles, quads, and polygons and is used exclusively within the
-   * <b>beginShape()</b> and <b>endShape()</b> function.<br />
-   * <br />
+   * <b>beginShape()</b> and <b>endShape()</b> function.
+   *
    * Drawing a vertex in 3D using the <b>z</b> parameter requires the P3D
-   * parameter in combination with size as shown in the above example.<br />
-   * <br />
+   * parameter in combination with size as shown in the above example.
+   *
    * This function is also used to map a texture onto the geometry. The
    * <b>texture()</b> function declares the texture to apply to the geometry
    * and the <b>u</b> and <b>v</b> coordinates set define the mapping of this
@@ -12577,17 +11740,17 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from curvePoint.xml )
    *
    * Evalutes the curve at point t for points a, b, c, d. The parameter t
-   * varies between 0 and 1, a and d are points on the curve, and b and c are
-   * the control points. This can be done once with the x coordinates and a
+   * varies between 0 and 1, a and d are the control points, and b and c are
+   * the points on the curve. This can be done once with the x coordinates and a
    * second time with the y coordinates to get the location of a curve at t.
    *
    * ( end auto-generated )
    *
    * @webref shape:curves
-   * @param a coordinate of first point on the curve
-   * @param b coordinate of second point on the curve
-   * @param c coordinate of third point on the curve
-   * @param d coordinate of fourth point on the curve
+   * @param a coordinate of first control point
+   * @param b coordinate of first point on the curve
+   * @param c coordinate of second point on the curve
+   * @param d coordinate of second control point
    * @param t value between 0 and 1
    * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
    * @see PGraphics#curveVertex(float, float)
@@ -12748,8 +11911,8 @@ public class PApplet implements PConstants {
    * <b>image()</b> to set the location of one corner of the image and uses
    * the fourth and fifth parameters to set the opposite corner. Use
    * <b>imageMode(CENTER)</b> to draw images centered at the given x and y
-   * position.<br />
-   * <br />
+   * position.
+   *
    * The parameter to <b>imageMode()</b> must be written in ALL CAPS because
    * Processing is a case-sensitive language.
    *
@@ -12778,13 +11941,13 @@ public class PApplet implements PConstants {
    * <b>x</b> and <b>y</b> parameters define the location of the image from
    * its upper-left corner. The image is displayed at its original size
    * unless the <b>width</b> and <b>height</b> parameters specify a different
-   * size.<br />
-   * <br />
+   * size.
+   *
    * The <b>imageMode()</b> function changes the way the parameters work. For
    * example, a call to <b>imageMode(CORNERS)</b> will change the
    * <b>width</b> and <b>height</b> parameters to define the x and y values
-   * of the opposite corner of the image.<br />
-   * <br />
+   * of the opposite corner of the image.
+   *
    * The color of an image may be modified with the <b>tint()</b> function.
    * This function will maintain transparency for GIF and PNG images.
    *
@@ -12885,7 +12048,7 @@ public class PApplet implements PConstants {
    * to <b>shapeMode(CORNERS)</b>, for example, will change the width and
    * height parameters to define the x and y values of the opposite corner of
    * the shape.
-   * <br /><br />
+   *
    * Note complex shapes may draw awkwardly with P3D. This renderer does not
    * yet support shapes that have holes or complicated breaks.
    *
@@ -12932,7 +12095,7 @@ public class PApplet implements PConstants {
    * CENTER, and RIGHT set the display characteristics of the letters in
    * relation to the values for the <b>x</b> and <b>y</b> parameters of the
    * <b>text()</b> function.
-   * <br/> <br/>
+   *
    * In Processing 0125 and later, an optional second parameter can be used
    * to vertically align the text. BASELINE is the default, and the vertical
    * alignment will be reset to BASELINE if the second parameter is not used.
@@ -12940,12 +12103,12 @@ public class PApplet implements PConstants {
    * offsets the line based on the current <b>textDescent()</b>. For multiple
    * lines, the final line will be aligned to the bottom, with the previous
    * lines appearing above it.
-   * <br/> <br/>
+   *
    * When using <b>text()</b> with width and height parameters, BASELINE is
    * ignored, and treated as TOP. (Otherwise, text would by default draw
    * outside the box, since BASELINE is the default setting. BASELINE is not
    * a useful drawing mode for text drawn in a rectangle.)
-   * <br/> <br/>
+   *
    * The vertical alignment is based on the value of <b>textAscent()</b>,
    * which many fonts do not specify correctly. It may be necessary to use a
    * hack and offset by a few pixels by hand so that the offset looks
@@ -13016,10 +12179,10 @@ public class PApplet implements PConstants {
    * <b>text()</b> function. If no <b>size</b> parameter is input, the font
    * will appear at its original size (the size it was created at with the
    * "Create Font..." tool) until it is changed with <b>textSize()</b>. <br
-   * /> <br /> Because fonts are usually bitmaped, you should create fonts at
+   * />  Because fonts are usually bitmaped, you should create fonts at
    * the sizes that will be used most commonly. Using <b>textFont()</b>
    * without the size parameter will result in the cleanest-looking text. <br
-   * /><br /> With the default (JAVA2D) and PDF renderers, it's also possible
+   * /> With the default (JAVA2D) and PDF renderers, it's also possible
    * to enable the use of native fonts via the command
    * <b>hint(ENABLE_NATIVE_FONTS)</b>. This will produce vector text in
    * JAVA2D sketches and PDF output in cases where the vector data is
@@ -13078,16 +12241,16 @@ public class PApplet implements PConstants {
    *
    * Sets the way text draws to the screen. In the default configuration, the
    * <b>MODEL</b> mode, it's possible to rotate, scale, and place letters in
-   * two and three dimensional space.<br />
-   * <br />
+   * two and three dimensional space.
+   *
    * The <b>SHAPE</b> mode draws text using the the glyph outlines of
    * individual characters rather than as textures. This mode is only
    * supported with the <b>PDF</b> and <b>P3D</b> renderer settings. With the
    * <b>PDF</b> renderer, you must call <b>textMode(SHAPE)</b> before any
    * other drawing occurs. If the outlines are not available, then
    * <b>textMode(SHAPE)</b> will be ignored and <b>textMode(MODEL)</b> will
-   * be used instead.<br />
-   * <br />
+   * be used instead.
+   *
    * The <b>textMode(SHAPE)</b> option in <b>P3D</b> can be combined with
    * <b>beginRaw()</b> to write vector-accurate text to 2D and 3D output
    * files, for instance <b>DXF</b> or <b>PDF</b>. The <b>SHAPE</b> mode is
@@ -13179,7 +12342,7 @@ public class PApplet implements PConstants {
    * with the <b>fill()</b> function. The text displays in relation to the
    * <b>textAlign()</b> function, which gives the option to draw to the left,
    * right, and center of the coordinates.
-   * <br /><br />
+   *
    * The <b>x2</b> and <b>y2</b> parameters define a rectangular area to
    * display within and may only be used with string data. For text drawn
    * inside a rectangle, the coordinates are interpreted based on the current
@@ -13267,11 +12430,11 @@ public class PApplet implements PConstants {
    * Draw text in a box that is constrained to a particular size.
    * The current rectMode() determines what the coordinates mean
    * (whether x1/y1/x2/y2 or x/y/w/h).
-   * <P/>
+   *
    * Note that the x,y coords of the start of the box
    * will align with the *ascent* of the text, not the baseline,
    * as is the case for the other text() functions.
-   * <P/>
+   *
    * Newlines that are \n (Unix newline or linefeed char, ascii 10)
    * are honored, and \r (carriage return, Windows and Mac OS) are
    * ignored.
@@ -13329,8 +12492,8 @@ public class PApplet implements PConstants {
    * They allow you to change the style and transformation settings
    * and later return to what you had. When a new state is started
    * with push(), it builds on the current style and transform
-   * information.<br />
-   * <br />
+   * information.
+   *
    * <b>push()</b> stores information related to the current
    * transformation state and style settings controlled by the
    * following functions: <b>rotate()</b>, <b>translate()</b>,
@@ -13338,8 +12501,8 @@ public class PApplet implements PConstants {
    * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>,
    * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>,
    * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>,
-   * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.<br />
-   * <br />
+   * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.
+   *
    * The <b>push()</b> and <b>pop()</b> functions were added with
    * Processing 3.5. They can be used in place of <b>pushMatrix()</b>,
    * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>.
@@ -13366,9 +12529,9 @@ public class PApplet implements PConstants {
    * Note that these functions are always used together. They allow
    * you to change the style and transformation settings and later
    * return to what you had. When a new state is started with push(),
-   * it builds on the current style and transform information.<br />
-   * <br />
-   * <br />
+   * it builds on the current style and transform information.
+   *
+   *
    * <b>push()</b> stores information related to the current
    * transformation state and style settings controlled by the
    * following functions: <b>rotate()</b>, <b>translate()</b>,
@@ -13376,8 +12539,8 @@ public class PApplet implements PConstants {
    * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>,
    * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>,
    * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>,
-   * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.<br />
-   * <br />
+   * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.
+   *
    * The <b>push()</b> and <b>pop()</b> functions were added with
    * Processing 3.5. They can be used in place of <b>pushMatrix()</b>,
    * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>.
@@ -13497,7 +12660,7 @@ public class PApplet implements PConstants {
    * Rotates a shape the amount specified by the <b>angle</b> parameter.
    * Angles should be specified in radians (values from 0 to TWO_PI) or
    * converted to radians with the <b>radians()</b> function.
-   * <br/> <br/>
+   *
    * Objects are always rotated around their relative position to the origin
    * and positive numbers rotate objects in a clockwise direction.
    * Transformations apply to everything that happens after and subsequent
@@ -13505,7 +12668,7 @@ public class PApplet implements PConstants {
    * <b>rotate(HALF_PI)</b> and then <b>rotate(HALF_PI)</b> is the same as
    * <b>rotate(PI)</b>. All tranformations are reset when <b>draw()</b>
    * begins again.
-   * <br/> <br/>
+   *
    * Technically, <b>rotate()</b> multiplies the current transformation
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b>.
@@ -13716,7 +12879,7 @@ public class PApplet implements PConstants {
    * <b>shearX(PI/2)</b> and then <b>shearX(PI/2)</b> is the same as
    * <b>shearX(PI)</b>. If <b>shearX()</b> is called within the
    * <b>draw()</b>, the transformation is reset when the loop begins again.
-   * <br/> <br/>
+   *
    * Technically, <b>shearX()</b> multiplies the current transformation
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b> functions.
@@ -13751,7 +12914,7 @@ public class PApplet implements PConstants {
    * <b>shearY(PI/2)</b> and then <b>shearY(PI/2)</b> is the same as
    * <b>shearY(PI)</b>. If <b>shearY()</b> is called within the
    * <b>draw()</b>, the transformation is reset when the loop begins again.
-   * <br/> <br/>
+   *
    * Technically, <b>shearY()</b> multiplies the current transformation
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b> functions.
@@ -13940,14 +13103,14 @@ public class PApplet implements PConstants {
    * The <b>beginCamera()</b> and <b>endCamera()</b> functions enable
    * advanced customization of the camera space. The functions are useful if
    * you want to more control over camera movement, however for most users,
-   * the <b>camera()</b> function will be sufficient.<br /><br />The camera
+   * the <b>camera()</b> function will be sufficient.The camera
    * functions will replace any transformations (such as <b>rotate()</b> or
    * <b>translate()</b>) that occur before them in <b>draw()</b>, but they
    * will not automatically replace the camera transform itself. For this
    * reason, camera functions should be placed at the beginning of
    * <b>draw()</b> (so that transformations happen afterwards), and the
    * <b>camera()</b> function can be used after <b>beginCamera()</b> if you
-   * want to reset the camera before applying transformations.<br /><br
+   * want to reset the camera before applying transformations.<br
    * />This function sets the matrix mode to the camera matrix so calls such
    * as <b>translate()</b>, <b>rotate()</b>, applyMatrix() and resetMatrix()
    * affect the camera. <b>beginCamera()</b> should always be used with a
@@ -14261,7 +13424,7 @@ public class PApplet implements PConstants {
    * transformations (scale, rotate, translate, etc.) The X value can be used
    * to place an object in space relative to the location of the original
    * point once the transformations are no longer in use.
-   * <br/> <br/>
+   *
    * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
@@ -14290,8 +13453,8 @@ public class PApplet implements PConstants {
    * returns the Y value for a given coordinate based on the current set of
    * transformations (scale, rotate, translate, etc.) The Y value can be used
    * to place an object in space relative to the location of the original
-   * point once the transformations are no longer in use.<br />
-   * <br />
+   * point once the transformations are no longer in use.
+   *
    * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
@@ -14320,8 +13483,8 @@ public class PApplet implements PConstants {
    * returns the Z value for a given coordinate based on the current set of
    * transformations (scale, rotate, translate, etc.) The Z value can be used
    * to place an object in space relative to the location of the original
-   * point once the transformations are no longer in use.<br />
-   * <br />
+   * point once the transformations are no longer in use.
+   *
    * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
@@ -14353,7 +13516,7 @@ public class PApplet implements PConstants {
    * <b>pushStyle()</b>, it builds on the current style information. The
    * <b>pushStyle()</b> and <b>popStyle()</b> functions can be embedded to
    * provide more control (see the second example above for a demonstration.)
-   * <br /><br />
+   *
    * The style information controlled by the following functions are included
    * in the style:
    * fill(), stroke(), tint(), strokeWeight(), strokeCap(), strokeJoin(),
@@ -14405,7 +13568,7 @@ public class PApplet implements PConstants {
    *
    * Sets the width of the stroke used for lines, points, and the border
    * around shapes. All widths are set in units of pixels.
-   * <br/> <br/>
+   *
    * When drawing with P3D, series of connected lines (such as the stroke
    * around a polygon, triangle, or ellipse) produce unattractive results
    * when a thick stroke weight is set (<a
@@ -14436,7 +13599,7 @@ public class PApplet implements PConstants {
    * are either mitered, beveled, or rounded and specified with the
    * corresponding parameters MITER, BEVEL, and ROUND. The default joint is
    * MITER.
-   * <br/> <br/>
+   *
    * This function is not available with the P3D renderer, (<a
    * href="http://code.google.com/p/processing/issues/detail?id=123">see
    * Issue 123</a>). More information about the renderers can be found in the
@@ -14462,7 +13625,7 @@ public class PApplet implements PConstants {
    * Sets the style for rendering line endings. These ends are either
    * squared, extended, or rounded and specified with the corresponding
    * parameters SQUARE, PROJECT, and ROUND. The default cap is ROUND.
-   * <br/> <br/>
+   *
    * This function is not available with the P3D renderer (<a
    * href="http://code.google.com/p/processing/issues/detail?id=123">see
    * Issue 123</a>). More information about the renderers can be found in the
@@ -14509,7 +13672,7 @@ public class PApplet implements PConstants {
    * is either specified in terms of the RGB or HSB color depending on the
    * current <b>colorMode()</b> (the default color space is RGB, with each
    * value in the range from 0 to 255).
-   * <br/> <br/>
+   *
    * When using hexadecimal notation to specify a color, use "#" or "0x"
    * before the values (e.g. #CCFFAA, 0xFFCCFFAA). The # syntax uses six
    * digits to specify a color (the way colors are specified in HTML and
@@ -14517,7 +13680,7 @@ public class PApplet implements PConstants {
    * hexadecimal value must be specified with eight characters; the first two
    * characters define the alpha component and the remainder the red, green,
    * and blue components.
-   * <br/> <br/>
+   *
    * The value for the parameter "gray" must be less than or equal to the
    * current maximum value as specified by <b>colorMode()</b>. The default
    * maximum value is 255.
@@ -14606,25 +13769,25 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from tint.xml )
    *
    * Sets the fill value for displaying images. Images can be tinted to
-   * specified colors or made transparent by setting the alpha.<br />
-   * <br />
+   * specified colors or made transparent by setting the alpha.
+   *
    * To make an image transparent, but not change it's color, use white as
    * the tint color and specify an alpha value. For instance, tint(255, 128)
    * will make an image 50% transparent (unless <b>colorMode()</b> has been
-   * used).<br />
-   * <br />
+   * used).
+   *
    * When using hexadecimal notation to specify a color, use "#" or "0x"
    * before the values (e.g. #CCFFAA, 0xFFCCFFAA). The # syntax uses six
    * digits to specify a color (the way colors are specified in HTML and
    * CSS). When using the hexadecimal notation starting with "0x", the
    * hexadecimal value must be specified with eight characters; the first two
    * characters define the alpha component and the remainder the red, green,
-   * and blue components.<br />
-   * <br />
+   * and blue components.
+   *
    * The value for the parameter "gray" must be less than or equal to the
    * current maximum value as specified by <b>colorMode()</b>. The default
-   * maximum value is 255.<br />
-   * <br />
+   * maximum value is 255.
+   *
    * The <b>tint()</b> function is also used to control the coloring of
    * textures in 3D.
    *
@@ -14711,7 +13874,7 @@ public class PApplet implements PConstants {
    * color is either specified in terms of the RGB or HSB color depending on
    * the current <b>colorMode()</b> (the default color space is RGB, with
    * each value in the range from 0 to 255).
-   * <br/> <br/>
+   *
    * When using hexadecimal notation to specify a color, use "#" or "0x"
    * before the values (e.g. #CCFFAA, 0xFFCCFFAA). The # syntax uses six
    * digits to specify a color (the way colors are specified in HTML and
@@ -14719,11 +13882,11 @@ public class PApplet implements PConstants {
    * hexadecimal value must be specified with eight characters; the first two
    * characters define the alpha component and the remainder the red, green,
    * and blue components.
-   * <br/> <br/>
+   *
    * The value for the parameter "gray" must be less than or equal to the
    * current maximum value as specified by <b>colorMode()</b>. The default
    * maximum value is 255.
-   * <br/> <br/>
+   *
    * To change the color of an image (or a texture), use tint().
    *
    * ( end auto-generated )
@@ -14859,6 +14022,8 @@ public class PApplet implements PConstants {
 
 /**
  * gray number specifying value between white and black
+ *
+ * @param gray value between black and white, by default 0 to 255
  */
   public void specular(float gray) {
     if (recorder != null) recorder.specular(gray);
@@ -14924,6 +14089,8 @@ public class PApplet implements PConstants {
 
   /**
    * gray number specifying value between white and black
+   *
+   * @param gray value between black and white, by default 0 to 255
    */
   public void emissive(float gray) {
     if (recorder != null) recorder.emissive(gray);
@@ -15148,9 +14315,9 @@ public class PApplet implements PConstants {
    *
    * Sets the falloff rates for point lights, spot lights, and ambient
    * lights. The parameters are used to determine the falloff with the
-   * following equation:<br /><br />d = distance from light position to
-   * vertex position<br />falloff = 1 / (CONSTANT + d * LINEAR + (d*d) *
-   * QUADRATIC)<br /><br />Like <b>fill()</b>, it affects only the elements
+   * following equation:d = distance from light position to
+   * vertex positionfalloff = 1 / (CONSTANT + d * LINEAR + (d*d) *
+   * QUADRATIC)Like <b>fill()</b>, it affects only the elements
    * which are created after it in the code. The default value if
    * <b>LightFalloff(1.0, 0.0, 0.0)</b>. Thinking about an ambient light with
    * a falloff can be tricky. It is used, for example, if you wanted a region
@@ -15215,13 +14382,13 @@ public class PApplet implements PConstants {
    * of the Processing window. The default background is light gray. In the
    * <b>draw()</b> function, the background color is used to clear the
    * display window at the beginning of each frame.
-   * <br/> <br/>
+   *
    * An image can also be used as the background for a sketch, however its
    * width and height must be the same size as the sketch window. To resize
    * an image 'b' to the size of the sketch window, use b.resize(width, height).
-   * <br/> <br/>
+   *
    * Images used as background will ignore the current <b>tint()</b> setting.
-   * <br/> <br/>
+   *
    * It is not possible to use transparency (alpha) in background colors with
    * the main drawing surface, however they will work properly with <b>createGraphics()</b>.
    *
@@ -15304,13 +14471,13 @@ public class PApplet implements PConstants {
   /**
    * Takes an RGB or ARGB image and sets it as the background.
    * The width and height of the image must be the same size as the sketch.
-   * Use image.resize(width, height) to make short work of such a task.<br/>
-   * <br/>
+   * Use image.resize(width, height) to make short work of such a task.
+   *
    * Note that even if the image is set as RGB, the high 8 bits of each pixel
    * should be set opaque (0xFF000000) because the image data will be copied
    * directly to the screen, and non-opaque background images may have strange
-   * behavior. Use image.filter(OPAQUE) to handle this easily.<br/>
-   * <br/>
+   * behavior. Use image.filter(OPAQUE) to handle this easily.
+   *
    * When using 3D, this will also clear the zbuffer (if it exists).
    *
    * @param image PImage to set as background (must be same size as the sketch window)
@@ -15404,12 +14571,12 @@ public class PApplet implements PConstants {
    *
    * Extracts the red value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value.<br /><br />The red() function
+   * careful not to assign it to an int value.The red() function
    * is easy to use and undestand, but is slower than another technique. To
    * achieve the same results when working in <b>colorMode(RGB, 255)</b>, but
    * with greater speed, use the &gt;&gt; (right shift) operator with a bit
    * mask. For example, the following two lines of code are equivalent:<br
-   * /><pre>float r1 = red(myColor);<br />float r2 = myColor &gt;&gt; 16
+   * /><pre>float r1 = red(myColor);float r2 = myColor &gt;&gt; 16
    * &amp; 0xFF;</pre>
    *
    * ( end auto-generated )
@@ -15435,12 +14602,12 @@ public class PApplet implements PConstants {
    *
    * Extracts the green value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value.<br /><br />The <b>green()</b>
+   * careful not to assign it to an int value.The <b>green()</b>
    * function is easy to use and undestand, but is slower than another
    * technique. To achieve the same results when working in <b>colorMode(RGB,
    * 255)</b>, but with greater speed, use the &gt;&gt; (right shift)
    * operator with a bit mask. For example, the following two lines of code
-   * are equivalent:<br /><pre>float r1 = green(myColor);<br />float r2 =
+   * are equivalent:<pre>float r1 = green(myColor);float r2 =
    * myColor &gt;&gt; 8 &amp; 0xFF;</pre>
    *
    * ( end auto-generated )
@@ -15466,12 +14633,12 @@ public class PApplet implements PConstants {
    *
    * Extracts the blue value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value.<br /><br />The <b>blue()</b>
+   * careful not to assign it to an int value.The <b>blue()</b>
    * function is easy to use and undestand, but is slower than another
    * technique. To achieve the same results when working in <b>colorMode(RGB,
    * 255)</b>, but with greater speed, use a bit mask to remove the other
    * color components. For example, the following two lines of code are
-   * equivalent:<br /><pre>float r1 = blue(myColor);<br />float r2 = myColor
+   * equivalent:<pre>float r1 = blue(myColor);float r2 = myColor
    * &amp; 0xFF;</pre>
    *
    * ( end auto-generated )
@@ -15613,6 +14780,15 @@ public class PApplet implements PConstants {
   }
 
 
+  /**
+   * Check the alpha on an image, using a really primitive loop.
+   */
+  public void checkAlpha() {
+    if (recorder != null) recorder.checkAlpha();
+    g.checkAlpha();
+  }
+
+
   /**
    * ( begin auto-generated from PImage_get.xml )
    *
@@ -15622,14 +14798,14 @@ public class PApplet implements PConstants {
    * the display window by specifying an additional <b>width</b> and
    * <b>height</b> parameter. When getting an image, the <b>x</b> and
    * <b>y</b> parameters define the coordinates for the upper-left corner of
-   * the image, regardless of the current <b>imageMode()</b>.<br />
-   * <br />
+   * the image, regardless of the current <b>imageMode()</b>.
+   *
    * If the pixel requested is outside of the image window, black is
    * returned. The numbers returned are scaled according to the current color
    * ranges, but only RGB values are returned by this function. For example,
    * even though you may have drawn a shape with <b>colorMode(HSB)</b>, the
-   * numbers returned will be in RGB format.<br />
-   * <br />
+   * numbers returned will be in RGB format.
+   *
    * Getting the color of a single pixel with <b>get(x, y)</b> is easy, but
    * not as fast as grabbing the data directly from <b>pixels[]</b>. The
    * equivalent statement to <b>get(x, y)</b> using <b>pixels[]</b> is
@@ -15696,15 +14872,15 @@ public class PApplet implements PConstants {
    * ( begin auto-generated from PImage_set.xml )
    *
    * Changes the color of any pixel or writes an image directly into the
-   * display window.<br />
-   * <br />
+   * display window.
+   *
    * The <b>x</b> and <b>y</b> parameters specify the pixel to change and the
    * <b>color</b> parameter specifies the color value. The color parameter is
    * affected by the current color mode (the default is RGB values from 0 to
    * 255). When setting an image, the <b>x</b> and <b>y</b> parameters define
    * the coordinates for the upper-left corner of the image, regardless of
    * the current <b>imageMode()</b>.
-   * <br /><br />
+   *
    * Setting the color of a single pixel with <b>set(x, y)</b> is easy, but
    * not as fast as putting the data directly into <b>pixels[]</b>. The
    * equivalent statement to <b>set(x, y, #000000)</b> using <b>pixels[]</b>
@@ -15749,8 +14925,8 @@ public class PApplet implements PConstants {
    * Masks part of an image from displaying by loading another image and
    * using it as an alpha channel. This mask image should only contain
    * grayscale data, but only the blue color channel is used. The mask image
-   * needs to be the same size as the image to which it is applied.<br />
-   * <br />
+   * needs to be the same size as the image to which it is applied.
+   *
    * In addition to using a mask image, an integer array containing the alpha
    * channel data can be specified directly. This method is useful for
    * creating dynamically generated alpha masks. This array must be of the
@@ -15793,28 +14969,28 @@ public class PApplet implements PConstants {
   /**
    * ( begin auto-generated from PImage_filter.xml )
    *
-   * Filters an image as defined by one of the following modes:<br /><br
-   * />THRESHOLD - converts the image to black and white pixels depending if
+   * Filters an image as defined by one of the following modes:
+   * THRESHOLD - converts the image to black and white pixels depending if
    * they are above or below the threshold defined by the level parameter.
    * The level must be between 0.0 (black) and 1.0(white). If no level is
-   * specified, 0.5 is used.<br />
-   * <br />
-   * GRAY - converts any colors in the image to grayscale equivalents<br />
-   * <br />
-   * INVERT - sets each pixel to its inverse value<br />
-   * <br />
+   * specified, 0.5 is used.
+   *
+   * GRAY - converts any colors in the image to grayscale equivalents
+   *
+   * INVERT - sets each pixel to its inverse value
+   *
    * POSTERIZE - limits each channel of the image to the number of colors
-   * specified as the level parameter<br />
-   * <br />
+   * specified as the level parameter
+   *
    * BLUR - executes a Guassian blur with the level parameter specifying the
    * extent of the blurring. If no level parameter is used, the blur is
-   * equivalent to Guassian blur of radius 1<br />
-   * <br />
-   * OPAQUE - sets the alpha channel to entirely opaque<br />
-   * <br />
+   * equivalent to Guassian blur of radius 1
+   *
+   * OPAQUE - sets the alpha channel to entirely opaque
+   *
    * ERODE - reduces the light areas with the amount defined by the level
-   * parameter<br />
-   * <br />
+   * parameter
+   *
    * DILATE - increases the light areas with the amount defined by the level parameter
    *
    * ( end auto-generated )
@@ -15833,7 +15009,7 @@ public class PApplet implements PConstants {
    * </UL>
    * Luminance conversion code contributed by
    * <A HREF="http://www.toxi.co.uk">toxi</A>
-   * <P/>
+   *
    * Gaussian blur code contributed by
    * <A HREF="http://incubator.quasimondo.com">Mario Klingemann</A>
    *
@@ -15857,7 +15033,7 @@ public class PApplet implements PConstants {
    * source pixels to fit the specified target region. No alpha information
    * is used in the process, however if the source image has an alpha channel
    * set, it will be copied as well.
-   * <br /><br />
+   *
    * As of release 0149, this function ignores <b>imageMode()</b>.
    *
    * ( end auto-generated )
@@ -15907,47 +15083,47 @@ public class PApplet implements PConstants {
    * Blends a region of pixels into the image specified by the <b>img</b>
    * parameter. These copies utilize full alpha channel support and a choice
    * of the following modes to blend the colors of source pixels (A) with the
-   * ones of pixels in the destination image (B):<br />
-   * <br />
-   * BLEND - linear interpolation of colours: C = A*factor + B<br />
-   * <br />
-   * ADD - additive blending with white clip: C = min(A*factor + B, 255)<br />
-   * <br />
+   * ones of pixels in the destination image (B):
+   *
+   * BLEND - linear interpolation of colours: C = A*factor + B
+   *
+   * ADD - additive blending with white clip: C = min(A*factor + B, 255)
+   *
    * SUBTRACT - subtractive blending with black clip: C = max(B - A*factor,
-   * 0)<br />
-   * <br />
-   * DARKEST - only the darkest colour succeeds: C = min(A*factor, B)<br />
-   * <br />
-   * LIGHTEST - only the lightest colour succeeds: C = max(A*factor, B)<br />
-   * <br />
-   * DIFFERENCE - subtract colors from underlying image.<br />
-   * <br />
-   * EXCLUSION - similar to DIFFERENCE, but less extreme.<br />
-   * <br />
-   * MULTIPLY - Multiply the colors, result will always be darker.<br />
-   * <br />
-   * SCREEN - Opposite multiply, uses inverse values of the colors.<br />
-   * <br />
+   * 0)
+   *
+   * DARKEST - only the darkest colour succeeds: C = min(A*factor, B)
+   *
+   * LIGHTEST - only the lightest colour succeeds: C = max(A*factor, B)
+   *
+   * DIFFERENCE - subtract colors from underlying image.
+   *
+   * EXCLUSION - similar to DIFFERENCE, but less extreme.
+   *
+   * MULTIPLY - Multiply the colors, result will always be darker.
+   *
+   * SCREEN - Opposite multiply, uses inverse values of the colors.
+   *
    * OVERLAY - A mix of MULTIPLY and SCREEN. Multiplies dark values,
-   * and screens light values.<br />
-   * <br />
-   * HARD_LIGHT - SCREEN when greater than 50% gray, MULTIPLY when lower.<br />
-   * <br />
+   * and screens light values.
+   *
+   * HARD_LIGHT - SCREEN when greater than 50% gray, MULTIPLY when lower.
+   *
    * SOFT_LIGHT - Mix of DARKEST and LIGHTEST.
-   * Works like OVERLAY, but not as harsh.<br />
-   * <br />
+   * Works like OVERLAY, but not as harsh.
+   *
    * DODGE - Lightens light tones and increases contrast, ignores darks.
-   * Called "Color Dodge" in Illustrator and Photoshop.<br />
-   * <br />
+   * Called "Color Dodge" in Illustrator and Photoshop.
+   *
    * BURN - Darker areas are applied, increasing contrast, ignores lights.
-   * Called "Color Burn" in Illustrator and Photoshop.<br />
-   * <br />
+   * Called "Color Burn" in Illustrator and Photoshop.
+   *
    * All modes use the alpha information (highest byte) of source image
    * pixels as the blending factor. If the source and destination regions are
    * different sizes, the image will be automatically resized to match the
    * destination size. If the <b>srcImg</b> parameter is not used, the
-   * display window is used as the source image.<br />
-   * <br />
+   * display window is used as the source image.
+   *
    * As of release 0149, this function ignores <b>imageMode()</b>.
    *
    * ( end auto-generated )