Modification allowing fillColour and/or strokeColour to be omitted

TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeCorona.java

@@ -101,18 +101,26 @@ public class ShapeCorona extends Corona {
             return;
         }
 
+        Graphics2D localCanvas = (Graphics2D) canvas.create();
+
         AffineTransform transform = this.getTransform(null);
         Shape transformedShape = transform.createTransformedShape(shape);
 
-        canvas.setPaint(fillColour);
-        canvas.fill(transformedShape);
+        if (fillColour != null) {
+            localCanvas.setPaint(fillColour);
+            localCanvas.fill(transformedShape);
+        }
+
+        if (strokeColour != null) {
+            localCanvas.setPaint(strokeColour);
+            Stroke oldStroke = canvas.getStroke();
+            if (borderStroke != null)
+                localCanvas.setStroke(borderStroke);
+            localCanvas.draw(transformedShape);
+            localCanvas.setStroke(oldStroke);
+        }
 
-        canvas.setPaint(strokeColour);
-        Stroke oldStroke = canvas.getStroke();
-        if (borderStroke != null)
-            canvas.setStroke(borderStroke);
-        canvas.draw(transformedShape);
-        canvas.setStroke(oldStroke);
+        localCanvas.dispose();
     }
 
     // ---------------------------------------------------------------------------

TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseShapeCoronaBuilder.java

@@ -92,8 +92,8 @@ public abstract class BaseShapeCoronaBuilder<B extends BaseShapeCoronaBuilder<B>
      */
     private void buildFromBootstrap(@Nullable Element rootElement, BootstrapContext context, BootstrapCallback callback) throws BuildException {
         strokeWidth = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.STROKE_WIDTH_NODE, BootstrappingUtils.OPTIONAL, 0, context);
-        fillColour = BootstrappingUtils.getContentAsColour(rootElement, Externalization.FILL_COLOUR_NODE, BootstrappingUtils.OPTIONAL, Color.GRAY, context);
-        strokeColour = BootstrappingUtils.getContentAsColour(rootElement, Externalization.STROKE_COLOUR_ELEMENT, BootstrappingUtils.OPTIONAL, Color.GRAY, context);
+        fillColour = BootstrappingUtils.getContentAsColour(rootElement, Externalization.FILL_COLOUR_NODE, BootstrappingUtils.OPTIONAL, null, context);
+        strokeColour = BootstrappingUtils.getContentAsColour(rootElement, Externalization.STROKE_COLOUR_ELEMENT, BootstrappingUtils.OPTIONAL, null, context);
     }
 
     /**