octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-01 17:24:01 +00:00
Code Issues Releases Wiki Activity

Fix style border issue

Browse Source
This commit is contained in:
Arnaud Roques 2021-11-15 19:27:27 +01:00
parent ef5fb58106
commit 4e0e244db8
34 changed files with 101 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sourceforge/plantuml/LineConfigurable.java
View File

@ -41,7 +41,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor;
public interface LineConfigurable { public interface LineConfigurable {
public Colors getColors(ISkinParam skinParam); public Colors getColors();
public void setSpecificColorTOBEREMOVED(ColorType type, HColor color); public void setSpecificColorTOBEREMOVED(ColorType type, HColor color);

2
src/net/sourceforge/plantuml/SpecificBackcolorable.java
View File

@ -39,7 +39,7 @@ import net.sourceforge.plantuml.graphic.color.Colors;
public interface SpecificBackcolorable { public interface SpecificBackcolorable {
public Colors getColors(ISkinParam skinParam); public Colors getColors();
// public void setSpecificColorTOBEREMOVED(ColorType type, HtmlColor color); // public void setSpecificColorTOBEREMOVED(ColorType type, HtmlColor color);

3
src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java
View File

@ -35,7 +35,6 @@
*/ */
package net.sourceforge.plantuml.activitydiagram3.ftile; package net.sourceforge.plantuml.activitydiagram3.ftile;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.SpecificBackcolorable; import net.sourceforge.plantuml.SpecificBackcolorable;
import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.ColorType;
@ -87,7 +86,7 @@ public class Swimlane implements SpecificBackcolorable {
this.actualWidth = actualWidth; this.actualWidth = actualWidth;
} }
public Colors getColors(ISkinParam skinParam) { public Colors getColors() {
return colors; return colors;
} }

2
src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java
View File

@ -306,7 +306,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable
final LaneDivider divider1 = dividers.get(i); final LaneDivider divider1 = dividers.get(i);
final double xpos = swimlane.getTranslate().getDx() + swimlane.getMinMax().getMinX(); 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) { if (back != null) {
final LaneDivider divider2 = dividers.get(i + 1); final LaneDivider divider2 = dividers.get(i + 1);
final UGraphic background = ug.apply(back.bg()).apply(back) final UGraphic background = ug.apply(back.bg()).apply(back)

2
src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java
View File

@ -269,7 +269,7 @@ public class GroupRoot implements IGroup {
} }
@Override @Override
public Colors getColors(ISkinParam skinParam) { public Colors getColors() {
return Colors.empty(); return Colors.empty();
} }

6
src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java
View File

@ -124,20 +124,20 @@ public final class EntityFactory {
final USymbol symbol = g.getUSymbol(); final USymbol symbol = g.getUSymbol();
folder.setUSymbol(symbol); folder.setUSymbol(symbol);
folder.setStereotype(g.getStereotype()); folder.setStereotype(g.getStereotype());
folder.setColors(g.getColors(skinParam)); folder.setColors(g.getColors());
if (g.getUrl99() != null) { if (g.getUrl99() != null) {
folder.addUrl(g.getUrl99()); folder.addUrl(g.getUrl99());
} }
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
// System.err.println("Backcolor ?"); // System.err.println("Backcolor ?");
} else { } 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 ColorParam param = symbol == null ? ColorParam.packageBackground : symbol.getColorParamBack();
final HColor c1 = skinParam.getHtmlColor(param, g.getStereotype(), false); final HColor c1 = skinParam.getHtmlColor(param, g.getStereotype(), false);
folder.setSpecificColorTOBEREMOVED(ColorType.BACK, folder.setSpecificColorTOBEREMOVED(ColorType.BACK,
c1 == null ? skinParam.getBackgroundColor() : c1); c1 == null ? skinParam.getBackgroundColor() : c1);
} else { } else {
folder.setSpecificColorTOBEREMOVED(ColorType.BACK, g.getColors(skinParam).getColor(ColorType.BACK)); folder.setSpecificColorTOBEREMOVED(ColorType.BACK, g.getColors().getColor(ColorType.BACK));
} }
} }
emptyGroupsAsNode.put(g, folder); emptyGroupsAsNode.put(g, folder);

2
src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java
View File

@ -714,7 +714,7 @@ final public class EntityImpl implements ILeaf, IGroup {
private Colors colors = Colors.empty(); private Colors colors = Colors.empty();
public Colors getColors(ISkinParam skinParam) { public Colors getColors() {
return colors; return colors;
} }

2
src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java
View File

@ -127,7 +127,7 @@ public class EntityImageDesignedDomain extends AbstractEntityImage {
URectangle rect2 = new URectangle(4, heightTotal); URectangle rect2 = new URectangle(4, heightTotal);
ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.designedBorder)); 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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.designedBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.designedBackground);
} }

2
src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java
View File

@ -129,7 +129,7 @@ public class EntityImageDomain extends AbstractEntityImage {
final URectangle rect = new URectangle(widthTotal, heightTotal); final URectangle rect = new URectangle(widthTotal, heightTotal);
ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.domainBorder)); 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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.domainBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.domainBackground);
} }

2
src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java
View File

@ -126,7 +126,7 @@ public class EntityImageMachine extends AbstractEntityImage {
URectangle rect2 = new URectangle(4, heightTotal); URectangle rect2 = new URectangle(4, heightTotal);
ug = ug.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.machineBorder)); 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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.machineBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.machineBackground);
} }

4
src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java
View File

@ -117,12 +117,12 @@ public class EntityImageRequirement extends AbstractEntityImage {
} }
ug = ug.apply(getStroke()); ug = ug.apply(getStroke());
HColor linecolor = getEntity().getColors(getSkinParam()).getColor(ColorType.LINE); HColor linecolor = getEntity().getColors().getColor(ColorType.LINE);
if (linecolor == null) { if (linecolor == null) {
linecolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBorder); linecolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBorder);
} }
ug = ug.apply(linecolor); ug = ug.apply(linecolor);
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.requirementBackground);
} }

46
src/net/sourceforge/plantuml/donors/PSystemDonors.java
View File

@ -70,29 +70,29 @@ public class PSystemDonors extends PlainDiagram {
private static final int COLS = 6; private static final int COLS = 6;
private static final int FREE_LINES = 6; private static final int FREE_LINES = 6;
public static final String DONORS = "6sOE03mSS7Dt1Og5J5Uh3hcJits4ZufNcNRmsK-DFu8Mfx004WGrllMtt9JI0K46z1ewUipjEptkDz9V" public static final String DONORS = "6t4E03mSS7Dt1Og5J5Uh3hcJits4ZufNcNRmsK-DFu8Mfx004WGrllMtt9JI0K46z1ewUipjEptkDz9V"
+ "H5UwzqqpHgtN9kKCeleWw07lRWljG-b_VH3cB7aHt9aIN40AYEBeOlcHRkGuVL9bI2baDAVOxcNAl5uX" + "H5UwzqqpHgtN9kKCeleWw07lRWljG-b_VH3cB7aHt9aIN40AYEBeOlcHRkGuVL9bI2baDAVOxcLYNg-G"
+ "bL9y_if7w1Ducpuwpvr6qQZ_14uVjNqKUr_pyskkhY4MYkLvWX8ewJ8XtKt-nzoQwNi_RQJZ9_3xf44L" + "IYa-V-KZz1F8fg3pd6aKYPeNE3rg-odslkRdrrnTGomKo_C49L3IPKAwwSFSckbxFssauoVm-wH15OkY"
+ "Yw8jtPQiaJOTOzxNjG0TqwxLSYOVJMfMnRYhIB6FHXfsaKneoyNaS-H5dpJ-g9lm4VN8a8ow0ZhBwkZy" + "BTsMh94s7MFUrxK07TEkrN8c7qrgLiMugaYnZauQLf5CQCl5v7FaHPyq_gWtuIFgaI4PTGLqbjNHzNDl"
+ "kRUlxudvbui-ucG9lg5eWH6m7bcBQ74UUj2mSC3GiejYR5NXo9DqIEH12tdpZy8KHahEBeERXbK38EpU" + "NzyJyoyNVSJ957n3KGCZO3soDj7YFFIWOUA0eMKNnTYgmf4dwP38WnRouH-5AOoKd5q6Dmsp1a1OlGCL"
+ "WGeaEQXD3MSx3mEgJB55NmWtNUeFbixxibAgq9M6Pn8RAnErW2f5OeCkwCwSjw-cQlK0HwIdH2riFShd" + "H79GcnhETXm6L9bYYxuGRhhKtrWwxyjAgK9N6fv9RCnCr0Ah58aDkg4xSzs-cger0XoHdXAriFKed-FO"
+ "EFRI3olwffSImVhQEYnBy5UKiakfwRXzf_hTfmHmXBHyvyEO8fGJQCfW2cNyMe76LUYkjM2BZgiSBAH3" + "Ip-iw9jUIWJhQ-kqBC5VKSekfQRZzftgTvyIm17IyfqFOufGJg0fWocKyMi56LUXkzQ2BJgkSh2G1b4V"
+ "rCSjDdtOt7XeHOHZCgL2hUENiPrgXJzqAS7693m95lAUzgNK0WussQf92-0BhKfwx7m1oL3mSj3ZE_w-" + "jxZfm-R6GoiY79Cf5MeTlupjL2lyeSiMR4p2as1nlwTzARM0Gqssgj82-4AhaXuxNq0o5BmSzFYEl-yT"
+ "TxYcKfAy8T56E4FIJy-p7SrG2D2nPSo6RgR0OjnbLM-n1H7iKJewG3j2qWbdyt7PctsGVkKd0Dv2GdIx" + "hgcK96z8j17EaFJRysn7CnO2T6mPiw6RAR0OTrdLMsn1X7gKZWxGMaW6uMnkbxtP1-aZFm7m5XAYsstY"
+ "JHpjuDzVkZ9rv29D97HJ6Yk0jQSLTT6mUGI3Mar5DsDACBsDSzpfex7F6SUQPT4cpriDniXlrEcAXUKo" + "Q0T_VcdAr96BD97GJMci05QVLjHDm-8H36er5TsCAS7qDivnfLjZ7okELSkYJPwt6eo9twZJ51lBPIeo"
+ "5PbkMAcdDnU-OzjBknJtoHYykjqdHrq5k9HxJzcuzuiCnBcQ35IAJ7Uy-vktB3C8YrdySxs2qhDc3suU" + "tR1I3sykVCUsbtOfxfCnU7MxJ_Qw2cWfzvvouzulCX3dQZ9GAJBTyUvllcMPGLZCuf_h5PIUDNjoyz2T"
+ "kZFOpcBHCcQsClMG5S3WK99gVIGQIuYHtWx85lYr4Jq2oAznf0OFC_BWzMF9DTKSqx3OP14ZcuJ8jZQl" + "mNOMYvOnivMfXwm01eUILEiZqLX2ZFIsGxR0hute4K1-ZICbU9YH1wyVIwwfvfY6oIQBwDaYHBQrUSNU"
+ "s3k7SXwmv-LFScIKIBduwb58oE_OM4IqojeeRTYOxmeyGr8KvEMyUrOzmRywC7K1rQcY82WjMAiajA-U" + "sPNpW3qlVv8ZeqJAnLUFGa9-nyOYebNMHcd3vdnNu1btYgAyd7VFgYVuLmrJ5r2TAWg2qeArIaBxwlK0"
+ "3v21UsSzIos9CrvnOK7TwdPWcg3uIXHjFRc1OWhC314-CF14Cf2LiakV617uxe-xpIEb3ktusvTTZ8Ea" + "6RftrhFKaZZZ5ISMbBqk1uO4fLUYQEl13O0fD3D4yC304s4WAsMNDZ4YyDqVTvldBdMenzy-xM8S8jqb"
+ "kIG6gY3Xr3TK4mtM7k78Uel_VsxTO2V-_5zhskJKRi_UGn0zWOG0X7k18UC24E8fyFLcmnp0AIm9qK72" + "2L05X5DUK4qqM4U48-ij_l-vTuET-FD_hMcJKxkzzps4q1D8242u5neoBW0XdW9V7pRC0Pp2aX2T95ov"
+ "bQlMdWUY6Ena37PHTompgZT-PxaPkMdjzKDLdffIL3Zf1x9V18lskgPKwJO4dMgoFxmHBd8mjd-9AhDI" + "Qkrv88h1JiPW5tNxCgDoutUMcv6Rrbu_LEMfAKM5atuW-qKmQAzpIPNkGz2fx77V-KQuoC7O_YMgp4fn"
+ "tBlAQ4Tb97mIYZY-u_HoG3EM3j22DL17WNztVrOMQXfhlqAfF9m0-MP3KgcPheNLbjR6Gc2ZNDZVMxTJ" + "xogZxPMHy4aeulYEqyi1pLWOe0Phe8u2_-x-h2pKDDP-HL9vE03vPaDIgPckHTMMriP6OAESsDzRirFE"
+ "pipFoi0-XzM5uweUsWOfRgGOKVWsA2xF21CpYQI927PFoOa78tpZGRwe5afYQLkxdJbO8VzZFuOt4WxP" + "pC_Am3wxrONpgXxQ9Ybkf1XH-DOfBiy84pE9f8a8Ta_9YGSZVED1lgWMIs9fMxkTCLWX_sC_XZSI3jaX"
+ "8GrqwZ6bFDs07BP9zx5Le3-Gzn0UoCHYdQui5aebF90YAPYhM2Oof4sq6UVs1Z0e2iR_znQKAqmqFw7P" + "3JJgCQKytO0SjadtiLMWFuZt41x8mcATxYmMIoKyaY8fdAjO9ZAaJxGPv_O6CIWAn__t5fGhJ3G_eTcb"
+ "fLOsahaCQpSf8FAX_iuIM-HihKZ7lhlciitJS_lM9XFisF_0ZvzlVrJTV1C1TKHt9NZTFiY76zjKLx15" + "TdQIkNHhDoaWyg7-pf9Qv6ojoC2-g-QopSjp-zOc4-pO_y2Fdsz_LDry4m4uegiIl6utyk765jKLR45v"
+ "ovibtCTbiMuclunBqIvH3MpUTpPgA9k1Gaf2Y7WWL4XVutvDVyAMSu5yUlrbBWpKy3nH3JruRWPMa6qq" + "iuJxk2pMpUINSIdQ9Qg1pVlEHWsm6Iga98A81w12U8txDVq9Myu5yktrbxamKiFpU3NqpAUx0ol8DXfU"
+ "l4eQKBt8ujpwVijDtZcGEV7OuC8gOwU7EJrQPgXjDsssa44bSkUAiPx1x1ubLJwLCQYKhgaQ2sgMXDPb" + "9GsgNcHnR7s_vIRl7CYSU6nmOPMnqyES7YqprBQRDbl8e9AuSyLOps1sZv8gdygOLChGL8qDDKjYwxAp"
+ "PmSw0-Cjv8hvlNrhOGQN-YNcCy4f1fgINXh8X0Pa4Kb13KHNoNxLYZEaPwPLuYrMjfA6gMvKGwFTO57S" + "aIUUpER31W00"; + "7Ps1yItaYlMzVMjZXfJw1VEPu1H3JKal3MG20Lb4Ke21v2hPhrfnXepCj4gynSfMqZ3LJMfej1iiYZjB" + "Ms7pORCrtdviIo40";
/* /*
* Special thanks to our sponsors and donors: * Special thanks to our sponsors and donors:

4
src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java
View File

@ -264,7 +264,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
final Style style = Cluster.getDefaultStyleDefinition(umlDiagramType.getStyleName()) final Style style = Cluster.getDefaultStyleDefinition(umlDiagramType.getStyleName())
.getMergedStyle(skinParam.getCurrentStyleBuilder()); .getMergedStyle(skinParam.getCurrentStyleBuilder());
shadowing = style.value(PName.Shadowing).asDouble(); shadowing = style.value(PName.Shadowing).asDouble();
stroke = style.getStroke(); stroke = Cluster.getStrokeInternal(group, skinParam, style);
} else { } else {
if (group.getUSymbol() == null) { if (group.getUSymbol() == null) {
shadowing = skinParam.shadowing2(group.getStereotype(), USymbol.PACKAGE.getSkinParameter()) ? 3 : 0; 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 shadowing = skinParam.shadowing2(group.getStereotype(), group.getUSymbol().getSkinParameter()) ? 3
: 0; : 0;
} }
stroke = Cluster.getStrokeInternal(group, skinParam); stroke = Cluster.getStrokeInternal(group, skinParam, null);
} }
HColor backColor = getBackColor(umlDiagramType); HColor backColor = getBackColor(umlDiagramType);
backColor = Cluster.getBackColor(backColor, skinParam, group.getStereotype(), backColor = Cluster.getBackColor(backColor, skinParam, group.getStereotype(),

2
src/net/sourceforge/plantuml/error/PSystemError.java
View File

@ -350,7 +350,7 @@ public abstract class PSystemError extends PlainDiagram {
final BufferedImage qrcode = smaller( final BufferedImage qrcode = smaller(
utils.exportFlashcode("http://plantuml.com/dedication", Color.BLACK, backColor.getColor999())); utils.exportFlashcode("http://plantuml.com/dedication", Color.BLACK, backColor.getColor999()));
final Display disp = Display.create("<b>Add your own dedication into PlantUML", " ", "For just $5 per month!", final Display disp = Display.create("<b>Add your own dedication into PlantUML", " ", "For just $5 per month!",
"Details on <i>[[http://plantuml.com/dedication]]"); "Details on <i>[[https://plantuml.com/dedication]]");
final UFont font = UFont.sansSerif(14); final UFont font = UFont.sansSerif(14);
final FontConfiguration fc = new FontConfiguration(font, HColorUtils.BLACK, HColorUtils.BLACK, false); final FontConfiguration fc = new FontConfiguration(font, HColorUtils.BLACK, HColorUtils.BLACK, false);

2
src/net/sourceforge/plantuml/sequencediagram/Note.java
View File

@ -142,7 +142,7 @@ final public class Note extends AbstractEvent implements Event, SpecificBackcolo
return position; return position;
} }
final public Colors getColors(ISkinParam skinParam) { final public Colors getColors() {
return colors; return colors;
} }

6
src/net/sourceforge/plantuml/sequencediagram/Participant.java
View File

@ -82,7 +82,7 @@ public class Participant implements SpecificBackcolorable, WithStyle {
} }
final StyleSignature signature = getDefaultStyleDefinition().with(stereotype); final StyleSignature signature = getDefaultStyleDefinition().with(stereotype);
Style tmp = signature.getMergedStyle(styleBuilder); Style tmp = signature.getMergedStyle(styleBuilder);
tmp = tmp.eventuallyOverride(getColors(null)); tmp = tmp.eventuallyOverride(getColors());
Style stereo = getDefaultStyleDefinition().forStereotypeItself(stereotype).getMergedStyle(styleBuilder); Style stereo = getDefaultStyleDefinition().forStereotypeItself(stereotype).getMergedStyle(styleBuilder);
if (tmp != null) { if (tmp != null) {
stereo = tmp.mergeWith(stereo); stereo = tmp.mergeWith(stereo);
@ -163,7 +163,7 @@ public class Participant implements SpecificBackcolorable, WithStyle {
return liveBackcolors; return liveBackcolors;
} }
public Colors getColors(ISkinParam skinParam) { public Colors getColors() {
return colors; return colors;
} }
@ -199,7 +199,7 @@ public class Participant implements SpecificBackcolorable, WithStyle {
public SkinParamBackcolored getSkinParamBackcolored(ISkinParam skinParam) { public SkinParamBackcolored getSkinParamBackcolored(ISkinParam skinParam) {
final ColorParam param = getColorParam(); final ColorParam param = getColorParam();
HColor specificBackColor = getColors(skinParam).getColor(ColorType.BACK); HColor specificBackColor = getColors().getColor(ColorType.BACK);
final boolean clickable = getUrl() != null; final boolean clickable = getUrl() != null;
final HColor stereoBackColor = skinParam.getHtmlColor(getBackgroundColorParam(), getStereotype(), clickable); final HColor stereoBackColor = skinParam.getHtmlColor(getBackgroundColorParam(), getStereotype(), clickable);
if (stereoBackColor != null && specificBackColor == null) { if (stereoBackColor != null && specificBackColor == null) {

23
src/net/sourceforge/plantuml/svek/Cluster.java
View File

@ -155,7 +155,7 @@ public class Cluster implements Moveable {
} }
this.color = colorSequence.getValue(); this.color = colorSequence.getValue();
this.colorTitle = colorSequence.getValue(); this.colorTitle = colorSequence.getValue();
this.skinParam = group.getColors(skinParam).mute(skinParam); this.skinParam = group.getColors().mute(skinParam);
} }
@Override @Override
@ -360,11 +360,11 @@ public class Cluster implements Moveable {
} }
final boolean isState = umlDiagramType == UmlDiagramType.STATE; final boolean isState = umlDiagramType == UmlDiagramType.STATE;
if (isState) { if (isState) {
if (group.getColors(skinParam).getSpecificLineStroke() != null) { if (group.getColors().getSpecificLineStroke() != null) {
strokeForState = group.getColors(skinParam).getSpecificLineStroke(); strokeForState = group.getColors().getSpecificLineStroke();
} }
if (group.getColors(skinParam).getColor(ColorType.LINE) != null) { if (group.getColors().getColor(ColorType.LINE) != null) {
borderColor = group.getColors(skinParam).getColor(ColorType.LINE); borderColor = group.getColors().getColor(ColorType.LINE);
} }
drawUState(ug, borderColor, skinParam2, strokeForState, umlDiagramType, rounded, shadowing); drawUState(ug, borderColor, skinParam2, strokeForState, umlDiagramType, rounded, shadowing);
return; return;
@ -382,9 +382,9 @@ public class Cluster implements Moveable {
final UStroke stroke; final UStroke stroke;
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
stroke = style.getStroke(); stroke = getStrokeInternal(group, skinParam2, style);
} else { } else {
stroke = getStrokeInternal(group, skinParam2); stroke = getStrokeInternal(group, skinParam2, null);
} }
HColor backColor = getBackColor(umlDiagramType, style); HColor backColor = getBackColor(umlDiagramType, style);
backColor = getBackColor(backColor, skinParam2, group.getStereotype(), umlDiagramType.getStyleName()); 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) { static public UStroke getStrokeInternal(IGroup group, ISkinParam skinParam, Style style) {
final Colors colors = group.getColors(skinParam); final Colors colors = group.getColors();
if (colors.getSpecificLineStroke() != null) { if (colors.getSpecificLineStroke() != null) {
return colors.getSpecificLineStroke(); return colors.getSpecificLineStroke();
} }
if (style != null) {
return style.getStroke();
}
if (group.getUSymbol() != null && group.getUSymbol() != USymbol.PACKAGE) { if (group.getUSymbol() != null && group.getUSymbol() != USymbol.PACKAGE) {
return group.getUSymbol().getSkinParameter().getStroke(skinParam, group.getStereotype()); return group.getUSymbol().getSkinParameter().getStroke(skinParam, group.getStereotype());
} }
@ -908,7 +911,7 @@ public class Cluster implements Moveable {
if (EntityUtils.groupRoot(group)) { if (EntityUtils.groupRoot(group)) {
return null; return null;
} }
final HColor result = group.getColors(skinParam).getColor(ColorType.BACK); final HColor result = group.getColors().getColor(ColorType.BACK);
if (result != null) { if (result != null) {
return result; return result;
} }

4
src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java
View File

@ -137,9 +137,9 @@ public final class GroupPngMakerActivity {
if (group.getGroupType() == GroupType.INNER_ACTIVITY) { if (group.getGroupType() == GroupType.INNER_ACTIVITY) {
final Stereotype stereo = group.getStereotype(); final Stereotype stereo = group.getStereotype();
final HColor borderColor = getColor(ColorParam.activityBorder, stereo); 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) ? getColor(ColorParam.background, stereo)
: group.getColors(skinParam).getColor(ColorType.BACK); : group.getColors().getColor(ColorType.BACK);
final double shadowing; final double shadowing;
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
final Style style = getDefaultStyleDefinitionGroup().getMergedStyle(skinParam.getCurrentStyleBuilder()); final Style style = getDefaultStyleDefinitionGroup().getMergedStyle(skinParam.getCurrentStyleBuilder());

6
src/net/sourceforge/plantuml/svek/GroupPngMakerState.java
View File

@ -177,7 +177,7 @@ public final class GroupPngMakerState {
throw new UnsupportedOperationException(group.getGroupType().toString()); 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 (borderColor == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(), borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(),
@ -186,7 +186,7 @@ public final class GroupPngMakerState {
borderColor = getColor(ColorParam.stateBorder, group.getStereotype()); borderColor = getColor(ColorParam.stateBorder, group.getStereotype());
} }
final Stereotype stereo = 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; final HColor backColor;
if (tmp == null) if (tmp == null)
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
@ -207,7 +207,7 @@ public final class GroupPngMakerState {
final boolean containsOnlyConcurrentStates = containsOnlyConcurrentStates(dotData); final boolean containsOnlyConcurrentStates = containsOnlyConcurrentStates(dotData);
final IEntityImage image = containsOnlyConcurrentStates ? buildImageForConcurrentState(dotData) final IEntityImage image = containsOnlyConcurrentStates ? buildImageForConcurrentState(dotData)
: svek2.buildImage(null, new String[0]); : svek2.buildImage(null, new String[0]);
UStroke stroke = group.getColors(skinParam).getSpecificLineStroke(); UStroke stroke = group.getColors().getSpecificLineStroke();
if (stroke == null) { if (stroke == null) {
stroke = new UStroke(1.5); stroke = new UStroke(1.5);
} }

4
src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java
View File

@ -160,7 +160,7 @@ public class EntityImageActivity extends AbstractEntityImage {
private UGraphic applyColors(UGraphic ug) { private UGraphic applyColors(UGraphic ug) {
HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.activityBorder); 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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.activityBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.activityBackground);
} }
@ -169,7 +169,7 @@ public class EntityImageActivity extends AbstractEntityImage {
final Style style = getDefaultStyleDefinition().getMergedStyle(getSkinParam().getCurrentStyleBuilder()); final Style style = getDefaultStyleDefinition().getMergedStyle(getSkinParam().getCurrentStyleBuilder());
borderColor = style.value(PName.LineColor).asColor(getSkinParam().getThemeStyle(), borderColor = style.value(PName.LineColor).asColor(getSkinParam().getThemeStyle(),
getSkinParam().getIHtmlColorSet()); getSkinParam().getIHtmlColorSet());
backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),
getSkinParam().getIHtmlColorSet()); getSkinParam().getIHtmlColorSet());

10
src/net/sourceforge/plantuml/svek/image/EntityImageClass.java
View File

@ -90,7 +90,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi
final private LineConfigurable lineConfig; final private LineConfigurable lineConfig;
public EntityImageClass(GraphvizVersion version, ILeaf entity, ISkinParam skinParam, PortionShower portionShower) { 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.leafType = entity.getLeafType();
this.lineConfig = entity; this.lineConfig = entity;
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
@ -165,8 +165,8 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi
rect.setDeltaShadow(4); rect.setDeltaShadow(4);
} }
HColor classBorder = lineConfig.getColors(getSkinParam()).getColor(ColorType.LINE); HColor classBorder = lineConfig.getColors().getColor(ColorType.LINE);
HColor headerBackcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.HEADER); HColor headerBackcolor = getEntity().getColors().getColor(ColorType.HEADER);
if (classBorder == null) { if (classBorder == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
@ -175,7 +175,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi
else else
classBorder = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.classBorder); 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 (backcolor == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),
@ -240,7 +240,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi
} }
private UStroke getStroke() { private UStroke getStroke() {
UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); UStroke stroke = lineConfig.getColors().getSpecificLineStroke();
if (stroke == null) { if (stroke == null) {
stroke = getSkinParam().getThickness(LineParam.classBorder, getStereo()); stroke = getSkinParam().getThickness(LineParam.classBorder, getStereo());
} }

4
src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java
View File

@ -107,7 +107,7 @@ public class EntityImageDescription extends AbstractEntityImage {
public EntityImageDescription(ILeaf entity, ISkinParam skinParam2, PortionShower portionShower, public EntityImageDescription(ILeaf entity, ISkinParam skinParam2, PortionShower portionShower,
Collection<Link> links, SName styleName, Bibliotekon bibliotekon) { Collection<Link> links, SName styleName, Bibliotekon bibliotekon) {
super(entity, entity.getColors(skinParam2).mute(skinParam2)); super(entity, entity.getColors().mute(skinParam2));
this.useRankSame = getSkinParam().useRankSame(); this.useRankSame = getSkinParam().useRankSame();
this.bibliotekon = bibliotekon; this.bibliotekon = bibliotekon;
this.fixCircleLabelOverlapping = getSkinParam().fixCircleLabelOverlapping(); this.fixCircleLabelOverlapping = getSkinParam().fixCircleLabelOverlapping();
@ -129,7 +129,7 @@ public class EntityImageDescription extends AbstractEntityImage {
this.url = entity.getUrl99(); this.url = entity.getUrl99();
final Colors colors = entity.getColors(getSkinParam()); final Colors colors = entity.getColors();
HColor backcolor = colors.getColor(ColorType.BACK); HColor backcolor = colors.getColor(ColorType.BACK);
final HColor forecolor; final HColor forecolor;
final double roundCorner; final double roundCorner;

2
src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java
View File

@ -101,7 +101,7 @@ public class EntityImageEmptyPackage extends AbstractEntityImage {
super(entity, skinParam); super(entity, skinParam);
this.styleName = styleName; this.styleName = styleName;
final Colors colors = entity.getColors(getSkinParam()); final Colors colors = entity.getColors();
final HColor specificBackColor = colors.getColor(ColorType.BACK); final HColor specificBackColor = colors.getColor(ColorType.BACK);
this.stereotype = entity.getStereotype(); this.stereotype = entity.getStereotype();
final FontConfiguration titleFontConfiguration; final FontConfiguration titleFontConfiguration;

2
src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java
View File

@ -89,7 +89,7 @@ public class EntityImageLollipopInterfaceEye2 extends AbstractEntityImage {
this.url = entity.getUrl99(); this.url = entity.getUrl99();
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack()); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack());
} }

4
src/net/sourceforge/plantuml/svek/image/EntityImageMap.java
View File

@ -172,7 +172,7 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With
final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder); final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder);
ug = ug.apply(borderColor); ug = ug.apply(borderColor);
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),
@ -211,7 +211,7 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With
} }
private UStroke getStroke() { private UStroke getStroke() {
UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); UStroke stroke = lineConfig.getColors().getSpecificLineStroke();
if (stroke == null) { if (stroke == null) {
stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo()); stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo());
} }

16
src/net/sourceforge/plantuml/svek/image/EntityImageNote.java
View File

@ -111,11 +111,11 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil {
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
final Style style = getDefaultStyleDefinition(umlDiagramType.getStyleName()) final Style style = getDefaultStyleDefinition(umlDiagramType.getStyleName())
.getMergedStyle(skinParam.getCurrentStyleBuilder()); .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(), this.noteBackgroundColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
skinParam.getIHtmlColorSet()); skinParam.getIHtmlColorSet());
} else { } 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(), this.borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
skinParam.getIHtmlColorSet()); skinParam.getIHtmlColorSet());
@ -125,10 +125,10 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil {
horizontalAlignment = style.getHorizontalAlignment(); horizontalAlignment = style.getHorizontalAlignment();
} else { } else {
this.shadowing = skinParam.shadowing(getEntity().getStereotype()) ? 4 : 0; 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); this.noteBackgroundColor = rose.getHtmlColor(getSkinParam(), ColorParam.noteBackground);
} else { } else {
this.noteBackgroundColor = entity.getColors(getSkinParam()).getColor(ColorType.BACK); this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK);
} }
this.borderColor = SkinParamUtils.getColor(getSkinParam(), null, ColorParam.noteBorder); 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) { private static ISkinParam getISkinParam(ISkinParam skinParam, IEntity entity) {
if (entity.getColors(skinParam) != null) { if (entity.getColors() != null) {
return entity.getColors(skinParam).mute(skinParam); return entity.getColors().mute(skinParam);
} }
return skinParam; return skinParam;
} }
static ISkinParam getSkin(ISkinParam skinParam, IEntity entity) { static ISkinParam getSkin(ISkinParam skinParam, IEntity entity) {
final Stereotype stereotype = entity.getStereotype(); final Stereotype stereotype = entity.getStereotype();
HColor back = entity.getColors(skinParam).getColor(ColorType.BACK); HColor back = entity.getColors().getColor(ColorType.BACK);
if (back != null) { if (back != null) {
return new SkinParamBackcolored(skinParam, back); return new SkinParamBackcolored(skinParam, back);
} }
@ -247,7 +247,7 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil {
opale.setRoundCorner(getRoundCorner()); opale.setRoundCorner(getRoundCorner());
opale.setOpale(strategy, pp1, projection); opale.setOpale(strategy, pp1, projection);
final UGraphic stroked = applyStroke(ug2); final UGraphic stroked = applyStroke(ug2);
opale.drawU(Colors.applyStroke(stroked, getEntity().getColors(skinParam))); opale.drawU(Colors.applyStroke(stroked, getEntity().getColors()));
} }
if (url != null) { if (url != null) {
ug.closeUrl(); ug.closeUrl();

4
src/net/sourceforge/plantuml/svek/image/EntityImageObject.java
View File

@ -170,7 +170,7 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil {
final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder); final HColor borderColor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.objectBorder);
ug = ug.apply(borderColor); ug = ug.apply(borderColor);
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = getStyle().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),
@ -207,7 +207,7 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil {
} }
private UStroke getStroke() { private UStroke getStroke() {
UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); UStroke stroke = lineConfig.getColors().getSpecificLineStroke();
if (stroke == null) { if (stroke == null) {
stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo()); stroke = getSkinParam().getThickness(LineParam.objectBorder, getStereo());
} }

2
src/net/sourceforge/plantuml/svek/image/EntityImagePort.java
View File

@ -99,7 +99,7 @@ public class EntityImagePort extends AbstractEntityImageBorder {
ug = ug.apply(new UStroke(1.5)) ug = ug.apply(new UStroke(1.5))
.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder).bg()); .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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground);
} }

2
src/net/sourceforge/plantuml/svek/image/EntityImageState2.java
View File

@ -74,7 +74,7 @@ public class EntityImageState2 extends AbstractEntityImage {
final USymbol symbol = USymbol.FRAME; final USymbol symbol = USymbol.FRAME;
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack()); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack());
} }

2
src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java
View File

@ -82,7 +82,7 @@ public class EntityImageStateBorder extends AbstractEntityImageBorder {
ug = ug.apply(new UStroke(1.5)) ug = ug.apply(new UStroke(1.5))
.apply(SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder)); .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) { if (backcolor == null) {
backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground); backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBackground);
} }

6
src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java
View File

@ -100,7 +100,7 @@ public abstract class EntityImageStateCommon extends AbstractEntityImage {
} }
final protected UStroke getStroke() { final protected UStroke getStroke() {
UStroke stroke = lineConfig.getColors(getSkinParam()).getSpecificLineStroke(); UStroke stroke = lineConfig.getColors().getSpecificLineStroke();
if (stroke == null) { if (stroke == null) {
stroke = new UStroke(1.5); stroke = new UStroke(1.5);
} }
@ -130,7 +130,7 @@ public abstract class EntityImageStateCommon extends AbstractEntityImage {
final protected UGraphic applyColor(UGraphic ug) { 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 (classBorder == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
classBorder = getStyleState().value(PName.LineColor).asColor(getSkinParam().getThemeStyle(), 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); classBorder = SkinParamUtils.getColor(getSkinParam(), getStereo(), ColorParam.stateBorder);
} }
ug = ug.apply(getStroke()).apply(classBorder); 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 (backcolor == null) {
if (UseStyle.useBetaStyle()) if (UseStyle.useBetaStyle())
backcolor = getStyleState().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = getStyleState().value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),

8
src/net/sourceforge/plantuml/svek/image/EntityImageTips.java
View File

@ -93,12 +93,12 @@ public class EntityImageTips extends AbstractEntityImage {
final Style style = getDefaultStyleDefinition(type.getStyleName()) final Style style = getDefaultStyleDefinition(type.getStyleName())
.getMergedStyle(skinParam.getCurrentStyleBuilder()); .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(), this.noteBackgroundColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
skinParam.getIHtmlColorSet()); skinParam.getIHtmlColorSet());
} else { } 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(), this.borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
@ -106,10 +106,10 @@ public class EntityImageTips extends AbstractEntityImage {
} else { } else {
if (entity.getColors(skinParam).getColor(ColorType.BACK) == null) { if (entity.getColors().getColor(ColorType.BACK) == null) {
this.noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground); this.noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
} else { } else {
this.noteBackgroundColor = entity.getColors(skinParam).getColor(ColorType.BACK); this.noteBackgroundColor = entity.getColors().getColor(ColorType.BACK);
} }
this.borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder); this.borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);

10
src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java
View File

@ -86,7 +86,7 @@ public class EntityImageUseCase extends AbstractEntityImage {
final private Url url; final private Url url;
public EntityImageUseCase(ILeaf entity, ISkinParam skinParam2, PortionShower portionShower) { 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 Stereotype stereotype = entity.getStereotype();
final HorizontalAlignment align; final HorizontalAlignment align;
@ -126,7 +126,7 @@ public class EntityImageUseCase extends AbstractEntityImage {
if (stroke == null) { if (stroke == null) {
stroke = new UStroke(1.5); stroke = new UStroke(1.5);
} }
final Colors colors = getEntity().getColors(getSkinParam()); final Colors colors = getEntity().getColors();
stroke = colors.muteStroke(stroke); stroke = colors.muteStroke(stroke);
return stroke; return stroke;
} }
@ -196,11 +196,11 @@ public class EntityImageUseCase extends AbstractEntityImage {
} }
private HColor getBackColor() { private HColor getBackColor() {
HColor backcolor = getEntity().getColors(getSkinParam()).getColor(ColorType.BACK); HColor backcolor = getEntity().getColors().getColor(ColorType.BACK);
if (backcolor == null) { if (backcolor == null) {
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
Style style = getStyle(); Style style = getStyle();
final Colors colors = getEntity().getColors(getSkinParam()); final Colors colors = getEntity().getColors();
style = style.eventuallyOverride(colors); style = style.eventuallyOverride(colors);
backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(), backcolor = style.value(PName.BackGroundColor).asColor(getSkinParam().getThemeStyle(),
getSkinParam().getIHtmlColorSet()); getSkinParam().getIHtmlColorSet());
@ -220,7 +220,7 @@ public class EntityImageUseCase extends AbstractEntityImage {
} }
private HColor getLineColor() { private HColor getLineColor() {
HColor linecolor = getEntity().getColors(getSkinParam()).getColor(ColorType.LINE); HColor linecolor = getEntity().getColors().getColor(ColorType.LINE);
if (linecolor == null) { if (linecolor == null) {
if (UseStyle.useBetaStyle()) { if (UseStyle.useBetaStyle()) {
final Style style = getStyle(); final Style style = getStyle();

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -80,7 +80,7 @@ public class Version {
} }
public static int beta() { public static int beta() {
final int beta = 0; final int beta = 1;
return beta; return beta;
} }