propane 3.1.0.pre-java → 3.2.0-java

data/src/main/java/monkstone/core/LibraryProxy.java

@@ -6,120 +6,131 @@ import processing.event.MouseEvent;
 import processing.event.KeyEvent;
 
 /**
-* The purpose of this class is to enable
-* access to processing pre, draw and post loops in
-* ruby-processing as a regular java library class.
-* Also included background, fill and stroke methods.
-* PConstants should also be available from static import
-* @author Martin Prout
-*/
+ * The purpose of this class is to enable access to processing pre, draw and
+ * post loops in ruby-processing as a regular java library class. Also included
+ * background, fill and stroke methods. PConstants should also be available from
+ * static import
+ *
+ * @author Martin Prout
+ */
 public abstract class LibraryProxy {
 
-  private final PApplet app;
-
-  /**
-  * Useful accessors
-  */
-  public int width, height;
-
-  /**
-  *
-  * @param app PApplet
-  */
-  public LibraryProxy(PApplet app) {
-    this.app = app;
-    this.width = app.width;
-    this.height = app.height;
-    setActive(true);
-  }
-
-  /**
-  * Extending classes can override this, gives access to, by reflection,
-  * processing PApplet pre loop (called before draw)
-  */
-  public void pre(){}
-
-  /**
-  * Extending classes must implement this gives access to processing PApplet
-  * draw loop
-  */
-  public abstract void draw();
-
-  /**
-  * Extending classes can override this, gives access to, by reflection,
-  * processing PApplet post loop (called after draw)
-  */
-  public void post(){}
-
-  /**
-  * Extending classes can override this, gives access to, by reflection,
-  * processing PApplet post loop (called after draw)
-  */
-  public void keyEvent(KeyEvent e){}
-
-  /**
-  * Extending classes can override this, gives access to, by reflection,
-  * processing PApplet post loop (called after draw)
-  */
-  public void mouseEvent(MouseEvent e){}
-
-  /**
-  * Register or unregister reflection methods
-  * @param active
-  */
-  final void setActive(boolean active) {
-    if (active) {
-      this.app.registerMethod("pre", this);
-      this.app.registerMethod("draw", this);
-      this.app.registerMethod("post", this);
-      this.app.registerMethod("mouseEvent", this);
-      this.app.registerMethod("keyEvent", this);
-      this.app.registerMethod("dispose", this);
-    } else {
-      this.app.unregisterMethod("pre", this);
-      this.app.unregisterMethod("draw", this);
-      this.app.unregisterMethod("post", this);
-      this.app.unregisterMethod("mouseEvent", this);
-      this.app.unregisterMethod("keyEvent", this);
+    private final PApplet app;
+
+    /**
+     * Useful accessors
+     */
+    public int width, height;
+
+    /**
+     *
+     * @param app PApplet
+     */
+    public LibraryProxy(PApplet app) {
+        this.app = app;
+        this.width = app.width;
+        this.height = app.height;
+        setActive(true);
+    }
+
+    /**
+     * Extending classes can override this, gives access to, by reflection,
+     * processing PApplet pre loop (called before draw)
+     */
+    public void pre() {
+    }
+
+    /**
+     * Extending classes must implement this gives access to processing PApplet
+     * draw loop
+     */
+    public abstract void draw();
+
+    /**
+     * Extending classes can override this, gives access to, by reflection,
+     * processing PApplet post loop (called after draw)
+     */
+    public void post() {
+    }
+
+    /**
+     * Extending classes can override this, gives access to, by reflection,
+     * processing PApplet post loop (called after draw)
+     * @param e
+     */
+    public void keyEvent(KeyEvent e) {
+    }
+
+    /**
+     * Extending classes can override this, gives access to, by reflection,
+     * processing PApplet post loop (called after draw)
+     * @param e
+     */
+    public void mouseEvent(MouseEvent e) {
+    }
+
+    /**
+     * Register or unregister reflection methods
+     *
+     * @param active
+     */
+    final void setActive(boolean active) {
+        if (active) {
+            this.app.registerMethod("pre", this);
+            this.app.registerMethod("draw", this);
+            this.app.registerMethod("post", this);
+            this.app.registerMethod("mouseEvent", this);
+            this.app.registerMethod("keyEvent", this);
+            this.app.registerMethod("dispose", this);
+        } else {
+            this.app.unregisterMethod("pre", this);
+            this.app.unregisterMethod("draw", this);
+            this.app.unregisterMethod("post", this);
+            this.app.unregisterMethod("mouseEvent", this);
+            this.app.unregisterMethod("keyEvent", this);
+        }
+    }
+
+    /**
+     * Simple signature for background hides need to call app
+     *
+     * @param col int
+     */
+    public void background(int col) {
+        this.app.background(col);
+    }
+
+    /**
+     * Simple signature for fill hides need to call app
+     *
+     * @param col int
+     */
+    public void fill(int col) {
+        this.app.fill(col);
+    }
+
+    /**
+     * Simple signature for stroke hides need to call app
+     *
+     * @param col int
+     */
+    public void stroke(int col) {
+        this.app.stroke(col);
+    }
+
+    /**
+     * Access applet if we must
+     *
+     * @return applet PApplet
+     */
+    public PApplet app() {
+        return this.app;
+    }
+
+    /**
+     * required for processing
+     */
+    public void dispose() {
+        setActive(false);
     }
-  }
-
-  /**
-  * Simple signature for background hides need to call app
-  * @param col int
-  */
-  public void background(int col) {
-    this.app.background(col);
-  }
-
-  /**
-  * Simple signature for fill hides need to call app
-  * @param col int
-  */
-  public void fill(int col) {
-    this.app.fill(col);
-  }
-
-  /**
-  * Simple signature for stroke hides need to call app
-  * @param col int
-  */
-  public void stroke(int col) {
-    this.app.stroke(col);
-  }
-
-  /**
-  * Access applet if we must
-  * @return applet PApplet
-  */
-  public PApplet app() {
-    return this.app;
-  }
-
-  /**
-  * required for processing
-  */
-  public void dispose() {
-    setActive(false);
-  }
 }

data/src/main/java/monkstone/fastmath/Deglut.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-18 Martin Prout
+ * Copyright (c) 2015-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package monkstone.fastmath;
 
 import org.jruby.Ruby;
@@ -29,96 +28,94 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
-*
-* @author Martin Prout
-*/
+ *
+ * @author Martin Prout
+ */
 @JRubyModule(name = "DegLut")
 public class Deglut {
-  
-  /**
-  * Lookup table for degree cosine/sine, has a fixed precision 1.0
-  * degrees Quite accurate but imprecise
-  *
-  * @author Martin Prout <martin_p@lineone.net>
-  */
-  static final double[] SIN_DEG_LUT = new double[91];
-  /**
-  *
-  */
-  public static final double TO_RADIANS = Math.PI / 180;
-  /**
-  *
-  */
-  private static boolean initialized = false;
-  
-  private final static int NINETY = 90;
-  private final static int FULL = 360;
-  private static final long serialVersionUID = -1466528933765940101L;
-  
-  /**
-  * Initialize sin table with values (first quadrant only)
-  */
-  public static final void initTable() {
-    if (initialized == false) {
-      for (int i = 0; i <= NINETY; i++) {
-        SIN_DEG_LUT[i] = Math.sin(TO_RADIANS * i);
-      }
-      initialized = true;
+
+    /**
+     * Lookup table for degree cosine/sine, has a fixed precision 1.0 degrees
+     * Quite accurate but imprecise
+     *
+     * @author Martin Prout <martin_p@lineone.net>
+     */
+    static final double[] SIN_DEG_LUT = new double[91];
+    /**
+     *
+     */
+    public static final double TO_RADIANS = Math.PI / 180;
+    /**
+     *
+     */
+    private static boolean initialized = false;
+
+    private final static int NINETY = 90;
+    private final static int FULL = 360;
+    private static final long serialVersionUID = -1466528933765940101L;
+
+    /**
+     * Initialize sin table with values (first quadrant only)
+     */
+    public static final void initTable() {
+        if (initialized == false) {
+            for (int i = 0; i <= NINETY; i++) {
+                SIN_DEG_LUT[i] = Math.sin(TO_RADIANS * i);
+            }
+            initialized = true;
+        }
     }
-  }
-    
-  /**
-  *
-  * @param runtime Ruby
-  */
-  
-  public static void createDeglut(final Ruby runtime){
-    RubyModule deglutModule = runtime.defineModule("DegLut");
-    deglutModule.defineAnnotatedMethods(Deglut.class);
-    Deglut.initTable();
-  }
-    
- 
-  /**
-  *
-  * @param context ThreadContext
-  * @param recv IRubyObject
-  * @param other IRubyObject degrees
-  * @return sin IRubyObject
-  */
-  @JRubyMethod(name = "sin", module = true)
-  
-  public static IRubyObject sin(ThreadContext context, IRubyObject recv, IRubyObject other) {
-    int thet = (int) ((RubyInteger)other).getLongValue();
-    while (thet < 0) {
-      thet += FULL; // Needed because negative modulus plays badly in java
+
+    /**
+     *
+     * @param runtime Ruby
+     */
+    public static void createDeglut(final Ruby runtime) {
+        RubyModule deglutModule = runtime.defineModule("DegLut");
+        deglutModule.defineAnnotatedMethods(Deglut.class);
+        Deglut.initTable();
     }
-    int theta = thet % FULL;
-    int y = theta % NINETY;
-    double result = (theta < NINETY) ? SIN_DEG_LUT[y] : (theta < 180)
-    ? SIN_DEG_LUT[NINETY - y] : (theta < 270)
-    ? -SIN_DEG_LUT[y] : -SIN_DEG_LUT[NINETY - y];
-    return context.runtime.newFloat(result);
-  }
-  
-  /**
-  *
-  * @param context ThreadContext
-  * @param recv IRubyObject
-  * @param other IRubyObject degrees
-  * @return cos IRubyObject
-  */
-  @JRubyMethod(name = "cos", module = true)
-  public static IRubyObject cos(ThreadContext context, IRubyObject recv, IRubyObject other) {
-    int thet = (int) ((RubyInteger)other).getLongValue();
-    while (thet < 0) {
-      thet += FULL; // Needed because negative modulus plays badly in java
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param other IRubyObject degrees
+     * @return sin IRubyObject
+     */
+    @JRubyMethod(name = "sin", module = true)
+
+    public static IRubyObject sin(ThreadContext context, IRubyObject recv, IRubyObject other) {
+        int thet = (int) ((RubyInteger) other).getLongValue();
+        while (thet < 0) {
+            thet += FULL; // Needed because negative modulus plays badly in java
+        }
+        int theta = thet % FULL;
+        int y = theta % NINETY;
+        double result = (theta < NINETY) ? SIN_DEG_LUT[y] : (theta < 180)
+                ? SIN_DEG_LUT[NINETY - y] : (theta < 270)
+                        ? -SIN_DEG_LUT[y] : -SIN_DEG_LUT[NINETY - y];
+        return context.runtime.newFloat(result);
+    }
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param other IRubyObject degrees
+     * @return cos IRubyObject
+     */
+    @JRubyMethod(name = "cos", module = true)
+    public static IRubyObject cos(ThreadContext context, IRubyObject recv, IRubyObject other) {
+        int thet = (int) ((RubyInteger) other).getLongValue();
+        while (thet < 0) {
+            thet += FULL; // Needed because negative modulus plays badly in java
+        }
+        int theta = thet % FULL;
+        int y = theta % NINETY;
+        double result = (theta < NINETY) ? SIN_DEG_LUT[NINETY - y] : (theta < 180)
+                ? -SIN_DEG_LUT[y] : (theta < 270)
+                        ? -SIN_DEG_LUT[NINETY - y] : SIN_DEG_LUT[y];
+        return context.runtime.newFloat(result);
     }
-    int theta = thet % FULL;
-    int y = theta % NINETY;
-    double result = (theta < NINETY) ? SIN_DEG_LUT[NINETY - y] : (theta < 180)
-    ? -SIN_DEG_LUT[y] : (theta < 270)
-    ? -SIN_DEG_LUT[NINETY - y] : SIN_DEG_LUT[y];
-    return context.runtime.newFloat(result);
-  }  
 }

data/src/main/java/monkstone/filechooser/Chooser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,19 +23,13 @@ import java.io.File;
 
 /**
  * This interface makes it easier/possible to use the reflection methods
- * selectInput
- * def setup
- *   java_signature 'void selectInput(String, String)'
- *   selectInput('Select a file to process:', 'fileSelected')
- * end
+ * selectInput def setup java_signature 'void selectInput(String, String)'
+ * selectInput('Select a file to process:', 'fileSelected') end
+ *
+ * def file_selected(selection) if selection.nil? puts 'Window was closed or the
+ * user hit cancel.' else puts format('User selected %s',
+ * selection.get_absolute_path) end end
  *
- * def file_selected(selection)
- *   if selection.nil?
- *     puts 'Window was closed or the user hit cancel.'
- *   else
- *     puts format('User selected %s', selection.get_absolute_path)
- *   end
- * end
  * @author Martin Prout
  */
 public interface Chooser {