Merge branch 'master' into jdk17

Author: monkstone

CHANGELOG.md

@@ -1,4 +1,4 @@
-**v3.11.0** Suggest use of JRuby-9.3.0.0+, some refactoring of GfxRender and ShapeRender.
+**v3.11.0** Suggest use of JRuby-9.3.1.0+, some refactoring of GfxRender and ShapeRender. Change `declared_field` to field possible since JRuby-9.3.0.0, required since JRuby-9.3.1.0
 
 **v3.10.0** Default to using FastNoise module, with alternative of SmoothNoise module.
 

README.md

@@ -2,16 +2,16 @@
 
 This version is intended to work with openjdk11+.
 
-A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it). It would be a good idea to update examples with this release.
+A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported. Using maven to create an automatic module, to be refined.
 
 adjust above for your OS/distro setup.
 
 ## Requirements
 
-Previously there has been linker issue with P2D or P3D sketches with stock openjdk with some linux distros, but that seems to have gone away. [Adopt open jdk binaries][adopt] have always worked.
+Tested with OpenJDK11 and OpenJDK17.
 
 - `jdk-17+`
-- `jruby-9.3.0.0`
+- `jruby-9.3.1.0`
 
 ## Building and testing
 

lib/propane/helper_methods.rb

@@ -117,13 +117,13 @@ def find_method(method_name)
     def proxy_java_fields
       fields = %w[key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
+      @jfields = Hash[fields.zip(methods)]
     end
 
     # Fix java conversion problems getting the last key
     # If it's ASCII, return the character, otherwise the integer
     def key
-      int = @declared_fields['key'].value(java_self)
+      int = @jfields['key'].value(java_self)
       int < 256 ? int.chr : int
     end
 
@@ -160,19 +160,19 @@ def save_strings(filename, strings)
 
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
-      return @declared_fields['frameRate'].value(java_self) unless fps
+      return @jfields['frameRate'].value(java_self) unless fps
 
       super(fps)
     end
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
+      @jfields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
     def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
+      @jfields['keyPressed'].value(java_self)
     end
 
     private

pom.rb

@@ -44,7 +44,7 @@
       'polyglot.dump.pom' => 'pom.xml',
       'project.build.sourceEncoding' => 'utf-8',
       'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
-      'jruby.version' => '9.3.0.0',
+      'jruby.version' => '9.3.1.0',
       'batik.version' => '1.14',
       'itextpdf.version' => '5.5.13.2',
       'jruby.api' => 'http://jruby.org/apidocs/')

pom.xml

@@ -66,7 +66,7 @@ DO NOT MODIFY - GENERATED CODE
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <jruby.version>9.3.0.0</jruby.version>
+    <jruby.version>9.3.1.0</jruby.version>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>

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

@@ -1336,17 +1336,19 @@ protected int findIndex(Object object) {
      * @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;
         }
     }
 
@@ -2115,6 +2117,7 @@ protected PGraphics makeGraphics(int w, int h,
     /**
      * Create default renderer, likely to be resized, but needed for surface
      * init.
+     * @return 
      */
     protected PGraphics createPrimaryGraphics() {
         return makeGraphics(sketchWidth(), sketchHeight(),
@@ -2124,9 +2127,9 @@ protected PGraphics createPrimaryGraphics() {
     /**
      * ( 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.
      *
@@ -2142,6 +2145,7 @@ protected PGraphics createPrimaryGraphics() {
      * 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
@@ -2400,6 +2404,7 @@ public boolean isLooping() {
     /**
      * 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);
@@ -3186,14 +3191,14 @@ public void link(String url) {
     /**
      * ( 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
@@ -3218,49 +3223,52 @@ public void link(String url) {
      *
      * ( end auto-generated )
      *
+     * @return 
      * @webref input:files
      * @param args arguments to the launcher, eg. a filename.
      * @usage Application
      */
     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
@@ -7526,6 +7534,7 @@ static public String[] expand(String[] list, int newSize) {
     }
 
     /**
+     * @param array
      * @nowebref
      */
     static public Object expand(Object array) {
@@ -9648,6 +9657,7 @@ public void frameResized(int w, int h) {
      * 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>
      */
@@ -9658,6 +9668,8 @@ static public void main(final String[] args) {
     /**
      * 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);