diff --git a/src/net/sourceforge/plantuml/LineConfigurable.java b/src/net/sourceforge/plantuml/LineConfigurable.java index b55381981..10474eab9 100644 --- a/src/net/sourceforge/plantuml/LineConfigurable.java +++ b/src/net/sourceforge/plantuml/LineConfigurable.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor; public interface LineConfigurable { - public Colors getColors(ISkinParam skinParam); + public Colors getColors(); public void setSpecificColorTOBEREMOVED(ColorType type, HColor color); diff --git a/src/net/sourceforge/plantuml/SpecificBackcolorable.java b/src/net/sourceforge/plantuml/SpecificBackcolorable.java index 488a41efc..4e138e312 100644 --- a/src/net/sourceforge/plantuml/SpecificBackcolorable.java +++ b/src/net/sourceforge/plantuml/SpecificBackcolorable.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; public interface SpecificBackcolorable { - public Colors getColors(ISkinParam skinParam); + public Colors getColors(); // public void setSpecificColorTOBEREMOVED(ColorType type, HtmlColor color); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java index 09de94ec7..414b5b593 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SpecificBackcolorable; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorType; @@ -87,7 +86,7 @@ public class Swimlane implements SpecificBackcolorable { this.actualWidth = actualWidth; } - public Colors getColors(ISkinParam skinParam) { + public Colors getColors() { return colors; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index 5014411fe..e7e58d108 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -306,7 +306,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable final LaneDivider divider1 = dividers.get(i); final double xpos = swimlane.getTranslate().getDx() + swimlane.getMinMax().getMinX(); - final HColor back = swimlane.getColors(skinParam).getColor(ColorType.BACK); + final HColor back = swimlane.getColors().getColor(ColorType.BACK); if (back != null) { final LaneDivider divider2 = dividers.get(i + 1); final UGraphic background = ug.apply(back.bg()).apply(back) diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java index 04845df55..c888aaecc 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java @@ -269,7 +269,7 @@ public class GroupRoot implements IGroup { } @Override - public Colors getColors(ISkinParam skinParam) { + public Colors getColors() { return Colors.empty(); } diff --git a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java index 8ebcec045..6783016d8 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java +++ b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java @@ -124,20 +124,20 @@ public final class EntityFactory { final USymbol symbol = g.getUSymbol(); folder.setUSymbol(symbol); folder.setStereotype(g.getStereotype()); - folder.setColors(g.getColors(skinParam)); + folder.setColors(g.getColors()); if (g.getUrl99() != null) { folder.addUrl(g.getUrl99()); } if (UseStyle.useBetaStyle()) { // System.err.println("Backcolor ?"); } else { - if (g.getColors(skinParam).getColor(ColorType.BACK) == null) { + if (g.getColors().getColor(ColorType.BACK) == null) { final ColorParam param = symbol == null ? ColorParam.packageBackground : symbol.getColorParamBack(); final HColor c1 = skinParam.getHtmlColor(param, g.getStereotype(), false); folder.setSpecificColorTOBEREMOVED(ColorType.BACK, c1 == null ? skinParam.getBackgroundColor() : c1); } else { - folder.setSpecificColorTOBEREMOVED(ColorType.BACK, g.getColors(skinParam).getColor(ColorType.BACK)); + folder.setSpecificColorTOBEREMOVED(ColorType.BACK, g.getColors().getColor(ColorType.BACK)); } } emptyGroupsAsNode.put(g, folder); diff --git a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java index 6f98e69b6..5bb3f2812 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java +++ b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java @@ -714,7 +714,7 @@ final public class EntityImpl implements ILeaf, IGroup { private Colors colors = Colors.empty(); - public Colors getColors(ISkinParam skinParam) { + public Colors getColors() { return colors; } diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java index 1950108ac..7a55b9bd8 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java @@ -127,7 +127,7 @@ public class EntityImageDesignedDomain extends AbstractEntityImage { URectangle rect2 = new URectangle(4, heightTotal); ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.designedBorder)); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.designedBackground); } diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java index a1326091e..acf2a97e2 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java @@ -129,7 +129,7 @@ public class EntityImageDomain extends AbstractEntityImage { final URectangle rect = new URectangle(widthTotal, heightTotal); ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.domainBorder)); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.domainBackground); } diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java index 96308e5aa..ea838d63b 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java @@ -126,7 +126,7 @@ public class EntityImageMachine extends AbstractEntityImage { URectangle rect2 = new URectangle(4, heightTotal); ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.machineBorder)); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.machineBackground); } diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java index 3df4d0bc7..0763332dd 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java @@ -117,12 +117,12 @@ public class EntityImageRequirement extends AbstractEntityImage { } ug = ug.apply(getStroke()); - HColor linecolor = getEntity().getColors(getSkinParam()).getColor(ColorType.LINE); + HColor linecolor = getEntity().getColors().getColor(ColorType.LINE); if (linecolor == null) { linecolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBorder); } ug = ug.apply(linecolor); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBackground); } diff --git a/src/net/sourceforge/plantuml/donors/PSystemDonors.java b/src/net/sourceforge/plantuml/donors/PSystemDonors.java index a994cd16a..4399c323f 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemDonors.java +++ b/src/net/sourceforge/plantuml/donors/PSystemDonors.java @@ -70,29 +70,29 @@ public class PSystemDonors extends PlainDiagram { private static final int COLS = 6; private static final int FREE_LINES = 6; - public static final String DONORS = "6sOE03mSS7Dt1Og5J5Uh3hcJits4ZufNcNRmsK-DFu8Mfx004WGrllMtt9JI0K46z1ewUipjEptkDz9V" - + "H5UwzqqpHgtN9kKCeleWw07lRWljG-b_VH3cB7aHt9aIN40AYEBeOlcHRkGuVL9bI2baDAVOxcNAl5uX" - + "bL9y_if7w1Ducpuwpvr6qQZ_14uVjNqKUr_pyskkhY4MYkLvWX8ewJ8XtKt-nzoQwNi_RQJZ9_3xf44L" - + "Yw8jtPQiaJOTOzxNjG0TqwxLSYOVJMfMnRYhIB6FHXfsaKneoyNaS-H5dpJ-g9lm4VN8a8ow0ZhBwkZy" - + "kRUlxudvbui-ucG9lg5eWH6m7bcBQ74UUj2mSC3GiejYR5NXo9DqIEH12tdpZy8KHahEBeERXbK38EpU" - + "WGeaEQXD3MSx3mEgJB55NmWtNUeFbixxibAgq9M6Pn8RAnErW2f5OeCkwCwSjw-cQlK0HwIdH2riFShd" - + "EFRI3olwffSImVhQEYnBy5UKiakfwRXzf_hTfmHmXBHyvyEO8fGJQCfW2cNyMe76LUYkjM2BZgiSBAH3" - + "rCSjDdtOt7XeHOHZCgL2hUENiPrgXJzqAS7693m95lAUzgNK0WussQf92-0BhKfwx7m1oL3mSj3ZE_w-" - + "TxYcKfAy8T56E4FIJy-p7SrG2D2nPSo6RgR0OjnbLM-n1H7iKJewG3j2qWbdyt7PctsGVkKd0Dv2GdIx" - + "JHpjuDzVkZ9rv29D97HJ6Yk0jQSLTT6mUGI3Mar5DsDACBsDSzpfex7F6SUQPT4cpriDniXlrEcAXUKo" - + "5PbkMAcdDnU-OzjBknJtoHYykjqdHrq5k9HxJzcuzuiCnBcQ35IAJ7Uy-vktB3C8YrdySxs2qhDc3suU" - + "kZFOpcBHCcQsClMG5S3WK99gVIGQIuYHtWx85lYr4Jq2oAznf0OFC_BWzMF9DTKSqx3OP14ZcuJ8jZQl" - + "s3k7SXwmv-LFScIKIBduwb58oE_OM4IqojeeRTYOxmeyGr8KvEMyUrOzmRywC7K1rQcY82WjMAiajA-U" - + "3v21UsSzIos9CrvnOK7TwdPWcg3uIXHjFRc1OWhC314-CF14Cf2LiakV617uxe-xpIEb3ktusvTTZ8Ea" - + "kIG6gY3Xr3TK4mtM7k78Uel_VsxTO2V-_5zhskJKRi_UGn0zWOG0X7k18UC24E8fyFLcmnp0AIm9qK72" - + "bQlMdWUY6Ena37PHTompgZT-PxaPkMdjzKDLdffIL3Zf1x9V18lskgPKwJO4dMgoFxmHBd8mjd-9AhDI" - + "tBlAQ4Tb97mIYZY-u_HoG3EM3j22DL17WNztVrOMQXfhlqAfF9m0-MP3KgcPheNLbjR6Gc2ZNDZVMxTJ" - + "pipFoi0-XzM5uweUsWOfRgGOKVWsA2xF21CpYQI927PFoOa78tpZGRwe5afYQLkxdJbO8VzZFuOt4WxP" - + "8GrqwZ6bFDs07BP9zx5Le3-Gzn0UoCHYdQui5aebF90YAPYhM2Oof4sq6UVs1Z0e2iR_znQKAqmqFw7P" - + "fLOsahaCQpSf8FAX_iuIM-HihKZ7lhlciitJS_lM9XFisF_0ZvzlVrJTV1C1TKHt9NZTFiY76zjKLx15" - + "ovibtCTbiMuclunBqIvH3MpUTpPgA9k1Gaf2Y7WWL4XVutvDVyAMSu5yUlrbBWpKy3nH3JruRWPMa6qq" - + "l4eQKBt8ujpwVijDtZcGEV7OuC8gOwU7EJrQPgXjDsssa44bSkUAiPx1x1ubLJwLCQYKhgaQ2sgMXDPb" - + "PmSw0-Cjv8hvlNrhOGQN-YNcCy4f1fgINXh8X0Pa4Kb13KHNoNxLYZEaPwPLuYrMjfA6gMvKGwFTO57S" + "aIUUpER31W00"; + public static final String DONORS = "6t4E03mSS7Dt1Og5J5Uh3hcJits4ZufNcNRmsK-DFu8Mfx004WGrllMtt9JI0K46z1ewUipjEptkDz9V" + + "H5UwzqqpHgtN9kKCeleWw07lRWljG-b_VH3cB7aHt9aIN40AYEBeOlcHRkGuVL9bI2baDAVOxcLYNg-G" + + "IYa-V-KZz1F8fg3pd6aKYPeNE3rg-odslkRdrrnTGomKo_C49L3IPKAwwSFSckbxFssauoVm-wH15OkY" + + "BTsMh94s7MFUrxK07TEkrN8c7qrgLiMugaYnZauQLf5CQCl5v7FaHPyq_gWtuIFgaI4PTGLqbjNHzNDl" + + "NzyJyoyNVSJ957n3KGCZO3soDj7YFFIWOUA0eMKNnTYgmf4dwP38WnRouH-5AOoKd5q6Dmsp1a1OlGCL" + + "H79GcnhETXm6L9bYYxuGRhhKtrWwxyjAgK9N6fv9RCnCr0Ah58aDkg4xSzs-cger0XoHdXAriFKed-FO" + + "Ip-iw9jUIWJhQ-kqBC5VKSekfQRZzftgTvyIm17IyfqFOufGJg0fWocKyMi56LUXkzQ2BJgkSh2G1b4V" + + "jxZfm-R6GoiY79Cf5MeTlupjL2lyeSiMR4p2as1nlwTzARM0Gqssgj82-4AhaXuxNq0o5BmSzFYEl-yT" + + "hgcK96z8j17EaFJRysn7CnO2T6mPiw6RAR0OTrdLMsn1X7gKZWxGMaW6uMnkbxtP1-aZFm7m5XAYsstY" + + "Q0T_VcdAr96BD97GJMci05QVLjHDm-8H36er5TsCAS7qDivnfLjZ7okELSkYJPwt6eo9twZJ51lBPIeo" + + "tR1I3sykVCUsbtOfxfCnU7MxJ_Qw2cWfzvvouzulCX3dQZ9GAJBTyUvllcMPGLZCuf_h5PIUDNjoyz2T" + + "mNOMYvOnivMfXwm01eUILEiZqLX2ZFIsGxR0hute4K1-ZICbU9YH1wyVIwwfvfY6oIQBwDaYHBQrUSNU" + + "sPNpW3qlVv8ZeqJAnLUFGa9-nyOYebNMHcd3vdnNu1btYgAyd7VFgYVuLmrJ5r2TAWg2qeArIaBxwlK0" + + "6RftrhFKaZZZ5ISMbBqk1uO4fLUYQEl13O0fD3D4yC304s4WAsMNDZ4YyDqVTvldBdMenzy-xM8S8jqb" + + "2L05X5DUK4qqM4U48-ij_l-vTuET-FD_hMcJKxkzzps4q1D8242u5neoBW0XdW9V7pRC0Pp2aX2T95ov" + + "Qkrv88h1JiPW5tNxCgDoutUMcv6Rrbu_LEMfAKM5atuW-qKmQAzpIPNkGz2fx77V-KQuoC7O_YMgp4fn" + + "xogZxPMHy4aeulYEqyi1pLWOe0Phe8u2_-x-h2pKDDP-HL9vE03vPaDIgPckHTMMriP6OAESsDzRirFE" + + "pC_Am3wxrONpgXxQ9Ybkf1XH-DOfBiy84pE9f8a8Ta_9YGSZVED1lgWMIs9fMxkTCLWX_sC_XZSI3jaX" + + "3JJgCQKytO0SjadtiLMWFuZt41x8mcATxYmMIoKyaY8fdAjO9ZAaJxGPv_O6CIWAn__t5fGhJ3G_eTcb" + + "TdQIkNHhDoaWyg7-pf9Qv6ojoC2-g-QopSjp-zOc4-pO_y2Fdsz_LDry4m4uegiIl6utyk765jKLR45v" + + "iuJxk2pMpUINSIdQ9Qg1pVlEHWsm6Iga98A81w12U8txDVq9Myu5yktrbxamKiFpU3NqpAUx0ol8DXfU" + + "9GsgNcHnR7s_vIRl7CYSU6nmOPMnqyES7YqprBQRDbl8e9AuSyLOps1sZv8gdygOLChGL8qDDKjYwxAp" + + "7Ps1yItaYlMzVMjZXfJw1VEPu1H3JKal3MG20Lb4Ke21v2hPhrfnXepCj4gynSfMqZ3LJMfej1iiYZjB" + "Ms7pORCrtdviIo40"; /* * Special thanks to our sponsors and donors: diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index be487fb10..1fecde7d1 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -264,7 +264,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { final Style style = Cluster.getDefaultStyleDefinition(umlDiagramType.getStyleName()) .getMergedStyle(skinParam.getCurrentStyleBuilder()); shadowing = style.value(PName.Shadowing).asDouble(); - stroke = style.getStroke(); + stroke = Cluster.getStrokeInternal(group, skinParam, style); } else { if (group.getUSymbol() == null) { shadowing = skinParam.shadowing2(group.getStereotype(), USymbol.PACKAGE.getSkinParameter()) ? 3 : 0; @@ -272,7 +272,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { shadowing = skinParam.shadowing2(group.getStereotype(), group.getUSymbol().getSkinParameter()) ? 3 : 0; } - stroke = Cluster.getStrokeInternal(group, skinParam); + stroke = Cluster.getStrokeInternal(group, skinParam, null); } HColor backColor = getBackColor(umlDiagramType); backColor = Cluster.getBackColor(backColor, skinParam, group.getStereotype(), diff --git a/src/net/sourceforge/plantuml/error/PSystemError.java b/src/net/sourceforge/plantuml/error/PSystemError.java index 9f52a3b85..349eeb562 100644 --- a/src/net/sourceforge/plantuml/error/PSystemError.java +++ b/src/net/sourceforge/plantuml/error/PSystemError.java @@ -350,7 +350,7 @@ public abstract class PSystemError extends PlainDiagram { final BufferedImage qrcode = smaller( utils.exportFlashcode("http://plantuml.com/dedication", Color.BLACK, backColor.getColor999())); final Display disp = Display.create("Add your own dedication into PlantUML", " ", "For just $5 per month!", - "Details on [[http://plantuml.com/dedication]]"); + "Details on [[https://plantuml.com/dedication]]"); final UFont font = UFont.sansSerif(14); final FontConfiguration fc = new FontConfiguration(font, HColorUtils.BLACK, HColorUtils.BLACK, false); diff --git a/src/net/sourceforge/plantuml/sequencediagram/Note.java b/src/net/sourceforge/plantuml/sequencediagram/Note.java index b18211a17..d32c14076 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Note.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Note.java @@ -142,7 +142,7 @@ final public class Note extends AbstractEvent implements Event, SpecificBackcolo return position; } - final public Colors getColors(ISkinParam skinParam) { + final public Colors getColors() { return colors; } diff --git a/src/net/sourceforge/plantuml/sequencediagram/Participant.java b/src/net/sourceforge/plantuml/sequencediagram/Participant.java index 1f153022d..3e0b98b7d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Participant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Participant.java @@ -82,7 +82,7 @@ public class Participant implements SpecificBackcolorable, WithStyle { } final StyleSignature signature = getDefaultStyleDefinition().with(stereotype); Style tmp = signature.getMergedStyle(styleBuilder); - tmp = tmp.eventuallyOverride(getColors(null)); + tmp = tmp.eventuallyOverride(getColors()); Style stereo = getDefaultStyleDefinition().forStereotypeItself(stereotype).getMergedStyle(styleBuilder); if (tmp != null) { stereo = tmp.mergeWith(stereo); @@ -163,7 +163,7 @@ public class Participant implements SpecificBackcolorable, WithStyle { return liveBackcolors; } - public Colors getColors(ISkinParam skinParam) { + public Colors getColors() { return colors; } @@ -199,7 +199,7 @@ public class Participant implements SpecificBackcolorable, WithStyle { public SkinParamBackcolored getSkinParamBackcolored(ISkinParam skinParam) { final ColorParam param = getColorParam(); - HColor specificBackColor = getColors(skinParam).getColor(ColorType.BACK); + HColor specificBackColor = getColors().getColor(ColorType.BACK); final boolean clickable = getUrl() != null; final HColor stereoBackColor = skinParam.getHtmlColor(getBackgroundColorParam(), getStereotype(), clickable); if (stereoBackColor != null && specificBackColor == null) { diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java index 4e254d7db..238eeda54 100644 --- a/src/net/sourceforge/plantuml/svek/Cluster.java +++ b/src/net/sourceforge/plantuml/svek/Cluster.java @@ -155,7 +155,7 @@ public class Cluster implements Moveable { } this.color = colorSequence.getValue(); this.colorTitle = colorSequence.getValue(); - this.skinParam = group.getColors(skinParam).mute(skinParam); + this.skinParam = group.getColors().mute(skinParam); } @Override @@ -360,11 +360,11 @@ public class Cluster implements Moveable { } final boolean isState = umlDiagramType == UmlDiagramType.STATE; if (isState) { - if (group.getColors(skinParam).getSpecificLineStroke() != null) { - strokeForState = group.getColors(skinParam).getSpecificLineStroke(); + if (group.getColors().getSpecificLineStroke() != null) { + strokeForState = group.getColors().getSpecificLineStroke(); } - if (group.getColors(skinParam).getColor(ColorType.LINE) != null) { - borderColor = group.getColors(skinParam).getColor(ColorType.LINE); + if (group.getColors().getColor(ColorType.LINE) != null) { + borderColor = group.getColors().getColor(ColorType.LINE); } drawUState(ug, borderColor, skinParam2, strokeForState, umlDiagramType, rounded, shadowing); return; @@ -382,9 +382,9 @@ public class Cluster implements Moveable { final UStroke stroke; if (UseStyle.useBetaStyle()) { - stroke = style.getStroke(); + stroke = getStrokeInternal(group, skinParam2, style); } else { - stroke = getStrokeInternal(group, skinParam2); + stroke = getStrokeInternal(group, skinParam2, null); } HColor backColor = getBackColor(umlDiagramType, style); backColor = getBackColor(backColor, skinParam2, group.getStereotype(), umlDiagramType.getStyleName()); @@ -412,11 +412,14 @@ public class Cluster implements Moveable { } - static public UStroke getStrokeInternal(IGroup group, ISkinParam skinParam) { - final Colors colors = group.getColors(skinParam); + static public UStroke getStrokeInternal(IGroup group, ISkinParam skinParam, Style style) { + final Colors colors = group.getColors(); if (colors.getSpecificLineStroke() != null) { return colors.getSpecificLineStroke(); } + if (style != null) { + return style.getStroke(); + } if (group.getUSymbol() != null && group.getUSymbol() != USymbol.PACKAGE) { return group.getUSymbol().getSkinParameter().getStroke(skinParam, group.getStereotype()); } @@ -908,7 +911,7 @@ public class Cluster implements Moveable { if (EntityUtils.groupRoot(group)) { return null; } - final HColor result = group.getColors(skinParam).getColor(ColorType.BACK); + final HColor result = group.getColors().getColor(ColorType.BACK); if (result != null) { return result; } diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java index 238b5f5b0..8d253bed2 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java @@ -137,9 +137,9 @@ public final class GroupPngMakerActivity { if (group.getGroupType() == GroupType.INNER_ACTIVITY) { final Stereotype stereo = group.getStereotype(); final HColor borderColor = getColor(ColorParam.activityBorder, stereo); - final HColor backColor = group.getColors(skinParam).getColor(ColorType.BACK) == null + final HColor backColor = group.getColors().getColor(ColorType.BACK) == null ? getColor(ColorParam.background, stereo) - : group.getColors(skinParam).getColor(ColorType.BACK); + : group.getColors().getColor(ColorType.BACK); final double shadowing; if (UseStyle.useBetaStyle()) { final Style style = getDefaultStyleDefinitionGroup().getMergedStyle(skinParam.getCurrentStyleBuilder()); diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java index 9d2465665..d212de2ef 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java @@ -177,7 +177,7 @@ public final class GroupPngMakerState { throw new UnsupportedOperationException(group.getGroupType().toString()); } - HColor borderColor = group.getColors(skinParam).getColor(ColorType.LINE); + HColor borderColor = group.getColors().getColor(ColorType.LINE); if (borderColor == null) { if (UseStyle.useBetaStyle()) borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(), @@ -186,7 +186,7 @@ public final class GroupPngMakerState { borderColor = getColor(ColorParam.stateBorder, group.getStereotype()); } final Stereotype stereo = group.getStereotype(); - final HColor tmp = group.getColors(skinParam).getColor(ColorType.BACK); + final HColor tmp = group.getColors().getColor(ColorType.BACK); final HColor backColor; if (tmp == null) if (UseStyle.useBetaStyle()) @@ -207,7 +207,7 @@ public final class GroupPngMakerState { final boolean containsOnlyConcurrentStates = containsOnlyConcurrentStates(dotData); final IEntityImage image = containsOnlyConcurrentStates ? buildImageForConcurrentState(dotData) : svek2.buildImage(null, new String[0]); - UStroke stroke = group.getColors(skinParam).getSpecificLineStroke(); + UStroke stroke = group.getColors().getSpecificLineStroke(); if (stroke == null) { stroke = new UStroke(1.5); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java index 87a57c9f7..8a37503b2 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java @@ -160,7 +160,7 @@ public class EntityImageActivity extends AbstractEntityImage { private UGraphic applyColors(UGraphic ug) { HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.activityBorder); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.activityBackground); } @@ -169,7 +169,7 @@ public class EntityImageActivity extends AbstractEntityImage { final Style style = getDefaultStyleDefinition().getMergedStyle(getSkinParam().getCurrentStyleBuilder()); borderColor = style.value(PName.LineColor).asColor(getSkinParam().getThemeStyle(), getSkinParam().getIHtmlColorSet()); - backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), getSkinParam().getIHtmlColorSet()); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index b618d91b8..222523dc0 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -90,7 +90,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi final private LineConfigurable lineConfig; public EntityImageClass(GraphvizVersion version, ILeaf entity, ISkinParam skinParam, PortionShower portionShower) { - super(entity, entity.getColors(skinParam).mute(skinParam)); + super(entity, entity.getColors().mute(skinParam)); this.leafType = entity.getLeafType(); this.lineConfig = entity; if (UseStyle.useBetaStyle()) @@ -165,8 +165,8 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi rect.setDeltaShadow(4); } - HColor classBorder = lineConfig.getColors(getSkinParam()).getColor(ColorType.LINE); - HColor headerBackcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.HEADER); + HColor classBorder = lineConfig.getColors().getColor(ColorType.LINE); + HColor headerBackcolor = getEntity().getColors().getColor(ColorType.HEADER); if (classBorder == null) { if (UseStyle.useBetaStyle()) @@ -175,7 +175,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi else classBorder = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.classBorder); } - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { if (UseStyle.useBetaStyle()) backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), @@ -240,7 +240,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi } private UStroke getStroke() { - UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); + UStroke stroke = lineConfig.getColors().getSpecificLineStroke(); if (stroke == null) { stroke = getSkinParam().getThickness(LineParam.classBorder, getStereo()); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java index 32696a56a..b00cb59fe 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java @@ -107,7 +107,7 @@ public class EntityImageDescription extends AbstractEntityImage { public EntityImageDescription(ILeaf entity, ISkinParam skinParam2, PortionShower portionShower, Collection links, SName styleName, Bibliotekon bibliotekon) { - super(entity, entity.getColors(skinParam2).mute(skinParam2)); + super(entity, entity.getColors().mute(skinParam2)); this.useRankSame = getSkinParam().useRankSame(); this.bibliotekon = bibliotekon; this.fixCircleLabelOverlapping = getSkinParam().fixCircleLabelOverlapping(); @@ -129,7 +129,7 @@ public class EntityImageDescription extends AbstractEntityImage { this.url = entity.getUrl99(); - final Colors colors = entity.getColors(getSkinParam()); + final Colors colors = entity.getColors(); HColor backcolor = colors.getColor(ColorType.BACK); final HColor forecolor; final double roundCorner; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java index 19860430c..d3de17338 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java @@ -101,7 +101,7 @@ public class EntityImageEmptyPackage extends AbstractEntityImage { super(entity, skinParam); this.styleName = styleName; - final Colors colors = entity.getColors(getSkinParam()); + final Colors colors = entity.getColors(); final HColor specificBackColor = colors.getColor(ColorType.BACK); this.stereotype = entity.getStereotype(); final FontConfiguration titleFontConfiguration; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java index b0e880432..a24064bb4 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java @@ -89,7 +89,7 @@ public class EntityImageLollipopInterfaceEye2 extends AbstractEntityImage { this.url = entity.getUrl99(); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack()); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java index ae1cdd338..1822f79bd 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java @@ -172,7 +172,7 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder); ug = ug.apply(borderColor); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { if (UseStyle.useBetaStyle()) backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), @@ -211,7 +211,7 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With } private UStroke getStroke() { - UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); + UStroke stroke = lineConfig.getColors().getSpecificLineStroke(); if (stroke == null) { stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo()); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java index 91c066739..3facfe009 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java @@ -111,11 +111,11 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil { if (UseStyle.useBetaStyle()) { final Style style = getDefaultStyleDefinition(umlDiagramType.getStyleName()) .getMergedStyle(skinParam.getCurrentStyleBuilder()); - if (entity.getColors(getSkinParam()).getColor(ColorType.BACK) == null) { + if (entity.getColors().getColor(ColorType.BACK) == null) { this.noteBackgroundColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); } else { - this.noteBackgroundColor = entity.getColors(getSkinParam()).getColor(ColorType.BACK); + this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK); } this.borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); @@ -125,10 +125,10 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil { horizontalAlignment = style.getHorizontalAlignment(); } else { this.shadowing = skinParam.shadowing(getEntity().getStereotype()) ? 4 : 0; - if (entity.getColors(getSkinParam()).getColor(ColorType.BACK) == null) { + if (entity.getColors().getColor(ColorType.BACK) == null) { this.noteBackgroundColor = rose.getHtmlColor(getSkinParam(), ColorParam.noteBackground); } else { - this.noteBackgroundColor = entity.getColors(getSkinParam()).getColor(ColorType.BACK); + this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK); } this.borderColor = SkinParamUtils.getColor(getSkinParam(), null, ColorParam.noteBorder); @@ -145,15 +145,15 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil { } private static ISkinParam getISkinParam(ISkinParam skinParam, IEntity entity) { - if (entity.getColors(skinParam) != null) { - return entity.getColors(skinParam).mute(skinParam); + if (entity.getColors() != null) { + return entity.getColors().mute(skinParam); } return skinParam; } static ISkinParam getSkin(ISkinParam skinParam, IEntity entity) { final Stereotype stereotype = entity.getStereotype(); - HColor back = entity.getColors(skinParam).getColor(ColorType.BACK); + HColor back = entity.getColors().getColor(ColorType.BACK); if (back != null) { return new SkinParamBackcolored(skinParam, back); } @@ -247,7 +247,7 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil { opale.setRoundCorner(getRoundCorner()); opale.setOpale(strategy, pp1, projection); final UGraphic stroked = applyStroke(ug2); - opale.drawU(Colors.applyStroke(stroked, getEntity().getColors(skinParam))); + opale.drawU(Colors.applyStroke(stroked, getEntity().getColors())); } if (url != null) { ug.closeUrl(); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java index f299f1a51..8c113bfe0 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java @@ -170,7 +170,7 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil { final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder); ug = ug.apply(borderColor); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { if (UseStyle.useBetaStyle()) backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), @@ -207,7 +207,7 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil { } private UStroke getStroke() { - UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); + UStroke stroke = lineConfig.getColors().getSpecificLineStroke(); if (stroke == null) { stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo()); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java index 8467bfde7..32f50b128 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java @@ -99,7 +99,7 @@ public class EntityImagePort extends AbstractEntityImageBorder { ug = ug.apply(new UStroke(1.5)) .apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder).bg()); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java index 203a16f2f..87a1869c6 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java @@ -74,7 +74,7 @@ public class EntityImageState2 extends AbstractEntityImage { final USymbol symbol = USymbol.FRAME; - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack()); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java index 181f8f3c5..da07ed304 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java @@ -82,7 +82,7 @@ public class EntityImageStateBorder extends AbstractEntityImageBorder { ug = ug.apply(new UStroke(1.5)) .apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder)); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java index 2cc1e4b7e..0fe71e9c6 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java @@ -100,7 +100,7 @@ public abstract class EntityImageStateCommon extends AbstractEntityImage { } final protected UStroke getStroke() { - UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); + UStroke stroke = lineConfig.getColors().getSpecificLineStroke(); if (stroke == null) { stroke = new UStroke(1.5); } @@ -130,7 +130,7 @@ public abstract class EntityImageStateCommon extends AbstractEntityImage { final protected UGraphic applyColor(UGraphic ug) { - HColor classBorder = lineConfig.getColors(getSkinParam()).getColor(ColorType.LINE); + HColor classBorder = lineConfig.getColors().getColor(ColorType.LINE); if (classBorder == null) { if (UseStyle.useBetaStyle()) classBorder = getStyleState().value(PName.LineColor).asColor(getSkinParam().getThemeStyle(), @@ -139,7 +139,7 @@ public abstract class EntityImageStateCommon extends AbstractEntityImage { classBorder = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder); } ug = ug.apply(getStroke()).apply(classBorder); - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { if (UseStyle.useBetaStyle()) backcolor = getStyleState().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java index a9cbca787..2639c506a 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java @@ -93,12 +93,12 @@ public class EntityImageTips extends AbstractEntityImage { final Style style = getDefaultStyleDefinition(type.getStyleName()) .getMergedStyle(skinParam.getCurrentStyleBuilder()); - if (entity.getColors(skinParam).getColor(ColorType.BACK) == null) { + if (entity.getColors().getColor(ColorType.BACK) == null) { this.noteBackgroundColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); } else { - this.noteBackgroundColor = entity.getColors(skinParam).getColor(ColorType.BACK); + this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK); } this.borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(), @@ -106,10 +106,10 @@ public class EntityImageTips extends AbstractEntityImage { } else { - if (entity.getColors(skinParam).getColor(ColorType.BACK) == null) { + if (entity.getColors().getColor(ColorType.BACK) == null) { this.noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground); } else { - this.noteBackgroundColor = entity.getColors(skinParam).getColor(ColorType.BACK); + this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK); } this.borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java index 14fe98e87..a836d5411 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java @@ -86,7 +86,7 @@ public class EntityImageUseCase extends AbstractEntityImage { final private Url url; public EntityImageUseCase(ILeaf entity, ISkinParam skinParam2, PortionShower portionShower) { - super(entity, entity.getColors(skinParam2).mute(skinParam2)); + super(entity, entity.getColors().mute(skinParam2)); final Stereotype stereotype = entity.getStereotype(); final HorizontalAlignment align; @@ -126,7 +126,7 @@ public class EntityImageUseCase extends AbstractEntityImage { if (stroke == null) { stroke = new UStroke(1.5); } - final Colors colors = getEntity().getColors(getSkinParam()); + final Colors colors = getEntity().getColors(); stroke = colors.muteStroke(stroke); return stroke; } @@ -196,11 +196,11 @@ public class EntityImageUseCase extends AbstractEntityImage { } private HColor getBackColor() { - HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); + HColor backcolor = getEntity().getColors().getColor(ColorType.BACK); if (backcolor == null) { if (UseStyle.useBetaStyle()) { Style style = getStyle(); - final Colors colors = getEntity().getColors(getSkinParam()); + final Colors colors = getEntity().getColors(); style = style.eventuallyOverride(colors); backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), getSkinParam().getIHtmlColorSet()); @@ -220,7 +220,7 @@ public class EntityImageUseCase extends AbstractEntityImage { } private HColor getLineColor() { - HColor linecolor = getEntity().getColors(getSkinParam()).getColor(ColorType.LINE); + HColor linecolor = getEntity().getColors().getColor(ColorType.LINE); if (linecolor == null) { if (UseStyle.useBetaStyle()) { final Style style = getStyle(); diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 0897f7fbc..94e364c5b 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -80,7 +80,7 @@ public class Version { } public static int beta() { - final int beta = 0; + final int beta = 1; return beta; }