Merge branch 'buster' of https://github.com/ruby-processing/PiCrate into buster

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+v2.0.0 Use JDK11+ update to processing-3.5.4
+
 v1.2.4 Extract picrate examples to ~/projects/examples instead of ~/picrate_samples for tighter integration with geany editor. Remove non-functioning sound library as an install option (direct toward minim as option).
 
 v1.2.3 Favor latest beta Video2 library over GLVideo.

Rakefile

@@ -12,7 +12,7 @@ task :init do
   # for Archlinux etc
   # processing_root = File.dirname(`readlink -f $(which processing)`)
   # alternative for debian linux etc
-  processing_root = File.join(HOME_DIR, 'processing-3.5.3')
+  processing_root = File.join(HOME_DIR, 'processing-3.5.4')
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>1.2.4</version>
+  <version>2.0.0.pre</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -119,11 +119,11 @@ DO NOT MODIFIY - GENERATED CODE
       <plugins>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>2.7</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>2.8</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>

src/main/java/processing/awt/PGraphicsJava2D.java

@@ -86,7 +86,7 @@ public class PGraphicsJava2D extends PGraphics {
   float[] curveDrawY;
 
   int transformCount;
-  AffineTransform transformStack[] =
+  AffineTransform[] transformStack =
     new AffineTransform[MATRIX_STACK_DEPTH];
   double[] transform = new double[6];
 
@@ -817,7 +817,7 @@ public void vertex(float x, float y) {
     //float vertex[];
 
     if (vertexCount == vertices.length) {
-      float temp[][] = new float[vertexCount<<1][VERTEX_FIELD_COUNT];
+      float[][] temp = new float[vertexCount<<1][VERTEX_FIELD_COUNT];
       System.arraycopy(vertices, 0, temp, 0, vertexCount);
       vertices = temp;
       //message(CHATTER, "allocating more vertices " + vertices.length);
@@ -2002,7 +2002,7 @@ protected void handleTextSize(float size) {
 
 
   @Override
-  protected float textWidthImpl(char buffer[], int start, int stop) {
+  protected float textWidthImpl(char[] buffer, int start, int stop) {
     if (textFont == null) {
       defaultFontOrDeath("textWidth");
     }
@@ -2066,12 +2066,12 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
   // TEXT IMPL
 
 
-  //protected void textLineAlignImpl(char buffer[], int start, int stop,
+  //protected void textLineAlignImpl(char[] buffer, int start, int stop,
   //                                 float x, float y)
 
 
   @Override
-  protected void textLineImpl(char buffer[], int start, int stop,
+  protected void textLineImpl(char[] buffer, int start, int stop,
                               float x, float y) {
     Font font = (Font) textFont.getNative();
 //    if (font != null && (textFont.isStream() || hints[ENABLE_NATIVE_FONTS])) {
@@ -2884,7 +2884,7 @@ public void updatePixels(int x, int y, int c, int d) {
   // GET/SET
 
 
-  static int getset[] = new int[1];
+  static int[] getset = new int[1];
 
 
   @Override

src/main/java/processing/awt/PSurfaceAWT.java

@@ -668,26 +668,6 @@ protected void setProcessingIcon(Frame frame) {
 
     } catch (Exception e) {
     }  // harmless; keep this to ourselves
-
-    // } else {  // handle OS X differently
-    //   if (!dockIconSpecified()) {  // don't override existing -Xdock param
-    //     // On OS X, set this for AWT surfaces, which handles the dock image
-    //     // as well as the cmd-tab image that's shown. Just one size, I guess.
-    //     URL url = PApplet.class.getResource("/icon/icon-512.png");
-    //     // Seems dangerous to have this in code instead of using reflection, no?
-    //     //ThinkDifferent.setIconImage(Toolkit.getDefaultToolkit().getImage(url));
-    //     try {
-    //       final String td = "processing.core.ThinkDifferent";
-    //       Class<?> thinkDifferent =
-    //         Thread.currentThread().getContextClassLoader().loadClass(td);
-    //       Method method =
-    //         thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
-    //       method.invoke(null, new Object[] { Toolkit.getDefaultToolkit().getImage(url) });
-    //     } catch (Exception e) {
-    //       e.printStackTrace();  // That's unfortunate
-    //     }
-    //   }
-    // }
   }
 
   /**

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

@@ -52,13 +52,11 @@
 import javax.swing.JFileChooser;
 
 // set the look and feel, if specified
-import javax.swing.UIManager;
 
 // used by link()
 import java.awt.Desktop;
 
 // used by desktopFile() method
-import javax.swing.filechooser.FileSystemView;
 
 // loadXML() error handling
 import javax.xml.parsers.ParserConfigurationException;
@@ -78,7 +76,6 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.regex.*;
 import java.util.zip.*;
-import javax.swing.UnsupportedLookAndFeelException;
 
 import processing.data.*;
 import processing.event.*;
@@ -328,7 +325,7 @@ public class PApplet implements PConstants {
    * is doubled. As a result, all operations that use pixels (like
    * <b>loadPixels()</b>, <b>get()</b>, <b>set()</b>, etc.) happen in this
    * doubled space. As a convenience, the variables <b>pixelWidth</b>
-   * and <b>pixelHeight<b> hold the actual width and height of the sketch in
+   * and <b>pixelHeight</b> hold the actual width and height of the sketch in
    * pixels. This is useful for any sketch that uses the <b>pixels[]</b>
    * array, for instance, because the number of elements in the array will be
    * <b>pixelWidth*pixelHeight</b>, not <b>width*height</b>.
@@ -1451,17 +1448,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;
     }
   }