propane 3.10.0-java → 3.11.0-java

data/src/main/java/monkstone/vecmath/vec2/Vec2.java

@@ -400,10 +400,8 @@ public final class Vec2 extends RubyObject {
 
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
         double new_mag = scalar.toJava(Double.class);
-        if (block.isGiven()) {
-            if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
-                return this;
-            }
+        if (block.isGiven() && !block.yield(context, scalar).toJava(Boolean.class)) {
+            return this;        
         }
         double current = 0;
         if (Math.abs(jx) > EPSILON && Math.abs(jy) > EPSILON) {
@@ -559,9 +557,9 @@ public final class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
+        double scalar = args[1] instanceof RubyFloat
                 ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        assert scalar >= 0 && scalar < 1.0 :
                 "Lerp value " + scalar + " out of range 0..1.0";
         return Vec2.rbNew(context, this.getMetaClass(), new IRubyObject[]{
             runtime.newFloat(jx + (vec.jx - jx) * scalar),
@@ -583,7 +581,7 @@ public final class Vec2 extends RubyObject {
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
         double scalar = args[1] instanceof RubyFloat
                 ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        assert scalar >= 0 && scalar < 1.0 :
                 "Lerp value " + scalar + " out of range 0..1.0";
         jx += (vec.jx - jx) * scalar;
         jy += (vec.jy - jy) * scalar;
@@ -744,10 +742,8 @@ public final class Vec2 extends RubyObject {
         }
         if (obj instanceof Vec2) {
             final Vec2 other = (Vec2) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)) {
-                return true;
-            }
+            return Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0;
         }
         return false;
     }
@@ -793,8 +789,7 @@ public final class Vec2 extends RubyObject {
             double diff = jx - v.jx;
             if ((diff < 0 ? -diff : diff) > Vec2.EPSILON) {
                 return runtime.newBoolean(false);
-            } else {
-            }
+            } 
             diff = jy - v.jy;
             return runtime.newBoolean((diff < 0 ? -diff : diff) < Vec2.EPSILON);
         }

data/src/main/java/monkstone/vecmath/vec3/Vec3.java

@@ -147,11 +147,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "x=")
     public IRubyObject setX(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jx = ((RubyFloat) other).getValue();
-        } else {
-            jx = ((RubyFixnum) other).getDoubleValue();
-        }
+        jx = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();   
         return other;
     }
 
@@ -163,11 +159,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "y=")
     public IRubyObject setY(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jy = ((RubyFloat) other).getValue();
-        } else {
-            jy = ((RubyFixnum) other).getDoubleValue();
-        }
+        jy = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue(); 
         return other;
     }
 
@@ -179,11 +171,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "z=")
     public IRubyObject setZ(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jz = ((RubyFloat) other).getValue();
-        } else {
-            jz = ((RubyFixnum) other).getDoubleValue();
-        }
+        jz = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue(); 
         return other;
     }
 
@@ -222,13 +210,13 @@ public final class Vec3 extends RubyObject {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
             if (key == RubySymbol.newSymbol(runtime, "x")) {
-                jx = (value instanceof RubyFloat)
+                jx = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                jy = (value instanceof RubyFloat)
+                jy = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "z")) {
-                jz = (value instanceof RubyFloat)
+                jz = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else {
                 throw runtime.newIndexError("invalid key");
@@ -368,7 +356,7 @@ public final class Vec3 extends RubyObject {
     @JRubyMethod(name = "*", required = 1)
     public IRubyObject op_mul(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double multi = (scalar instanceof RubyFloat)
+        double multi = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         return Vec3.rbNew(context, this.getMetaClass(), new IRubyObject[]{
             runtime.newFloat(jx * multi),
@@ -385,7 +373,7 @@ public final class Vec3 extends RubyObject {
     @JRubyMethod(name = "/", required = 1)
     public IRubyObject op_div(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double divisor = (scalar instanceof RubyFloat)
+        double divisor = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         if (Math.abs(divisor) < Vec3.EPSILON) {
             return this;
@@ -427,12 +415,10 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "set_mag")
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
-        if (block.isGiven()) {
-            if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
-                return this;
-            }
+        if (block.isGiven() && !block.yield(context, scalar).toJava(Boolean.class)) {
+            return this;        
         }
-        double new_mag = (scalar instanceof RubyFloat)
+        double new_mag = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         double current = Math.sqrt(jx * jx + jy * jy + jz * jz);
         if (current > EPSILON) {
@@ -686,9 +672,9 @@ public final class Vec3 extends RubyObject {
         }
         if (other instanceof Vec3) {
             Vec3 v = (Vec3) other.toJava(Vec3.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)
-                    && (Double.compare(jz, (Double) v.jz) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0
+                    && Double.compare(jz, (Double) v.jz) == 0) {
                 return runtime.newBoolean(true);
             }
 

data/src/main/java/processing/awt/PImageAWT.java

@@ -118,6 +118,7 @@ public class PImageAWT extends PImage {
 
   /**
    * Returns a native BufferedImage from this PImage.
+   * @return 
    */
   @Override
   public Object getNative() {  // ignore
@@ -259,11 +260,12 @@ public class PImageAWT extends PImage {
 
 
   /**
-   * Use ImageIO functions from Java 1.4 and later to handle image save.
-   * Various formats are supported, typically jpeg, png, bmp, and wbmp.
-   * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * Use ImageIO functions from Java 1.4 and later to handle image save.Various formats are supported, typically jpeg, png, bmp, and wbmp.To get a list of the supported formats for writing, use: <BR>
+    <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    *
+   * @param path
+   * @return 
+   * @throws java.io.IOException
    * @path The path to which the file should be written.
    */
   protected boolean saveImageIO(String path) throws IOException {

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

@@ -1337,17 +1337,19 @@ public class PApplet implements PConstants {
      * @param target the target object that should receive the event
      */
     public void registerMethod(String methodName, Object target) {
-        if (methodName.equals("mouseEvent")) {
-            registerWithArgs("mouseEvent", target, new Class[]{processing.event.MouseEvent.class});
-
-        } else if (methodName.equals("keyEvent")) {
-            registerWithArgs("keyEvent", target, new Class[]{processing.event.KeyEvent.class});
-
-        } else if (methodName.equals("touchEvent")) {
-            registerWithArgs("touchEvent", target, new Class[]{processing.event.TouchEvent.class});
-
-        } else {
-            registerNoArgs(methodName, target);
+        switch (methodName) {
+            case "mouseEvent":
+                registerWithArgs("mouseEvent", target, new Class[]{processing.event.MouseEvent.class});
+                break;
+            case "keyEvent":
+                registerWithArgs("keyEvent", target, new Class[]{processing.event.KeyEvent.class});
+                break;
+            case "touchEvent":
+                registerWithArgs("touchEvent", target, new Class[]{processing.event.TouchEvent.class});
+                break;
+            default:
+                registerNoArgs(methodName, target);
+                break;
         }
     }
 
@@ -2086,7 +2088,7 @@ public class PApplet implements PConstants {
                         + " renderer is not in the class path.");
             }
 
-        } catch (Exception e) {
+        } catch (IllegalAccessException | IllegalArgumentException | InstantiationException | NoSuchMethodException | SecurityException e) {
             if ((e instanceof IllegalArgumentException)
                     || (e instanceof NoSuchMethodException)
                     || (e instanceof IllegalAccessException)) {
@@ -2116,6 +2118,7 @@ public class PApplet implements PConstants {
     /**
      * Create default renderer, likely to be resized, but needed for surface
      * init.
+     * @return 
      */
     protected PGraphics createPrimaryGraphics() {
         return makeGraphics(sketchWidth(), sketchHeight(),
@@ -2125,9 +2128,9 @@ public class PApplet implements PConstants {
     /**
      * ( begin auto-generated from createImage.xml )
      *
-     * Creates a new PImage (the datatype for storing images). This provides a
-     * 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
+     * Creates a new PImage (the datatype for storing images).This provides a
+ 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.
      *
@@ -2143,6 +2146,7 @@ public class PApplet implements PConstants {
      * to the parent PApplet is included, which makes save() work without
      * needing an absolute path.
      *
+     * @return 
      * @webref image
      * @param w width in pixels
      * @param h height in pixels
@@ -2401,6 +2405,7 @@ public class PApplet implements PConstants {
     /**
      * Add an event to the internal event queue, or process it immediately if
      * the sketch is not currently looping.
+     * @param pe
      */
     public void postEvent(processing.event.Event pe) {
         eventQueue.add(pe);
@@ -3187,14 +3192,14 @@ public class PApplet implements PConstants {
     /**
      * ( begin auto-generated from launch.xml )
      *
-     * Attempts to open an application or file using your platform's launcher.
-     * The <b>file</b> parameter is a String specifying the file name and
-     * location. The location parameter must be a full path name, or the name 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).
-     *
-     * The <b>args</b> parameter is a String or String array which is passed to
+     * Attempts to open an application or file using your platform's launcher.The <b>file</b> parameter is a String specifying the file name and
+ location.
+     * The location parameter must be a full path name, or the name 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).
+
+ 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
@@ -3219,6 +3224,7 @@ public class PApplet implements PConstants {
      *
      * ( end auto-generated )
      *
+     * @return 
      * @webref input:files
      * @param args arguments to the launcher, eg. a filename.
      * @usage Application
@@ -3226,42 +3232,44 @@ 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 == MACOS) {
-            params = new String[]{"open"};
-
-        } else 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"};
-            for (String launcher : launchers) {
-                if (openLauncher != null) {
-                    break;
-                }
-                try {
-                    Process p = Runtime.getRuntime().exec(new String[]{launcher});
-                    /*int result =*/ p.waitFor();
-                    // Not installed will throw an IOException (JDK 1.4.2, Ubuntu 7.04)
-                    openLauncher = launcher;
-                } catch (Exception e) {
+        switch (platform) {
+            case 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"};
+                break;
+            case MACOS:
+                params = new String[]{"open"};
+                break;
+            case 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"};
+                for (String launcher : launchers) {
+                    if (openLauncher != null) {
+                        break;
+                    }
+                    try {
+                        Process p = Runtime.getRuntime().exec(new String[]{launcher});
+                        /*int result =*/ p.waitFor();
+                        // Not installed will throw an IOException (JDK 1.4.2, Ubuntu 7.04)
+                        openLauncher = launcher;
+                    } catch (Exception e) {
+                    }
+                }   if (openLauncher == null) {
+                    System.err.println("Could not find xdg-open, gnome-open, or kde-open: "
+                            + "the open() command may not work.");
+                }   if (openLauncher != null) {
+                    params = new String[]{openLauncher};
                 }
-            }
-            if (openLauncher == null) {
-                System.err.println("Could not find xdg-open, gnome-open, or kde-open: "
-                        + "the open() command may not work.");
-            }
-            if (openLauncher != null) {
-                params = new String[]{openLauncher};
-            }
-            //} else {  // give up and just pass it to Runtime.exec()
-            //open(new String[] { filename });
-            //params = new String[] { filename };
+                //} else {  // give up and just pass it to Runtime.exec()
+                //open(new String[] { filename });
+                //params = new String[] { filename };
+                break;
+            default:
+                break;
         }
         if (params != null) {
             // If the 'open', 'gnome-open' or 'cmd' are already included
@@ -7135,7 +7143,7 @@ public class PApplet implements PConstants {
      * from a server, or marked in-use if running from a local file system. With
      * this in mind, saving to the data path doesn't make sense anyway. If you
      * know you're running locally, and want to save to the data folder, use
-     * <TT>saveXxxx("data/blah.dat")</TT>.
+     * <code>saveXxxx("data/blah.dat")</code>.
      */
     public String savePath(String where) {
         if (where == null) {
@@ -7527,6 +7535,7 @@ public class PApplet implements PConstants {
     }
 
     /**
+     * @param array
      * @nowebref
      */
     static public Object expand(Object array) {
@@ -9649,6 +9658,7 @@ public class PApplet implements PConstants {
      * All parameters *after* the sketch class name are passed to the sketch
      * itself and available from its 'args' array while the sketch is running.
      *
+     * @param args
      * @see PApplet#args
      * </PRE>
      */
@@ -9659,6 +9669,8 @@ public class PApplet implements PConstants {
     /**
      * Convenience method so that PApplet.main(YourSketch.class) launches a
      * sketch, rather than having to call getName() on it.
+     * @param mainClass
+     * @param args
      */
     static public void main(final Class<?> mainClass, String... args) {
         main(mainClass.getName(), args);

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

@@ -1567,24 +1567,24 @@ public class PImage implements PConstants, Cloneable {
    *     Sometimes called "Normal" or "Copy" in other software.
    *
    * <LI>BLEND - linear interpolation of colours:
-   *     <TT>C = A*factor + B</TT>
+   *     <code>C = A*factor + B</code>
    *
    * <LI>ADD - additive blending with white clip:
-   *     <TT>C = min(A*factor + B, 255)</TT>.
+   *     <code>C = min(A*factor + B, 255)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Burn",
    *     and Director calls it "Add Pin".
    *
    * <LI>SUBTRACT - substractive blend with black clip:
-   *     <TT>C = max(B - A*factor, 0)</TT>.
+   *     <code>C = max(B - A*factor, 0)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Dodge",
    *     and Director calls it "Subtract Pin".
    *
    * <LI>DARKEST - only the darkest colour succeeds:
-   *     <TT>C = min(A*factor, B)</TT>.
+   *     <code>C = min(A*factor, B)</code>.
    *     Illustrator calls this "Darken".
    *
    * <LI>LIGHTEST - only the lightest colour succeeds:
-   *     <TT>C = max(A*factor, B)</TT>.
+   *     <code>C = max(A*factor, B)</code>.
    *     Illustrator calls this "Lighten".
    *
    * <LI>DIFFERENCE - subtract colors from underlying image.
@@ -1615,12 +1615,12 @@ public class PImage implements PConstants, Cloneable {
    * <P>It is important to note that Processing uses "fast" code, not
    * necessarily "correct" code. No biggie, most software does. A nitpicker
    * can find numerous "off by 1 division" problems in the blend code where
-   * <TT>&gt;&gt;8</TT> or <TT>&gt;&gt;7</TT> is used when strictly speaking
-   * <TT>/255.0</TT> or <TT>/127.0</TT> should have been used.</P>
+   * <code>&gt;&gt;8</code> or <code>&gt;&gt;7</code> is used when strictly speaking
+   * <code>/255.0</code> or <code>/127.0</code> should have been used.</P>
    * <P>For instance, exclusion (not intended for real-time use) reads
-   * <TT>r1 + r2 - ((2 * r1 * r2) / 255)</TT> because <TT>255 == 1.0</TT>
-   * not <TT>256 == 1.0</TT>. In other words, <TT>(255*255)>>8</TT> is not
-   * the same as <TT>(255*255)/255</TT>. But for real-time use the shifts
+   * <code>r1 + r2 - ((2 * r1 * r2) / 255)</code> because <code>255 == 1.0</code>
+   * not <code>256 == 1.0</code>. In other words, <code>(255*255)>>8</code> is not
+   * the same as <code>(255*255)/255</code>. But for real-time use the shifts
    * are preferrable, and the difference is insignificant for applications
    * built with Processing.</P>
    *
@@ -3130,9 +3130,9 @@ int testFunction(int dst, int src) {
    * </p>
    * Starting with revision 0092, the format setting is taken into account:
    * <UL>
-   * <LI><TT>ALPHA</TT> images written as 8bit grayscale (uses lowest byte)
-   * <LI><TT>RGB</TT> &rarr; 24 bits
-   * <LI><TT>ARGB</TT> &rarr; 32 bits
+   * <LI><code>ALPHA</code> images written as 8bit grayscale (uses lowest byte)
+   * <LI><code>RGB</code> &rarr; 24 bits
+   * <LI><code>ARGB</code> &rarr; 32 bits
    * </UL>
    * All versions are RLE compressed.
    * 
@@ -3307,7 +3307,7 @@ int testFunction(int dst, int src) {
    * and the extension used is supported (usually png, jpg, jpeg, bmp,
    * and tiff), then those methods will be used to write the image.
    * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    * <p>
    * To use the original built-in image writers, use .tga or .tif as the
    * extension, or don't include an extension. When no extension is used,

data/src/main/java/processing/opengl/PGraphicsOpenGL.java

@@ -181,32 +181,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;

data/src/main/java/processing/opengl/PShader.java

@@ -988,7 +988,7 @@ public class PShader implements PConstants {
 
 
   /**
-   * @return 
+   * @return
    */
   protected boolean compileFragmentShader() {
     pgl.shaderSource(glFragment, PApplet.join(fragmentShaderSource, "\n"));
@@ -1137,11 +1137,6 @@ public class PShader implements PConstants {
     specularLoc = getAttributeLoc("specular");
     emissiveLoc = getAttributeLoc("emissive");
     shininessLoc = getAttributeLoc("shininess");
-
-    directionLoc = getAttributeLoc("direction");
-
-    offsetLoc = getAttributeLoc("offset");
-
     directionLoc = getAttributeLoc("direction");
     offsetLoc = getAttributeLoc("offset");
 

data/src/main/java/processing/opengl/PSurfaceJOGL.java

@@ -184,10 +184,10 @@ public class PSurfaceJOGL implements PSurface {
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -273,7 +273,7 @@ public class PSurfaceJOGL implements PSurface {
         case 2:
           try {
             profile = GLProfile.getGL2ES2();
-            
+
             // workaround for https://jogamp.org/bugzilla/show_bug.cgi?id=1347
             if (!profile.isHardwareRasterizer()) {
               GLProfile hardware = GLProfile.getMaxProgrammable(true);
@@ -281,7 +281,7 @@ public class PSurfaceJOGL implements PSurface {
                 profile = hardware;
               }
             }
-            
+
           } catch (GLException ex) {
             profile = GLProfile.getMaxProgrammable(true);
           } break;
@@ -657,7 +657,7 @@ public class PSurfaceJOGL implements PSurface {
           stream = new FileInputStream(filename);
           stream.close();
           return filename;
-        
+
         } catch (IOException e1) { }
 
       } catch (SecurityException se) { }  // online, whups
@@ -1309,7 +1309,7 @@ public class PSurfaceJOGL implements PSurface {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
         PImage img = new PImageAWT(icon.getImage());
         // Most cursors just use the center as the hotspot...
         int x = img.width / 2;