propane 3.5.0-java → 3.6.0-java

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

@@ -62,6 +62,7 @@ public class PMatrix2D implements PMatrix {
   }
 
 
+  @Override
   public void reset() {
     set(1, 0, 0,
         0, 1, 0);
@@ -71,6 +72,7 @@ public class PMatrix2D implements PMatrix {
   /**
    * Returns a copy of this PMatrix.
    */
+  @Override
   public PMatrix2D get() {
     PMatrix2D outgoing = new PMatrix2D();
     outgoing.set(this);
@@ -83,6 +85,7 @@ public class PMatrix2D implements PMatrix {
    * If target is null (or not the correct size), a new array will be created.
    * Returned in the order {@code {m00, m01, m02, m10, m11, m12}}.
    */
+  @Override
   public float[] get(float[] target) {
     if ((target == null) || (target.length != 6)) {
       target = new float[6];
@@ -101,7 +104,7 @@ public class PMatrix2D implements PMatrix {
 
   /**
    * If matrix is a PMatrix2D, sets this matrix to be a copy of it.
-   * @throws IllegalArgumentException If <code>matrix</code> is not 2D.
+   * @throws IllegalArgumentException If <tt>matrix</tt> is not 2D.
    */
   public void set(PMatrix matrix) {
     if (matrix instanceof PMatrix2D) {
@@ -121,6 +124,7 @@ public class PMatrix2D implements PMatrix {
   }
 
 
+  @Override
   public void set(float[] source) {
     m00 = source[0];
     m01 = source[1];
@@ -135,6 +139,7 @@ public class PMatrix2D implements PMatrix {
   /**
    * Sets the matrix content.
    */
+  @Override
   public void set(float m00, float m01, float m02,
                   float m10, float m11, float m12) {
     this.m00 = m00; this.m01 = m01; this.m02 = m02;
@@ -153,6 +158,7 @@ public class PMatrix2D implements PMatrix {
   }
 
 
+  @Override
   public void translate(float tx, float ty) {
     m02 = tx*m00 + ty*m01 + m02;
     m12 = tx*m10 + ty*m11 + m12;
@@ -163,12 +169,14 @@ public class PMatrix2D implements PMatrix {
    * Unavailable in 2D.
    * @throws IllegalArgumentException
    */
+  @Override
   public void translate(float x, float y, float z) {
     throw new IllegalArgumentException("Cannot use translate(x, y, z) on a PMatrix2D.");
   }
 
 
   // Implementation roughly based on AffineTransform.
+  @Override
   public void rotate(float angle) {
     float s = sin(angle);
     float c = cos(angle);
@@ -188,6 +196,7 @@ public class PMatrix2D implements PMatrix {
    * Unavailable in 2D.
    * @throws IllegalArgumentException
    */
+  @Override
   public void rotateX(float angle) {
     throw new IllegalArgumentException("Cannot use rotateX() on a PMatrix2D.");
   }
@@ -195,7 +204,6 @@ public class PMatrix2D implements PMatrix {
 
   /**
    * Unavailable in 2D.
-   * @param angle
    * @throws IllegalArgumentException
    */
   @Override
@@ -265,6 +273,7 @@ public class PMatrix2D implements PMatrix {
   }
 
 
+  @Override
   public void apply(PMatrix2D source) {
     apply(source.m00, source.m01, source.m02,
           source.m10, source.m11, source.m12);
@@ -275,11 +284,13 @@ public class PMatrix2D implements PMatrix {
    * Unavailable in 2D.
    * @throws IllegalArgumentException
    */
+  @Override
   public void apply(PMatrix3D source) {
     throw new IllegalArgumentException("Cannot use apply(PMatrix3D) on a PMatrix2D.");
   }
 
 
+  @Override
   public void apply(float n00, float n01, float n02,
                     float n10, float n11, float n12) {
     float t0 = m00;
@@ -311,6 +322,7 @@ public class PMatrix2D implements PMatrix {
   /**
    * Apply another matrix to the left of this one.
    */
+  @Override
   public void preApply(PMatrix source) {
     if (source instanceof PMatrix2D) {
       preApply((PMatrix2D) source);
@@ -320,6 +332,7 @@ public class PMatrix2D implements PMatrix {
   }
 
 
+  @Override
   public void preApply(PMatrix2D left) {
     preApply(left.m00, left.m01, left.m02,
              left.m10, left.m11, left.m12);
@@ -330,11 +343,13 @@ public class PMatrix2D implements PMatrix {
    * Unavailable in 2D.
    * @throws IllegalArgumentException
    */
+  @Override
   public void preApply(PMatrix3D left) {
     throw new IllegalArgumentException("Cannot use preApply(PMatrix3D) on a PMatrix2D.");
   }
 
 
+  @Override
   public void preApply(float n00, float n01, float n02,
                        float n10, float n11, float n12) {
     float t0 = m02;
@@ -434,6 +449,7 @@ public class PMatrix2D implements PMatrix {
   /**
    * Unavailable in 2D. Does nothing.
    */
+  @Override
   public void transpose() {
   }
 
@@ -441,6 +457,7 @@ public class PMatrix2D implements PMatrix {
   /*
    * Implementation stolen from OpenJDK.
    */
+  @Override
   public boolean invert() {
     float determinant = determinant();
     if (Math.abs(determinant) <= Float.MIN_VALUE) {
@@ -523,23 +540,23 @@ public class PMatrix2D implements PMatrix {
   //////////////////////////////////////////////////////////////
 
 
-  static private final float max(float a, float b) {
+  private static float max(float a, float b) {
     return (a > b) ? a : b;
   }
 
-  static private final float abs(float a) {
+  private static float abs(float a) {
     return (a < 0) ? -a : a;
   }
 
-  static private final float sin(float angle) {
+  private static float sin(float angle) {
     return (float)Math.sin(angle);
   }
 
-  static private final float cos(float angle) {
+  private static float cos(float angle) {
     return (float)Math.cos(angle);
   }
 
-  static private final float tan(float angle) {
+  private static float tan(float angle) {
     return (float)Math.tan(angle);
   }
 }

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

@@ -93,7 +93,6 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   /**
    * Returns a copy of this PMatrix.
    */
-  @Override
   public PMatrix3D get() {
     PMatrix3D outgoing = new PMatrix3D();
     outgoing.set(this);
@@ -150,6 +149,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   }
 
 
+  @Override
   public void set(float[] source) {
     if (source.length == 6) {
       set(source[0], source[1], source[2],
@@ -179,6 +179,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   }
 
 
+  @Override
   public void set(float m00, float m01, float m02,
                   float m10, float m11, float m12) {
     set(m00, m01, 0, m02,
@@ -188,6 +189,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   }
 
 
+  @Override
   public void set(float m00, float m01, float m02, float m03,
                   float m10, float m11, float m12, float m13,
                   float m20, float m21, float m22, float m23,
@@ -199,6 +201,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   }
 
 
+  @Override
   public void translate(float tx, float ty) {
     translate(tx, ty, 0);
   }
@@ -208,6 +211,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
 //  }
 
 
+  @Override
   public void translate(float tx, float ty, float tz) {
     m03 += tx*m00 + ty*m01 + tz*m02;
     m13 += tx*m10 + ty*m11 + tz*m12;
@@ -216,11 +220,13 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   }
 
 
+  @Override
   public void rotate(float angle) {
     rotateZ(angle);
   }
 
 
+  @Override
   public void rotateX(float angle) {
     float c = cos(angle);
     float s = sin(angle);
@@ -623,6 +629,7 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   /**
    * Transpose this matrix; rows become columns and columns rows.
    */
+  @Override
   public void transpose() {
     float temp;
     temp = m01; m01 = m10; m10 = temp;
@@ -865,19 +872,19 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   //////////////////////////////////////////////////////////////
 
 
-  static private final float max(float a, float b) {
+  private static float max(float a, float b) {
     return (a > b) ? a : b;
   }
 
-  static private final float abs(float a) {
+  private static float abs(float a) {
     return (a < 0) ? -a : a;
   }
 
-  static private final float sin(float angle) {
+  private static float sin(float angle) {
     return (float) Math.sin(angle);
   }
 
-  static private final float cos(float angle) {
+  private static float cos(float angle) {
     return (float) Math.cos(angle);
   }
 }

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

@@ -49,7 +49,7 @@ import java.util.Base64;
  * and Adobe Illustrator. It is not a full SVG implementation, but offers
  * some straightforward support for handling vector data.
  *
- * 
+ * ( end auto-generated )
  * <h3>Advanced</h3>
  *
  * In-progress class to handle shape data, currently to be considered of
@@ -138,7 +138,7 @@ public class PShape implements PConstants {
    *
    * The width of the PShape document.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:field
    * @usage web_application
    * @brief     Shape document width
@@ -150,7 +150,7 @@ public class PShape implements PConstants {
    *
    * The height of the PShape document.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:field
    * @usage web_application
    * @brief     Shape document height
@@ -402,7 +402,7 @@ public class PShape implements PConstants {
    * created the SVG file. For instance, this parameter is controlled by
    * showing or hiding the shape in the layers palette in Adobe Illustrator.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Returns a boolean value "true" if the image is set to be visible, "false" if not
@@ -423,7 +423,7 @@ public class PShape implements PConstants {
    * created the SVG file. For instance, this parameter is controlled by
    * showing or hiding the shape in the layers palette in Adobe Illustrator.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:mathod
    * @usage web_application
    * @brief Sets the shape to be visible or invisible
@@ -442,7 +442,7 @@ public class PShape implements PConstants {
    * Styles include attributes such as colors, stroke weight, and stroke
    * joints.
    *
-   * 
+   * ( end auto-generated )
    *  <h3>Advanced</h3>
    * Overrides this shape's style information and uses PGraphics styles and
    * colors. Identical to ignoreStyles(true). Also disables styles for all
@@ -468,7 +468,7 @@ public class PShape implements PConstants {
    * Styles include attributes such as colors, stroke weight, and stroke
    * joints.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref pshape:method
    * @usage web_application
@@ -1448,25 +1448,18 @@ public class PShape implements PConstants {
   // TODO unapproved
   static protected PShape createShape(PApplet parent, PShape src) {
     PShape dest = null;
-    switch (src.family) {
-      case GROUP:
-        dest = parent.createShape(GROUP);
-        PShape.copyGroup(parent, src, dest);
-        break;
-      case PRIMITIVE:
-        dest = parent.createShape(src.kind, src.params);
-        PShape.copyPrimitive(src, dest);
-        break;
-      case GEOMETRY:
-        dest = parent.createShape(src.kind);
-        PShape.copyGeometry(src, dest);
-        break;
-      case PATH:
-        dest = parent.createShape(PATH);
-        PShape.copyPath(src, dest);
-        break;
-      default:
-        break;
+    if (src.family == GROUP) {
+      dest = parent.createShape(GROUP);
+      PShape.copyGroup(parent, src, dest);
+    } else if (src.family == PRIMITIVE) {
+      dest = parent.createShape(src.kind, src.params);
+      PShape.copyPrimitive(src, dest);
+    } else if (src.family == GEOMETRY) {
+      dest = parent.createShape(src.kind);
+      PShape.copyGeometry(src, dest);
+    } else if (src.family == PATH) {
+      dest = parent.createShape(PATH);
+      PShape.copyPath(src, dest);
     }
     dest.setName(src.name);
     return dest;
@@ -1614,23 +1607,16 @@ public class PShape implements PConstants {
    * Draws the SVG document.
    */
   protected void drawImpl(PGraphics g) {
-    switch (family) {
-      case GROUP:
-        drawGroup(g);
-        break;
-      case PRIMITIVE:
-        drawPrimitive(g);
-        break;
-      case GEOMETRY:
-        // Not same as path: `kind` matters.
+    if (family == GROUP) {
+      drawGroup(g);
+    } else if (family == PRIMITIVE) {
+      drawPrimitive(g);
+    } else if (family == GEOMETRY) {
+      // Not same as path: `kind` matters.
 //      drawPath(g);
-        drawGeometry(g);
-        break;
-      case PATH:
-        drawPath(g);
-        break;
-      default:
-        break;
+      drawGeometry(g);
+    } else if (family == PATH) {
+      drawPath(g);
     }
   }
 
@@ -1643,97 +1629,88 @@ public class PShape implements PConstants {
 
 
   protected void drawPrimitive(PGraphics g) {
-    switch (kind) {
-      case POINT:
-        g.point(params[0], params[1]);
-        break;
-      case LINE:
-        if (params.length == 4) {  // 2D
-          g.line(params[0], params[1],
-            params[2], params[3]);
-        } else {  // 3D
-          g.line(params[0], params[1], params[2],
-            params[3], params[4], params[5]);
-        } break;
-      case TRIANGLE:
-        g.triangle(params[0], params[1],
-          params[2], params[3],
-          params[4], params[5]);
-        break;
-      case QUAD:
-        g.quad(params[0], params[1],
-          params[2], params[3],
-          params[4], params[5],
-          params[6], params[7]);
-        break;
-      case RECT:
-        if (imagePath != null){
+    if (kind == POINT) {
+      g.point(params[0], params[1]);
+
+    } else if (kind == LINE) {
+      if (params.length == 4) {  // 2D
+        g.line(params[0], params[1],
+               params[2], params[3]);
+      } else {  // 3D
+        g.line(params[0], params[1], params[2],
+               params[3], params[4], params[5]);
+      }
+
+    } else if (kind == TRIANGLE) {
+      g.triangle(params[0], params[1],
+                 params[2], params[3],
+                 params[4], params[5]);
+
+    } else if (kind == QUAD) {
+      g.quad(params[0], params[1],
+             params[2], params[3],
+             params[4], params[5],
+             params[6], params[7]);
+
+    } else if (kind == RECT) {
+
+      if (imagePath != null){
           loadImage(g);
-        } if (image != null) {
-          int oldMode = g.imageMode;
-          g.imageMode(CORNER);
-          g.image(image, params[0], params[1], params[2], params[3]);
-          g.imageMode(oldMode);
-        } else {
-          int oldMode = g.rectMode;
-          g.rectMode(rectMode);
-      switch (params.length) {
-        case 4:
+      }
+      if (image != null) {
+        int oldMode = g.imageMode;
+        g.imageMode(CORNER);
+        g.image(image, params[0], params[1], params[2], params[3]);
+        g.imageMode(oldMode);
+      } else {
+        int oldMode = g.rectMode;
+        g.rectMode(rectMode);
+        if (params.length == 4) {
           g.rect(params[0], params[1],
-            params[2], params[3]);
-          break;
-        case 5:
+                 params[2], params[3]);
+        } else if (params.length == 5) {
           g.rect(params[0], params[1],
-            params[2], params[3],
-            params[4]);
-          break;
-        case 8:
+                 params[2], params[3],
+                 params[4]);
+        } else if (params.length == 8) {
           g.rect(params[0], params[1],
-            params[2], params[3],
-            params[4], params[5],
-            params[6], params[7]);
-          break;
-        default:
-          break;
-      }
-          g.rectMode(oldMode);
-        } break;
-      case ELLIPSE:
-        {
-          int oldMode = g.ellipseMode;
-          g.ellipseMode(ellipseMode);
-          g.ellipse(params[0], params[1],
-            params[2], params[3]);
-          g.ellipseMode(oldMode);
-          break;
+                 params[2], params[3],
+                 params[4], params[5],
+                 params[6], params[7]);
         }
-      case ARC:
-        {
-          int oldMode = g.ellipseMode;
-          g.ellipseMode(ellipseMode);
-          if (params.length == 6) {
-            g.arc(params[0], params[1],
+        g.rectMode(oldMode);
+      }
+    } else if (kind == ELLIPSE) {
+      int oldMode = g.ellipseMode;
+      g.ellipseMode(ellipseMode);
+      g.ellipse(params[0], params[1],
+                params[2], params[3]);
+      g.ellipseMode(oldMode);
+
+    } else if (kind == ARC) {
+      int oldMode = g.ellipseMode;
+      g.ellipseMode(ellipseMode);
+      if (params.length == 6) {
+        g.arc(params[0], params[1],
               params[2], params[3],
               params[4], params[5]);
-          } else if (params.length == 7) {
-            g.arc(params[0], params[1],
+      } else if (params.length == 7) {
+        g.arc(params[0], params[1],
               params[2], params[3],
               params[4], params[5],
               (int) params[6]);
-          }   g.ellipseMode(oldMode);
-          break;
-        }
-      case BOX:
-        if (params.length == 1) {
-          g.box(params[0]);
-        } else {
-          g.box(params[0], params[1], params[2]);
-        } break;
-      case SPHERE:
-        g.sphere(params[0]);
-        break;
-      default:
-        break;
+      }
+      g.ellipseMode(oldMode);
+
+    } else if (kind == BOX) {
+      if (params.length == 1) {
+        g.box(params[0]);
+      } else {
+        g.box(params[0], params[1], params[2]);
+      }
+
+    } else if (kind == SPHERE) {
+      g.sphere(params[0]);
     }
   }
 
@@ -2026,7 +2003,7 @@ public class PShape implements PConstants {
    * shape with the <b>target</b> parameter. The shape is returned as a
    * <b>PShape</b> object, or <b>null</b> is returned if there is an error.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Returns a child element of a shape as a PShape object
@@ -2060,6 +2037,8 @@ public class PShape implements PConstants {
   /**
    * Same as getChild(name), except that it first walks all the way up the
    * hierarchy to the eldest grandparent, so that children can be found anywhere.
+   * @param target
+   * @return 
    */
   public PShape findChild(String target) {
     if (parent == null) {
@@ -2123,6 +2102,7 @@ public class PShape implements PConstants {
 
   /**
    * Remove the child shape with index idx.
+   * @param idx
    */
   public void removeChild(int idx) {
     if (idx < childCount) {
@@ -2177,7 +2157,8 @@ public class PShape implements PConstants {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  /** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY. */
+  /** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY.
+   * @return  */
   public int getFamily() {
     return family;
   }
@@ -2505,7 +2486,7 @@ public class PShape implements PConstants {
    * created, only the <b>setFill()</b> method can define a new fill value for
    * the <b>PShape</b>.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref
    * @param fill
@@ -2617,7 +2598,7 @@ public class PShape implements PConstants {
       vertices[index][PGraphics.A] = ((tint >> 24) & 0xFF) / 255.0f;
       vertices[index][PGraphics.R] = ((tint >> 16) & 0xFF) / 255.0f;
       vertices[index][PGraphics.G] = ((tint >>  8) & 0xFF) / 255.0f;
-      vertices[index][PGraphics.B] = ((tint >>  0) & 0xFF) / 255.0f;
+      vertices[index][PGraphics.B] = ((tint) & 0xFF) / 255.0f;
     }
   }
 
@@ -2661,7 +2642,7 @@ public class PShape implements PConstants {
    * However, after the shape is created, only the <b>setStroke()</b> method
    * can define a new stroke value for the <b>PShape</b>.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref
    * @param stroke
@@ -2705,7 +2686,7 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.SA] = ((stroke >> 24) & 0xFF) / 255.0f;
     vertices[index][PGraphics.SR] = ((stroke >> 16) & 0xFF) / 255.0f;
     vertices[index][PGraphics.SG] = ((stroke >>  8) & 0xFF) / 255.0f;
-    vertices[index][PGraphics.SB] = ((stroke) & 0xFF) / 255.0f;
+    vertices[index][PGraphics.SB] = ((stroke >>  0) & 0xFF) / 255.0f;
   }
 
 
@@ -2869,7 +2850,7 @@ public class PShape implements PConstants {
 
     vertices[index][PGraphics.SPR] = ((specular >> 16) & 0xFF) / 255.0f;
     vertices[index][PGraphics.SPG] = ((specular >>  8) & 0xFF) / 255.0f;
-    vertices[index][PGraphics.SPB] = ((specular) & 0xFF) / 255.0f;
+    vertices[index][PGraphics.SPB] = ((specular >>  0) & 0xFF) / 255.0f;
   }
 
 
@@ -2918,7 +2899,7 @@ public class PShape implements PConstants {
 
     vertices[index][PGraphics.ER] = ((emissive >> 16) & 0xFF) / 255.0f;
     vertices[index][PGraphics.EG] = ((emissive >>  8) & 0xFF) / 255.0f;
-    vertices[index][PGraphics.EB] = ((emissive) & 0xFF) / 255.0f;
+    vertices[index][PGraphics.EB] = ((emissive >>  0) & 0xFF) / 255.0f;
   }
 
 
@@ -3005,43 +2986,44 @@ public class PShape implements PConstants {
    * with PATH shapes or GROUP shapes that contain other GROUPs or PATHs.
    */
   public boolean contains(float x, float y) {
-    switch (family) {
-      case PATH:
-        PVector p = new PVector(x, y);
-        if (matrix != null) {
-          // apply the inverse transformation matrix to the point coordinates
-          PMatrix inverseCoords = matrix.get();
-          // TODO why is this called twice? [fry 190724]
-          // commit was https://github.com/processing/processing/commit/027fc7a4f8e8d0a435366eae754304eea282512a
-          inverseCoords.invert();  // maybe cache this?
-          inverseCoords.invert();  // maybe cache this?
-          inverseCoords.mult(new PVector(x, y), p);
-        }
-        
-        // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
-        boolean c = false;
-        for (int i = 0, j = vertexCount-1; i < vertexCount; j = i++) {
-          if (((vertices[i][Y] > p.y) != (vertices[j][Y] > p.y)) &&
+    if (family == PATH) {
+      PVector p = new PVector(x, y);
+      if (matrix != null) {
+        // apply the inverse transformation matrix to the point coordinates
+        PMatrix inverseCoords = matrix.get();
+        // TODO why is this called twice? [fry 190724]
+        // commit was https://github.com/processing/processing/commit/027fc7a4f8e8d0a435366eae754304eea282512a
+        inverseCoords.invert();  // maybe cache this?
+        inverseCoords.invert();  // maybe cache this?
+        inverseCoords.mult(new PVector(x, y), p);
+      }
+
+      // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
+      boolean c = false;
+      for (int i = 0, j = vertexCount-1; i < vertexCount; j = i++) {
+        if (((vertices[i][Y] > p.y) != (vertices[j][Y] > p.y)) &&
             (p.x <
-            (vertices[j][X]-vertices[i][X]) *
-            (y-vertices[i][Y]) /
-            (vertices[j][1]-vertices[i][Y]) +
-            vertices[i][X])) {
-            c = !c;
-          }
-        }
-        return c;
-      case GROUP:
-        // If this is a group, loop through children until we find one that
-        // contains the supplied coordinates. If a child does not support
-        // contains() throw a warning and continue.
-        for (int i = 0; i < childCount; i++) {
-          if (children[i].contains(x, y)) return true;
+                (vertices[j][X]-vertices[i][X]) *
+                (y-vertices[i][Y]) /
+                (vertices[j][1]-vertices[i][Y]) +
+                vertices[i][X])) {
+          c = !c;
         }
-        return false;
-      default:
-        // https://github.com/processing/processing/issues/1280
-        throw new IllegalArgumentException("The contains() method is only implemented for paths.");
+      }
+      return c;
+
+    } else if (family == GROUP) {
+      // If this is a group, loop through children until we find one that
+      // contains the supplied coordinates. If a child does not support
+      // contains() throw a warning and continue.
+      for (int i = 0; i < childCount; i++) {
+        if (children[i].contains(x, y)) return true;
+      }
+      return false;
+
+    } else {
+      // https://github.com/processing/processing/issues/1280
+      throw new IllegalArgumentException("The contains() method is only implemented for paths.");
     }
   }
 
@@ -3070,7 +3052,7 @@ public class PShape implements PConstants {
    * Using this method with the <b>z</b> parameter requires using the P3D
    * parameter in combination with size.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Displaces the shape
@@ -3110,7 +3092,7 @@ public class PShape implements PConstants {
    * This method requires a 3D renderer. You need to use P3D as a third
    * parameter for the <b>size()</b> function as shown in the example above.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Rotates the shape around the x-axis
@@ -3143,7 +3125,7 @@ public class PShape implements PConstants {
    * This method requires a 3D renderer. You need to use P3D as a third
    * parameter for the <b>size()</b> function as shown in the example above.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref pshape:method
    * @usage web_application
@@ -3178,7 +3160,7 @@ public class PShape implements PConstants {
    * This method requires a 3D renderer. You need to use P3D as a third
    * parameter for the <b>size()</b> function as shown in the example above.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Rotates the shape around the z-axis
@@ -3209,7 +3191,7 @@ public class PShape implements PConstants {
    * <b>rotate(PI)</b>. This transformation is applied directly to the shape,
    * it's not refreshed each time <b>draw()</b> is run.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Rotates the shape
@@ -3260,7 +3242,7 @@ public class PShape implements PConstants {
    * Using this method with the <b>z</b> parameter requires using the P3D
    * parameter in combination with size.
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @usage web_application
    * @brief Increases and decreases the size of a shape
@@ -3299,7 +3281,7 @@ public class PShape implements PConstants {
    * Replaces the current matrix of a shape with the identity matrix. The
    * equivalent function in OpenGL is glLoadIdentity().
    *
-   * 
+   * ( end auto-generated )
    * @webref pshape:method
    * @brief Replaces the current matrix of a shape with the identity matrix
    * @usage web_application