propane 3.7.1-java → 3.11.0-java

data/src/main/java/monkstone/slider/WheelHandler.java

@@ -31,5 +31,5 @@ public interface WheelHandler {
      *
      * @param amount int
      */
-    public void handleWheel(final short amount);
+    void handleWheel(final short amount);
 }

data/src/main/java/monkstone/vecmath/JRender.java

@@ -11,14 +11,14 @@ public interface JRender {
      * @param x double
      * @param y double
      */
-    public void vertex(double x, double y);
+    void vertex(double x, double y);
 
     /**
      *
      * @param x double
      * @param y double
      */
-    public void curveVertex(double x, double y);
+    void curveVertex(double x, double y);
 
     /**
      *
@@ -26,7 +26,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void vertex(double x, double y, double z);
+    void vertex(double x, double y, double z);
 
     /**
      *
@@ -36,7 +36,7 @@ public interface JRender {
      * @param u double
      * @param v double
      */
-    public void vertex(double x, double y, double z, double u, double v);
+    void vertex(double x, double y, double z, double u, double v);
 
     /**
      *
@@ -44,7 +44,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void curveVertex(double x, double y, double z);
+    void curveVertex(double x, double y, double z);
 
     /**
      *
@@ -52,5 +52,5 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void normal(double x, double y, double z);
+    void normal(double x, double y, double z);
 }

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

@@ -40,7 +40,7 @@ import monkstone.vecmath.JRender;
  * @author Martin Prout
  */
 @JRubyClass(name = "Vec2D")
-public class Vec2 extends RubyObject {
+public final class Vec2 extends RubyObject {
 
     static final double EPSILON = 9.999999747378752e-05; // matches processing.org EPSILON
     private static final long serialVersionUID = -2950154560223211646L;
@@ -73,7 +73,7 @@ public class Vec2 extends RubyObject {
      * @return new Vec2 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public static final IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec2 vec2 = (Vec2) ((RubyClass) klazz).allocate();
         vec2.init(context, args);
         return vec2;
@@ -91,16 +91,16 @@ public class Vec2 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count == 2) {
-            jx = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+            jx = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+            jy = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }   // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = args[0].callMethod(context, "x") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = args[0].callMethod(context, "y") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
         }
     }
@@ -162,10 +162,10 @@ public class Vec2 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 {
@@ -224,7 +224,7 @@ public class Vec2 extends RubyObject {
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
-        double result = Math.hypot((jx - b.jx), (jy - b.jy));
+        double result = Math.hypot(jx - b.jx, jy - b.jy);
         return runtime.newFloat(result);
     }
 
@@ -318,7 +318,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_mul(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         return Vec2.rbNew(context, this.getMetaClass(),
                 new IRubyObject[]{runtime.newFloat(jx * scalar),
@@ -335,7 +335,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_div(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         if (Math.abs(scalar) < Vec2.EPSILON) {
             return this;
@@ -400,10 +400,8 @@ public 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) {
@@ -489,7 +487,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "from_angle", meta = true)
     public static IRubyObject from_angle(ThreadContext context, IRubyObject klazz, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double angle = (scalar instanceof RubyFloat)
+        double angle = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         return Vec2.rbNew(context, klazz, new IRubyObject[]{
             runtime.newFloat(Math.cos(angle)),
@@ -520,10 +518,10 @@ public class Vec2 extends RubyObject {
      */
     @JRubyMethod(name = "rotate!")
     public IRubyObject rotate_bang(ThreadContext context, IRubyObject scalar) {
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
-        double x = (jx * Math.cos(theta) - jy * Math.sin(theta));
-        double y = (jx * Math.sin(theta) + jy * Math.cos(theta));
+        double x = jx * Math.cos(theta) - jy * Math.sin(theta);
+        double y = jx * Math.sin(theta) + jy * Math.cos(theta);
         jx = x;
         jy = y;
         return this;
@@ -538,7 +536,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "rotate")
     public IRubyObject rotate(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         IRubyObject[] ary = new IRubyObject[]{
             runtime.newFloat(jx * Math.cos(theta) - jy * Math.sin(theta)),
@@ -559,9 +557,9 @@ public 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),
@@ -581,9 +579,9 @@ public 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";
         jx += (vec.jx - jx) * scalar;
         jy += (vec.jy - jy) * scalar;
@@ -744,10 +742,8 @@ public 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;
     }
@@ -766,8 +762,8 @@ public class Vec2 extends RubyObject {
         }
         if (other instanceof Vec2) {
             Vec2 v = (Vec2) other.toJava(Vec2.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0) {
                 return runtime.newBoolean(true);
             }
         }
@@ -793,7 +789,7 @@ public class Vec2 extends RubyObject {
             double diff = jx - v.jx;
             if ((diff < 0 ? -diff : diff) > Vec2.EPSILON) {
                 return runtime.newBoolean(false);
-            }
+            } 
             diff = jy - v.jy;
             return runtime.newBoolean((diff < 0 ? -diff : diff) < Vec2.EPSILON);
         }

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

@@ -65,7 +65,7 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public final static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec3 vec = (Vec3) ((RubyClass) klazz).allocate();
         vec.init(context, args);
         return vec;
@@ -83,27 +83,27 @@ public final class Vec3 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count >= 2) {
-            jx = (args[0] instanceof RubyFloat)
+            jx = args[0] instanceof RubyFloat
                     ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat)
+            jy = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }
         if (count == 3) {
-            jz = (args[2] instanceof RubyFloat)
+            jz = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         } // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = (args[0].callMethod(context, "x")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = (args[0].callMethod(context, "y")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
             if (!(args[0].respondsTo("z"))) {
                 return;
             } // allow promotion from 2D to 3D, sets jz = 0
-            jz = ((args[0].callMethod(context, "z")) instanceof RubyFloat) ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
+            jz = (args[0].callMethod(context, "z")) instanceof RubyFloat ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
         }
     }
 
@@ -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) {
@@ -598,9 +584,9 @@ public final class Vec3 extends RubyObject {
         double u = 0;
         double v = 0;
         if (count == 3) {
-            u = (args[1] instanceof RubyFloat)
+            u = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-            v = (args[2] instanceof RubyFloat)
+            v = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         }
         if (count == 2) {
@@ -662,9 +648,9 @@ public final class Vec3 extends RubyObject {
         }
         if (obj instanceof Vec3) {
             final Vec3 other = (Vec3) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)
-                    && (Double.compare(jz, (Double) other.jz) == 0)) {
+            if (Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0
+                    && Double.compare(jz, (Double) other.jz) == 0) {
                 return true;
             }
 
@@ -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/PGraphicsJava2D.java

@@ -1564,6 +1564,15 @@ public class PGraphicsJava2D extends PGraphics {
 
   /**
    * Handle renderer-specific image drawing.
+     * @param who
+     * @param x1
+     * @param y1
+     * @param x2
+     * @param y2
+     * @param u1
+     * @param v1
+     * @param u2
+     * @param v2
    */
   @Override
   protected void imageImpl(PImage who,
@@ -2575,7 +2584,7 @@ public class PGraphicsJava2D extends PGraphics {
 //    WritableRaster raster = ((BufferedImage) image).getRaster();
 //    WritableRaster raster = image.getRaster();
     WritableRaster raster = getRaster();
-    if ((clearPixels == null) || (clearPixels.length < imageWidth)) {
+    if (clearPixels == null || clearPixels.length < imageWidth) {
       clearPixels = new int[imageWidth];
     }
     Arrays.fill(clearPixels, 0, imageWidth, backgroundColor);
@@ -2595,7 +2604,6 @@ public class PGraphicsJava2D extends PGraphics {
   public void backgroundImpl() {
     if (backgroundAlpha) {
       clearPixels(backgroundColor);
-
     } else {
       Color bgColor = new Color(backgroundColor);
       // seems to fire an additional event that causes flickering,
@@ -2798,7 +2806,7 @@ public class PGraphicsJava2D extends PGraphics {
   public void updatePixels(int x, int y, int c, int d) {
     //if ((x == 0) && (y == 0) && (c == width) && (d == height)) {
 //    System.err.format("%d %d %d %d .. w/h = %d %d .. pw/ph = %d %d %n", x, y, c, d, width, height, pixelWidth, pixelHeight);
-    if ((x != 0) || (y != 0) || (c != pixelWidth) || (d != pixelHeight)) {
+    if (x != 0 || y != 0 || c != pixelWidth || d != pixelHeight) {
       // Show a warning message, but continue anyway.
       showVariationWarning("updatePixels(x, y, w, h)");
 //      new Exception().printStackTrace(System.out);

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 {