Commit f0e57f1d authored by Nico Mack's avatar Nico Mack

Minor improvements with respect to optional properties and their

respective handling
parent 2c465577
......@@ -277,8 +277,10 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
super.setSelected(selectIt);
fillColour.setSwitched(selectIt);
strokeColour.setSwitched(selectIt);
textColour.setSwitched(selectIt);
if (strokeColour != null)
strokeColour.setSwitched(selectIt);
if (textColour != null)
textColour.setSwitched(selectIt);
}
// ---------------------------------------------------------------------------
......@@ -346,7 +348,7 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
if (this.opacity < 1.0f)
localCanvas.setComposite(AlphaComposite.SrcOver.derive(1.0f));
if (labelShape != null) {
if ((labelShape != null) && (textColour != null)) {
localCanvas.setPaint(textColour.getColor());
localCanvas.fill(labelShape);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment