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

Author: monkstone

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

@@ -1969,13 +1969,11 @@ protected void handleTextSize(float size) {
     // don't derive again if the font size has not changed
     if (font != null) {
       if (font.getSize2D() != size) {
-        Map<TextAttribute, Object> map =
-          new HashMap<>();
-        map.put(TextAttribute.SIZE, size);
-        map.put(TextAttribute.KERNING,
-                TextAttribute.KERNING_ON);
-//      map.put(TextAttribute.TRACKING,
-//              TextAttribute.TRACKING_TIGHT);
+        Map<TextAttribute, Object> map = Map.of(
+          TextAttribute.SIZE, size,
+          TextAttribute.KERNING, TextAttribute.KERNING_ON      
+        );
+//        TextAttribute.TRACKING, TextAttribute.TRACKING_TIGHT);
         font = font.deriveFont(map);
       }
       g2.setFont(font);

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

@@ -514,7 +514,7 @@ public void setAlwaysOnTop(final boolean always) {
      *
      */
     protected void initIcons() {
-        IOUtil.ClassResources res = null;
+        IOUtil.ClassResources res;
         if (PJOGL.icons == null || PJOGL.icons.length == 0) {
             // Default Processing icons
             final int[] sizes = {16, 32, 48, 64, 128, 256, 512};
@@ -542,7 +542,7 @@ protected void initIcons() {
     @SuppressWarnings("resource")
     private String resourceFilename(String filename) {
         // The code below comes from PApplet.createInputRaw() with a few adaptations
-        InputStream stream = null;
+        InputStream stream;
         try {
             // First see if it's in a data folder. This may fail by throwing
             // a SecurityException. If so, this whole block will be skipped.
@@ -1371,16 +1371,15 @@ void set() {
     }
 
     static Map<Integer, CursorInfo> cursors = new HashMap<>();
-    static Map<Integer, String> cursorNames = new HashMap<>();
-
-    static {
-        cursorNames.put(PConstants.ARROW, "arrow");
-        cursorNames.put(PConstants.CROSS, "cross");
-        cursorNames.put(PConstants.WAIT, "wait");
-        cursorNames.put(PConstants.MOVE, "move");
-        cursorNames.put(PConstants.HAND, "hand");
-        cursorNames.put(PConstants.TEXT, "text");
-    }
+    static Map<Integer, String> cursorNames = Map.of(
+          PConstants.ARROW, "arrow",
+          PConstants.CROSS, "cross",
+          PConstants.WAIT, "wait",
+          PConstants.MOVE, "move",
+          PConstants.HAND, "hand",
+          PConstants.TEXT, "text"
+  );
+
 
     @Override
     public void setCursor(int kind) {