clean up error message, repair dumb mistake (fixes #3417)

benfry · benfry · commit fabe525bea2a · 2015-06-21T23:36:57.000-04:00
diff --git a/core/src/processing/awt/PShapeJava2D.java b/core/src/processing/awt/PShapeJava2D.java
@@ -60,6 +60,8 @@ public PShapeJava2D(PShapeSVG parent, XML properties, boolean parseKids) {
 
   @Override
   protected void setParent(PShapeSVG parent) {
+    super.setParent(parent);
+
     if (parent instanceof PShapeJava2D) {
       PShapeJava2D pj = (PShapeJava2D) parent;
       fillGradientPaint = pj.fillGradientPaint;
@@ -79,6 +81,19 @@ protected PShapeSVG createShape(PShapeSVG parent, XML properties, boolean parseK
   }
 
 
+  /*
+  @Override
+  public void setColor(String colorText, boolean isFill) {
+    super.setColor(colorText, isFill);
+
+    if (fillGradient != null) {
+      fillGradientPaint = calcGradientPaint(fillGradient);
+    }
+    if (strokeGradient != null) {
+      strokeGradientPaint = calcGradientPaint(strokeGradient);
+    }
+  }
+  */
 
 
   static class LinearGradientPaint implements Paint {
@@ -286,14 +301,14 @@ public Raster getRaster(int x, int y, int w, int h) {
 
   protected Paint calcGradientPaint(Gradient gradient) {
     if (gradient instanceof LinearGradient) {
-      System.out.println("creating linear gradient");
+//      System.out.println("creating linear gradient");
       LinearGradient grad = (LinearGradient) gradient;
       return new LinearGradientPaint(grad.x1, grad.y1, grad.x2, grad.y2,
                                      grad.offset, grad.color, grad.count,
                                      opacity);
 
     } else if (gradient instanceof RadialGradient) {
-      System.out.println("creating radial gradient");
+//      System.out.println("creating radial gradient");
       RadialGradient grad = (RadialGradient) gradient;
       return new RadialGradientPaint(grad.cx, grad.cy, grad.r,
                                      grad.offset, grad.color, grad.count,
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
@@ -109,31 +109,20 @@ public class PShapeSVG extends PShape {
   String fillName;  // id of another object
 
 
-//  /**
-//   * Initializes a new SVG Object with the given filename.
-//   */
-//  public PShapeSVG(PApplet parent, String filename) {
-//    // this will grab the root document, starting <svg ...>
-//    // the xml version and initial comments are ignored
-//    this(parent.loadXML(filename));
-//  }
-
-
   /**
-   * Initializes a new SVG Object from the given XML.
+   * Initializes a new SVG object from the given XML object.
    */
   public PShapeSVG(XML svg) {
     this(null, svg, true);
 
     if (!svg.getName().equals("svg")) {
-      throw new RuntimeException("The root node is not <svg>, it's <" + svg.getName() + ">." +
-         (svg.getName().toLowerCase().equals("html") ?
-         " That means it's just a webpage. Did you download it right?" : ""));
+      if (svg.getName().toLowerCase().equals("html")) {
+        // Common case is that files aren't downloaded properly
+        throw new RuntimeException("This appears to be a web page, not an SVG file.");
+      } else {
+        throw new RuntimeException("The root node is not <svg>, it's <" + svg.getName() + ">");
+      }
     }
-
-
-    //root = new Group(null, svg);
-//    parseChildren(svg);  // ?
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
@@ -43,6 +43,8 @@ X   setLocation(int, int) and setSize(int, int)
 X add the "don't use this" warning to the JFrame in PSurfaceAWT
 X ArithmeticException: / by zero when using fonts opened with loadFont()
 X   https://github.com/processing/processing/issues/3413
+X SVG briefly broken for Java2D
+X   https://github.com/processing/processing/issues/3417
 
 threading headaches
 X sketch not always showing with empty draw()
@@ -115,8 +117,6 @@ _ update wiki/docs to say "don't override sketchXxxx() methods"
 
 
 beta
-_ gradients currently broken for Java2D
-_   https://github.com/processing/processing/issues/3417
 _ run only the necessary pieces on the EDT
 _   in part because FX doesn't even use the EDT
 _   re-check the Linux frame visibility stuff
