propane 3.3.1-java → 3.4.0-java

data/src/main/java/processing/core/PShapeSVG.java

@@ -1076,41 +1076,39 @@ public class PShapeSVG extends PShape {
             return null;
         }
         float[] m = PApplet.parseFloat(PApplet.splitTokens(pieces[2], ", "));
-        if (pieces[1].equals("matrix")) {
-            return new PMatrix2D(m[0], m[2], m[4], m[1], m[3], m[5]);
-
-        } else if (pieces[1].equals("translate")) {
-            float tx = m[0];
-            float ty = (m.length == 2) ? m[1] : m[0];
-            return new PMatrix2D(1, 0, tx, 0, 1, ty);
-
-        } else if (pieces[1].equals("scale")) {
-            float sx = m[0];
-            float sy = (m.length == 2) ? m[1] : m[0];
-            return new PMatrix2D(sx, 0, 0, 0, sy, 0);
-
-        } else if (pieces[1].equals("rotate")) {
-            float angle = m[0];
-
-            if (m.length == 1) {
-                float c = PApplet.cos(angle);
-                float s = PApplet.sin(angle);
-                // SVG version is cos(a) sin(a) -sin(a) cos(a) 0 0
-                return new PMatrix2D(c, -s, 0, s, c, 0);
-
-            } else if (m.length == 3) {
-                PMatrix2D mat = new PMatrix2D(0, 1, m[1], 1, 0, m[2]);
-                mat.rotate(m[0]);
-                mat.translate(-m[1], -m[2]);
-                return mat;
-            }
-
-        } else if (pieces[1].equals("skewX")) {
-            return new PMatrix2D(1, 0, 1, PApplet.tan(m[0]), 0, 0);
-
-        } else if (pieces[1].equals("skewY")) {
-            return new PMatrix2D(1, 0, 1, 0, PApplet.tan(m[0]), 0);
-        }
+      switch (pieces[1]) {
+        case "matrix":
+          return new PMatrix2D(m[0], m[2], m[4], m[1], m[3], m[5]);
+        case "translate":
+          float tx = m[0];
+          float ty = (m.length == 2) ? m[1] : m[0];
+          return new PMatrix2D(1, 0, tx, 0, 1, ty);
+        case "scale":
+          float sx = m[0];
+          float sy = (m.length == 2) ? m[1] : m[0];
+          return new PMatrix2D(sx, 0, 0, 0, sy, 0);
+        case "rotate":
+          float angle = m[0];
+          if (m.length == 1) {
+            float c = PApplet.cos(angle);
+            float s = PApplet.sin(angle);
+            // SVG version is cos(a) sin(a) -sin(a) cos(a) 0 0
+            return new PMatrix2D(c, -s, 0, s, c, 0);
+            
+          } else if (m.length == 3) {
+            PMatrix2D mat = new PMatrix2D(0, 1, m[1], 1, 0, m[2]);
+            mat.rotate(m[0]);
+            mat.translate(-m[1], -m[2]);
+            return mat;
+          }
+          break;
+        case "skewX":
+          return new PMatrix2D(1, 0, 1, PApplet.tan(m[0]), 0, 0);
+        case "skewY":
+          return new PMatrix2D(1, 0, 1, 0, PApplet.tan(m[0]), 0);
+        default:
+          break;
+      }
         return null;
     }
 
@@ -1162,41 +1160,41 @@ public class PShapeSVG extends PShape {
             String styleText = properties.getString("style");
             String[] styleTokens = PApplet.splitTokens(styleText, ";");
 
-            //PApplet.println(styleTokens);
-            for (int i = 0; i < styleTokens.length; i++) {
-                String[] tokens = PApplet.splitTokens(styleTokens[i], ":");
-                //PApplet.println(tokens);
-
-                tokens[0] = PApplet.trim(tokens[0]);
-
-                if (tokens[0].equals("fill")) {
-                    setColor(tokens[1], true);
-
-                } else if (tokens[0].equals("fill-opacity")) {
-                    setFillOpacity(tokens[1]);
-
-                } else if (tokens[0].equals("stroke")) {
-                    setColor(tokens[1], false);
-
-                } else if (tokens[0].equals("stroke-width")) {
-                    setStrokeWeight(tokens[1]);
-
-                } else if (tokens[0].equals("stroke-linecap")) {
-                    setStrokeCap(tokens[1]);
-
-                } else if (tokens[0].equals("stroke-linejoin")) {
-                    setStrokeJoin(tokens[1]);
-
-                } else if (tokens[0].equals("stroke-opacity")) {
-                    setStrokeOpacity(tokens[1]);
-
-                } else if (tokens[0].equals("opacity")) {
-                    setOpacity(tokens[1]);
-
-                } else {
-                    // Other attributes are not yet implemented
-                }
-            }
+          //PApplet.println(styleTokens);
+          for (var styleToken : styleTokens) {
+            String[] tokens = PApplet.splitTokens(styleToken, ":");
+            //PApplet.println(tokens);
+            tokens[0] = PApplet.trim(tokens[0]);
+              switch (tokens[0]) {
+                case "fill":
+                  setColor(tokens[1], true);
+                  break;
+                case "fill-opacity":
+                  setFillOpacity(tokens[1]);
+                  break;
+                case "stroke":
+                  setColor(tokens[1], false);
+                  break;
+                case "stroke-width":
+                  setStrokeWeight(tokens[1]);
+                  break;
+                case "stroke-linecap":
+                  setStrokeCap(tokens[1]);
+                  break;
+                case "stroke-linejoin":
+                  setStrokeJoin(tokens[1]);
+                  break;
+                case "stroke-opacity":
+                  setStrokeOpacity(tokens[1]);
+                  break;
+                case "opacity":
+                  setOpacity(tokens[1]);
+                  break;
+              // Other attributes are not yet implemented
+                default:
+                  break;
+              }
+          }
         }
     }
 
@@ -1216,33 +1214,41 @@ public class PShapeSVG extends PShape {
     }
 
     void setStrokeJoin(String linejoin) {
-        if (linejoin.equals("inherit")) {
-            // do nothing, will inherit automatically
-
-        } else if (linejoin.equals("miter")) {
-            strokeJoin = PConstants.MITER;
-
-        } else if (linejoin.equals("round")) {
-            strokeJoin = PConstants.ROUND;
-
-        } else if (linejoin.equals("bevel")) {
-            strokeJoin = PConstants.BEVEL;
-        }
+      switch (linejoin) {
+      // do nothing, will inherit automatically
+        case "inherit":
+          break;
+        case "miter":
+          strokeJoin = PConstants.MITER;
+          break;
+        case "round":
+          strokeJoin = PConstants.ROUND;
+          break;
+        case "bevel":
+          strokeJoin = PConstants.BEVEL;
+          break;
+        default:
+          break;
+      }
     }
 
     void setStrokeCap(String linecap) {
-        if (linecap.equals("inherit")) {
-            // do nothing, will inherit automatically
-
-        } else if (linecap.equals("butt")) {
-            strokeCap = PConstants.SQUARE;
-
-        } else if (linecap.equals("round")) {
-            strokeCap = PConstants.ROUND;
-
-        } else if (linecap.equals("square")) {
-            strokeCap = PConstants.PROJECT;
-        }
+      switch (linecap) {
+      // do nothing, will inherit automatically
+        case "inherit":
+          break;
+        case "butt":
+          strokeCap = PConstants.SQUARE;
+          break;
+        case "round":
+          strokeCap = PConstants.ROUND;
+          break;
+        case "square":
+          strokeCap = PConstants.PROJECT;
+          break;
+        default:
+          break;
+      }
     }
 
     void setFillOpacity(String opacityText) {
@@ -1394,11 +1400,11 @@ public class PShapeSVG extends PShape {
 //    if (style == null) return table;
         if (style != null) {
             String[] pieces = style.split(";");
-            for (int i = 0; i < pieces.length; i++) {
-                String[] parts = pieces[i].split(":");
-                //table.put(parts[0], parts[1]);
-                table.set(parts[0], parts[1]);
-            }
+          for (String piece : pieces) {
+            String[] parts = piece.split(":");
+            //table.put(parts[0], parts[1]);
+            table.set(parts[0], parts[1]);
+          }
         }
         return table;
     }
@@ -1482,38 +1488,37 @@ public class PShapeSVG extends PShape {
             offset = new float[elements.length];
             color = new int[elements.length];
 
-            // <stop  offset="0" style="stop-color:#967348"/>
-            for (int i = 0; i < elements.length; i++) {
-                XML elem = elements[i];
-                String name = elem.getName();
-                if (name.equals("stop")) {
-                    String offsetAttr = elem.getString("offset");
-                    offset[count] = parseFloatOrPercent(offsetAttr);
-
-                    String style = elem.getString("style");
-                    //Map<String, String> styles = parseStyleAttributes(style);
-                    StringDict styles = parseStyleAttributes(style);
-
-                    String colorStr = styles.get("stop-color");
-                    if (colorStr == null) {
-                        colorStr = elem.getString("stop-color");
-                        if (colorStr == null) {
-                            colorStr = "#000000";
-                        }
-                    }
-                    String opacityStr = styles.get("stop-opacity");
-                    if (opacityStr == null) {
-                        opacityStr = elem.getString("stop-opacity");
-                        if (opacityStr == null) {
-                            opacityStr = "1";
-                        }
-                    }
-                    int tupacity = PApplet.constrain(
-                            (int) (PApplet.parseFloat(opacityStr) * 255), 0, 255);
-                    color[count] = (tupacity << 24) | parseSimpleColor(colorStr);
-                    count++;
+          // <stop  offset="0" style="stop-color:#967348"/>
+          for (XML elem : elements) {
+            String name = elem.getName();
+            if (name.equals("stop")) {
+              String offsetAttr = elem.getString("offset");
+              offset[count] = parseFloatOrPercent(offsetAttr);
+              
+              String style = elem.getString("style");
+              //Map<String, String> styles = parseStyleAttributes(style);
+              StringDict styles = parseStyleAttributes(style);
+              
+              String colorStr = styles.get("stop-color");
+              if (colorStr == null) {
+                colorStr = elem.getString("stop-color");
+                if (colorStr == null) {
+                  colorStr = "#000000";
+                }
+              }
+              String opacityStr = styles.get("stop-opacity");
+              if (opacityStr == null) {
+                opacityStr = elem.getString("stop-opacity");
+                if (opacityStr == null) {
+                  opacityStr = "1";
                 }
+              }
+              int tupacity = PApplet.constrain(
+                (int) (PApplet.parseFloat(opacityStr) * 255), 0, 255);
+              color[count] = (tupacity << 24) | parseSimpleColor(colorStr);
+              count++;
             }
+          }
             offset = PApplet.subset(offset, 0, count);
             color = PApplet.subset(color, 0, count);
         }
@@ -1599,37 +1604,40 @@ public class PShapeSVG extends PShape {
 
             horizAdvX = properties.getInt("horiz-adv-x", 0);
 
-            namedGlyphs = new HashMap<String, FontGlyph>();
-            unicodeGlyphs = new HashMap<Character, FontGlyph>();
+            namedGlyphs = new HashMap<>();
+            unicodeGlyphs = new HashMap<>();
             glyphCount = 0;
             glyphs = new FontGlyph[elements.length];
 
-            for (int i = 0; i < elements.length; i++) {
-                String name = elements[i].getName();
-                XML elem = elements[i];
-                if (name == null) {
-                    // skip it
-                } else if (name.equals("glyph")) {
-                    FontGlyph fg = new FontGlyph(this, elem, this);
-                    if (fg.isLegit()) {
-                        if (fg.name != null) {
-                            namedGlyphs.put(fg.name, fg);
-                        }
-                        if (fg.unicode != 0) {
-                            unicodeGlyphs.put(Character.valueOf(fg.unicode), fg);
-                        }
+          for (XML element1 : elements) {
+            String name = element1.getName();
+            XML elem = element1;
+            if (null == name) {
+              // skip it
+            } else switch (name) {
+                case "glyph":
+                  FontGlyph fg = new FontGlyph(this, elem, this);
+                  if (fg.isLegit()) {
+                    if (fg.name != null) {
+                      namedGlyphs.put(fg.name, fg);
                     }
-                    glyphs[glyphCount++] = fg;
-
-                } else if (name.equals("missing-glyph")) {
-//          System.out.println("got missing glyph inside <font>");
-                    missingGlyph = new FontGlyph(this, elem, this);
-                } else if (name.equals("font-face")) {
-                    face = new FontFace(this, elem);
-                } else {
-                    System.err.println("Ignoring " + name + " inside <font>");
-                }
-            }
+                    if (fg.unicode != 0) {
+                      unicodeGlyphs.put(fg.unicode, fg);
+                    }
+                  }   glyphs[glyphCount++] = fg;
+                  break;
+                case "missing-glyph":
+                  //          System.out.println("got missing glyph inside <font>");
+                  missingGlyph = new FontGlyph(this, elem, this);
+                  break;
+                case "font-face":
+                  face = new FontFace(this, elem);
+                  break;
+                default:
+                  System.err.println("Ignoring " + name + " inside <font>");
+                  break;
+              }
+          }
         }
 
         protected void drawShape() {
@@ -1648,7 +1656,7 @@ public class PShapeSVG extends PShape {
             char[] c = str.toCharArray();
             for (int i = 0; i < c.length; i++) {
                 // call draw on each char (pulling it w/ the unicode table)
-                FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c[i]));
+                FontGlyph fg = unicodeGlyphs.get(c[i]);
                 if (fg != null) {
                     fg.draw(g);
                     // add horizAdvX/unitsPerEm to the x coordinate along the way
@@ -1665,7 +1673,7 @@ public class PShapeSVG extends PShape {
             float s = size / face.unitsPerEm;
             g.translate(x, y);
             g.scale(s, -s);
-            FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c));
+            FontGlyph fg = unicodeGlyphs.get(c);
             if (fg != null) {
                 g.shape(fg);
             }
@@ -1677,7 +1685,7 @@ public class PShapeSVG extends PShape {
             char[] c = str.toCharArray();
             for (int i = 0; i < c.length; i++) {
                 // call draw on each char (pulling it w/ the unicode table)
-                FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c[i]));
+                FontGlyph fg = unicodeGlyphs.get(c[i]);
                 if (fg != null) {
                     w += (float) fg.horizAdvX / face.unitsPerEm;
                 }

data/src/main/java/processing/core/PSurfaceNone.java

@@ -55,6 +55,7 @@ public class PSurfaceNone implements PSurface {
                 + getClass().getSimpleName());
     }
 
+    @Override
     public Object getNative() {
         return null;
     }
@@ -148,15 +149,19 @@ public class PSurfaceNone implements PSurface {
 //  public void blit() {
 //    // TODO Auto-generated method stub
 //  }
+    @Override
     public void setCursor(int kind) {
     }
 
+    @Override
     public void setCursor(PImage image, int hotspotX, int hotspotY) {
     }
 
+    @Override
     public void showCursor() {
     }
 
+    @Override
     public void hideCursor() {
     }
 
@@ -165,6 +170,7 @@ public class PSurfaceNone implements PSurface {
         return new AnimationThread();
     }
 
+    @Override
     public void startThread() {
         if (thread == null) {
             thread = createThread();
@@ -175,6 +181,7 @@ public class PSurfaceNone implements PSurface {
         }
     }
 
+    @Override
     public boolean stopThread() {
         if (thread == null) {
             return false;
@@ -183,11 +190,13 @@ public class PSurfaceNone implements PSurface {
         return true;
     }
 
+    @Override
     public boolean isStopped() {
         return thread == null || !thread.isAlive();
     }
 
     // sets a flag to pause the thread when ready
+    @Override
     public void pauseThread() {
         PApplet.debug("PApplet.run() paused, calling object wait...");
         paused = true;
@@ -208,6 +217,7 @@ public class PSurfaceNone implements PSurface {
 //    PApplet.debug("done with pause");
     }
 
+    @Override
     public void resumeThread() {
         paused = false;
         synchronized (pauseObject) {