diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeCorona.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeCorona.java index d9c46e205da4e164e292fb670391dde27773ba07..b3d2e76eaa1f53f208615f790df5e5e89564ec62 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeCorona.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeCorona.java @@ -33,7 +33,7 @@ import java.awt.geom.AffineTransform; public class ShapeCorona extends Corona { private Color colour = Color.GRAY; - private int borderWidth = 20; + private int borderWidth = 0; /** * Constructor building all fields and calling the implicit super constructor using a @@ -44,6 +44,8 @@ public class ShapeCorona extends Corona { */ public ShapeCorona(BaseShapeCoronaBuilder builder) { super(builder); + colour = builder.colour; + borderWidth = builder.borderWidth; } /** {@inheritDoc} */ @@ -66,12 +68,13 @@ public class ShapeCorona extends Corona { transformation.rotate(drawAt.getAngle()); } + canvas.setPaint(colour); + canvas.fill(transformation.createTransformedShape(shape)); + + canvas.setPaint(Color.black); Stroke oldStroke = canvas.getStroke(); canvas.setStroke(new BasicStroke(borderWidth)); - canvas.draw(shape); + canvas.draw(transformation.createTransformedShape(shape)); canvas.setStroke(oldStroke); - - canvas.setPaint(colour); - canvas.fill(transformation.createTransformedShape(shape)); } } \ No newline at end of file diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShapeCoronaBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShapeCoronaBuilder.java index c7a647a41da329af9aa0477957985f94c9804995..4a8afcff4e71c8c8ec7ddddcf28d6a329e533faa 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShapeCoronaBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShapeCoronaBuilder.java @@ -35,7 +35,7 @@ public class ShapeCoronaBuilder extends BaseShapeCoronaBuilder