diff options
| author | Andrew Shadura <andrew.shadura@collabora.co.uk> | 2016-03-02 13:54:28 +0100 |
|---|---|---|
| committer | Andrew Shadura <andrew.shadura@collabora.co.uk> | 2016-03-02 13:54:28 +0100 |
| commit | c8193f238ed8e884ba793479204846db8354d1c0 (patch) | |
| tree | d3a8307484a37cb81b21f29b16dd76935277846b /src/net/sourceforge/plantuml/skin | |
| parent | 26b872bb194ec7622997914bba53309a94b64d20 (diff) | |
Imported Upstream version 8036
Diffstat (limited to 'src/net/sourceforge/plantuml/skin')
65 files changed, 213 insertions, 202 deletions
diff --git a/src/net/sourceforge/plantuml/skin/AbstractComponent.java b/src/net/sourceforge/plantuml/skin/AbstractComponent.java index f85af26..02aaa95 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractComponent.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java index 457e155..d4e2500 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -38,6 +38,7 @@ import java.awt.geom.Dimension2D; import net.sourceforge.plantuml.FontParam;
import net.sourceforge.plantuml.ISkinSimple;
+import net.sourceforge.plantuml.creole.CreoleMode;
import net.sourceforge.plantuml.cucadiagram.BodyEnhanced2;
import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.graphic.FontConfiguration;
@@ -85,8 +86,8 @@ public abstract class AbstractTextualComponent extends AbstractComponent { } else if (enhanced) {
textBlock = new BodyEnhanced2(strings, FontParam.NOTE, spriteContainer, HorizontalAlignment.LEFT, font);
} else {
- textBlock = TextBlockUtils.create(strings, font, horizontalAlignment, spriteContainer, maxMessageSize,
- false, fontForStereotype, htmlColorForStereotype);
+ textBlock = strings.create(font, horizontalAlignment, spriteContainer, maxMessageSize, CreoleMode.FULL,
+ fontForStereotype, htmlColorForStereotype);
}
}
diff --git a/src/net/sourceforge/plantuml/skin/Area.java b/src/net/sourceforge/plantuml/skin/Area.java index b0ae45d..eae9878 100644 --- a/src/net/sourceforge/plantuml/skin/Area.java +++ b/src/net/sourceforge/plantuml/skin/Area.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowBody.java b/src/net/sourceforge/plantuml/skin/ArrowBody.java index 102793b..83d0da1 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowBody.java +++ b/src/net/sourceforge/plantuml/skin/ArrowBody.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowComponent.java b/src/net/sourceforge/plantuml/skin/ArrowComponent.java index 0bdcb48..423b690 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowComponent.java +++ b/src/net/sourceforge/plantuml/skin/ArrowComponent.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java index 77bb02a..1b3cc78 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java +++ b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowDecoration.java b/src/net/sourceforge/plantuml/skin/ArrowDecoration.java index 8d38ea2..4188d22 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDecoration.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDecoration.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowDirection.java b/src/net/sourceforge/plantuml/skin/ArrowDirection.java index 6ee24d0..9330c0c 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDirection.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDirection.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowDressing.java b/src/net/sourceforge/plantuml/skin/ArrowDressing.java index 5416e62..b4ce140 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDressing.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDressing.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowHead.java b/src/net/sourceforge/plantuml/skin/ArrowHead.java index 562f8ce..04c922b 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowHead.java +++ b/src/net/sourceforge/plantuml/skin/ArrowHead.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ArrowPart.java b/src/net/sourceforge/plantuml/skin/ArrowPart.java index 08ba7cc..0faf8f0 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowPart.java +++ b/src/net/sourceforge/plantuml/skin/ArrowPart.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/CircleInterface.java b/src/net/sourceforge/plantuml/skin/CircleInterface.java index dc6afda..d61584c 100644 --- a/src/net/sourceforge/plantuml/skin/CircleInterface.java +++ b/src/net/sourceforge/plantuml/skin/CircleInterface.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/Component.java b/src/net/sourceforge/plantuml/skin/Component.java index 2701e42..96a6f1f 100644 --- a/src/net/sourceforge/plantuml/skin/Component.java +++ b/src/net/sourceforge/plantuml/skin/Component.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/ComponentType.java b/src/net/sourceforge/plantuml/skin/ComponentType.java index 3420f5e..c17a69d 100644 --- a/src/net/sourceforge/plantuml/skin/ComponentType.java +++ b/src/net/sourceforge/plantuml/skin/ComponentType.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/Context2D.java b/src/net/sourceforge/plantuml/skin/Context2D.java index 1c4e00f..df3fe15 100644 --- a/src/net/sourceforge/plantuml/skin/Context2D.java +++ b/src/net/sourceforge/plantuml/skin/Context2D.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/GrayComponent.java b/src/net/sourceforge/plantuml/skin/GrayComponent.java index 21704c8..3a06534 100644 --- a/src/net/sourceforge/plantuml/skin/GrayComponent.java +++ b/src/net/sourceforge/plantuml/skin/GrayComponent.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -75,8 +75,8 @@ class GrayComponent extends AbstractComponent { strings.add(n.substring(i, Math.min(i + split, n.length())));
}
- final TextBlock textBlock = TextBlockUtils.create(Display.create(strings), new FontConfiguration(NORMAL, HtmlColorUtils.BLACK,
- HtmlColorUtils.BLUE, true), HorizontalAlignment.LEFT, new SpriteContainerEmpty());
+ final TextBlock textBlock = Display.create(strings).create(FontConfiguration.blackBlueTrue(NORMAL),
+ HorizontalAlignment.LEFT, new SpriteContainerEmpty());
textBlock.drawU(ug);
}
diff --git a/src/net/sourceforge/plantuml/skin/ProtectedSkin.java b/src/net/sourceforge/plantuml/skin/ProtectedSkin.java index 45cc87e..8068564 100644 --- a/src/net/sourceforge/plantuml/skin/ProtectedSkin.java +++ b/src/net/sourceforge/plantuml/skin/ProtectedSkin.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/SimpleContext2D.java b/src/net/sourceforge/plantuml/skin/SimpleContext2D.java index 84eb6dc..cca8018 100644 --- a/src/net/sourceforge/plantuml/skin/SimpleContext2D.java +++ b/src/net/sourceforge/plantuml/skin/SimpleContext2D.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/Skin.java b/src/net/sourceforge/plantuml/skin/Skin.java index 0232273..9cd1d4e 100644 --- a/src/net/sourceforge/plantuml/skin/Skin.java +++ b/src/net/sourceforge/plantuml/skin/Skin.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/SkinUtils.java b/src/net/sourceforge/plantuml/skin/SkinUtils.java index 63b01f2..52e114a 100644 --- a/src/net/sourceforge/plantuml/skin/SkinUtils.java +++ b/src/net/sourceforge/plantuml/skin/SkinUtils.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/StickMan.java b/src/net/sourceforge/plantuml/skin/StickMan.java index 33c27e5..57fa67c 100644 --- a/src/net/sourceforge/plantuml/skin/StickMan.java +++ b/src/net/sourceforge/plantuml/skin/StickMan.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -37,6 +37,7 @@ package net.sourceforge.plantuml.skin; import java.awt.geom.Dimension2D;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.SymbolContext;
@@ -47,7 +48,7 @@ import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UStroke;
import net.sourceforge.plantuml.ugraphic.UTranslate;
-public class StickMan implements TextBlock {
+public class StickMan extends AbstractTextBlock implements TextBlock {
private final double armsY = 8;
private final double armsLenght = 13;
diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index 186484f..20c6508 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -35,9 +35,11 @@ package net.sourceforge.plantuml.skin;
import java.awt.geom.Dimension2D;
+import java.awt.geom.Rectangle2D;
import net.sourceforge.plantuml.ColorParam;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
@@ -77,18 +79,19 @@ public enum VisibilityModifier { }
public TextBlock getUBlock(final int size, final HtmlColor foregroundColor, final HtmlColor backgoundColor) {
- return new TextBlock() {
+ return new AbstractTextBlock() {
public Dimension2D calculateDimension(StringBounder stringBounder) {
return new Dimension2DDouble(size + 1, size + 1);
}
+
+ @Override
+ public Rectangle2D getInnerPosition(String member, StringBounder stringBounder) {
+ return null;
+ }
public void drawU(UGraphic ug) {
- // final double tx = ug.getTranslateX();
- // final double ty = ug.getTranslateY();
- // ug.translate(x, y);F
drawInternal(ug, size, foregroundColor, backgoundColor, 0, 0);
- // ug.setTranslate(tx, ty);
}
};
}
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java index de3a6b4..bd8d752 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java b/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java index 6cefbeb..a03e2e4 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -81,18 +81,19 @@ public class BlueModern implements Skin { final HtmlColor sequenceArrow = config.getColor() == null ? HtmlColorUtils.BLACK : config.getColor();
if (config.isSelfArrow()) {
return new ComponentBlueModernSelfArrow(sequenceArrow, normalFont.toFont2(HtmlColorUtils.BLACK,
- useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, config, param);
+ useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()), stringsToDisplay, config, param);
}
return new ComponentBlueModernArrow(sequenceArrow, useUnderlineForHyperlink, normalFont.toFont2(
- HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, config, param);
+ HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()),
+ stringsToDisplay, config, param);
}
if (type == ComponentType.PARTICIPANT_HEAD) {
return new ComponentBlueModernParticipant(blue1, blue2, participantFont.toFont2(HtmlColorUtils.WHITE,
- useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, param);
+ useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()), stringsToDisplay, param);
}
if (type == ComponentType.PARTICIPANT_TAIL) {
return new ComponentBlueModernParticipant(blue1, blue2, participantFont.toFont2(HtmlColorUtils.WHITE,
- useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, param);
+ useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()), stringsToDisplay, param);
}
if (type == ComponentType.PARTICIPANT_LINE) {
return new ComponentBlueModernLine(lineColor);
@@ -102,15 +103,16 @@ public class BlueModern implements Skin { }
if (type == ComponentType.ACTOR_HEAD) {
return new ComponentBlueModernActor(blue2, blue1, participantFont.toFont2(blue1, useUnderlineForHyperlink,
- hyperlinkColor), stringsToDisplay, true, param);
+ hyperlinkColor, param.getTabSize()), stringsToDisplay, true, param);
}
if (type == ComponentType.ACTOR_TAIL) {
return new ComponentBlueModernActor(blue2, blue1, participantFont.toFont2(blue1, useUnderlineForHyperlink,
- hyperlinkColor), stringsToDisplay, false, param);
+ hyperlinkColor, param.getTabSize()), stringsToDisplay, false, param);
}
if (type == ComponentType.NOTE) {
return new ComponentBlueModernNote(HtmlColorUtils.WHITE, HtmlColorUtils.BLACK, normalFont.toFont2(
- HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, param);
+ HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()),
+ stringsToDisplay, param);
}
if (type == ComponentType.ALIVE_BOX_CLOSE_CLOSE) {
return new ComponentBlueModernActiveLine(blue1, true, true);
@@ -128,50 +130,53 @@ public class BlueModern implements Skin { return new ComponentBlueModernDelayLine(lineColor);
}
if (type == ComponentType.DELAY_TEXT) {
- return new ComponentBlueModernDelayText(param.getFont(FontParam.SEQUENCE_DELAY, null, false).toFont2(
- HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, param);
+ return new ComponentBlueModernDelayText(param.getFont(null, false, FontParam.SEQUENCE_DELAY).toFont2(
+ HtmlColorUtils.BLACK, useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()),
+ stringsToDisplay, param);
}
if (type == ComponentType.DESTROY) {
return new ComponentRoseDestroy(red);
}
if (type == ComponentType.GROUPING_HEADER) {
return new ComponentBlueModernGroupingHeader(blue1, blue3, borderGroupColor, HtmlColorUtils.BLACK,
- normalFont.toFont2(HtmlColorUtils.WHITE, useUnderlineForHyperlink, hyperlinkColor), smallFont,
- stringsToDisplay, param);
+ normalFont.toFont2(HtmlColorUtils.WHITE, useUnderlineForHyperlink, hyperlinkColor,
+ param.getTabSize()), smallFont, stringsToDisplay, param);
}
if (type == ComponentType.GROUPING_ELSE) {
return new ComponentRoseGroupingElse(HtmlColorUtils.BLACK, smallFont.toFont2(HtmlColorUtils.BLACK,
- useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay.get(0), param, blue3);
+ useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()), stringsToDisplay.get(0), param,
+ blue3);
}
if (type == ComponentType.GROUPING_SPACE) {
return new ComponentRoseGroupingSpace(7);
}
if (type == ComponentType.TITLE) {
return new ComponentRoseTitle(bigFont.toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
- hyperlinkColor), stringsToDisplay, param);
+ hyperlinkColor, param.getTabSize()), stringsToDisplay, param);
}
if (type == ComponentType.REFERENCE) {
return new ComponentRoseReference(normalFont.toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
- hyperlinkColor), new SymbolContext(blue1, borderGroupColor).withStroke(Rose.getStroke(param,
- LineParam.sequenceDividerBorder, 2)), normalFont.toFont2(HtmlColorUtils.WHITE,
- useUnderlineForHyperlink, hyperlinkColor), stringsToDisplay, HorizontalAlignment.CENTER, param,
- blue3);
+ hyperlinkColor, param.getTabSize()), new SymbolContext(blue1, borderGroupColor).withStroke(Rose
+ .getStroke(param, LineParam.sequenceDividerBorder, 2)), normalFont.toFont2(HtmlColorUtils.WHITE,
+ useUnderlineForHyperlink, hyperlinkColor, param.getTabSize()), stringsToDisplay,
+ HorizontalAlignment.CENTER, param, blue3);
}
if (type == ComponentType.NEWPAGE) {
return new ComponentBlueModernNewpage(blue1);
}
if (type == ComponentType.DIVIDER) {
return new ComponentBlueModernDivider(normalFont.toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
- hyperlinkColor), blue2, blue1, HtmlColorUtils.BLACK, stringsToDisplay, param);
+ hyperlinkColor, param.getTabSize()), blue2, blue1, HtmlColorUtils.BLACK, stringsToDisplay, param);
}
if (type == ComponentType.SIGNATURE) {
return new ComponentRoseTitle(smallFont.toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
- hyperlinkColor), Display.create("This skin was created ", "in April 2009."), param);
+ hyperlinkColor, param.getTabSize()), Display.create("This skin was created ", "in April 2009."),
+ param);
}
if (type == ComponentType.ENGLOBER) {
return new ComponentBlueModernEnglober(blue1, blue3, stringsToDisplay, param.getFont(
- FontParam.SEQUENCE_BOX, null, false).toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
- hyperlinkColor), param);
+ null, false, FontParam.SEQUENCE_BOX).toFont2(HtmlColorUtils.BLACK, useUnderlineForHyperlink,
+ hyperlinkColor, param.getTabSize()), param);
}
return null;
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java index b125755..35a1b34 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java index 6dd1f15..4848d81 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java index c744f41..5052cfe 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java index c1bf6b7..16bb80a 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java index a352df7..7a246f9 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java index b2558c6..eab70d0 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java index 45511ac..9b9cddf 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java index e7c98c0..5d49e61 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -68,18 +68,19 @@ public class ComponentBlueModernGroupingHeader extends AbstractTextualComponent private final HtmlColor borderColor;
public ComponentBlueModernGroupingHeader(HtmlColor headerBackgroundColor, HtmlColor generalBackgroundColor,
- HtmlColor borderColor, HtmlColor fontColor2, FontConfiguration bigFont, UFont smallFont, Display strings, ISkinSimple spriteContainer) {
- super(strings.get(0), bigFont, HorizontalAlignment.LEFT, 15, 30, 1, spriteContainer, 0, null,
- null);
+ HtmlColor borderColor, HtmlColor fontColor2, FontConfiguration bigFont, UFont smallFont, Display strings,
+ ISkinSimple spriteContainer) {
+ super(strings.get(0), bigFont, HorizontalAlignment.LEFT, 15, 30, 1, spriteContainer, 0, null, null);
this.headerBackgroundColor = headerBackgroundColor;
this.generalBackgroundColor = generalBackgroundColor;
this.borderColor = borderColor;
if (strings.size() == 1 || strings.get(1) == null) {
this.commentTextBlock = null;
} else {
- this.commentTextBlock = TextBlockUtils.create(Display.create("[" + strings.get(1) + "]"),
- new FontConfiguration(smallFont, fontColor2, bigFont.getHyperlinkColor(), bigFont.useUnderlineForHyperlink()), HorizontalAlignment.LEFT,
- spriteContainer);
+ final FontConfiguration fontConfiguration = new FontConfiguration(smallFont, fontColor2,
+ bigFont.getHyperlinkColor(), bigFont.useUnderlineForHyperlink(), spriteContainer.getTabSize());
+ this.commentTextBlock = Display.create("[" + strings.get(1) + "]").create(fontConfiguration,
+ HorizontalAlignment.LEFT, spriteContainer);
}
}
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java index c69c082..c6c99ab 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java index 8d6cf38..abca981 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java index 671c086..0388ec7 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java index f9bb38d..5b9b80c 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java index fc1dd31..817711a 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java b/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java index 9af427f..cf86ddc 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java b/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java index 726fb96..b908875 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java index c69804b..8852f6b 100644 --- a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java index de9845e..7d594ea 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java index 42c6810..772b220 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java index 01ac5a2..848c022 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java index a107d07..02e536f 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java index 2ea4182..943acf9 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java index 4c18cef..48fcba5 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -66,8 +66,8 @@ public class ComponentRoseDatabase extends AbstractTextualComponent { final SymbolContext symbolContext = new SymbolContext(biColor.getBackColor(), biColor.getForeColor())
.withStroke(new UStroke(1.5)).withShadow(biColor.getDeltaShadow() > 0);
- this.stickman = USymbol.DATABASE.asSmall(TextBlockUtils.empty(16, 17), TextBlockUtils.empty(0, 0),
- symbolContext);
+ this.stickman = USymbol.DATABASE.asSmall(null, TextBlockUtils.empty(16, 17),
+ TextBlockUtils.empty(0, 0), symbolContext);
}
@Override
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java index 90ad857..0f74efc 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java index 8bc81bd..80e674d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java index 810599e..27c2af0 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java index b1e8a37..56f382a 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -41,7 +41,6 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorUtils;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
import net.sourceforge.plantuml.skin.AbstractTextualComponent;
@@ -57,16 +56,17 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseDivider extends AbstractTextualComponent {
// private final int outMargin = 5;
+ private final HtmlColor borderColor;
private final HtmlColor background;
private final boolean empty;
private final boolean withShadow;
private final UStroke stroke;
public ComponentRoseDivider(FontConfiguration font, HtmlColor background, Display stringsToDisplay,
- ISkinSimple spriteContainer, boolean withShadow, UStroke stroke) {
- super(stringsToDisplay, font, HorizontalAlignment.CENTER, 4, 4, 4,
- spriteContainer, 0, false, null, null);
+ ISkinSimple spriteContainer, boolean withShadow, UStroke stroke, HtmlColor borderColor) {
+ super(stringsToDisplay, font, HorizontalAlignment.CENTER, 4, 4, 4, spriteContainer, 0, false, null, null);
this.background = background;
+ this.borderColor = borderColor;
this.empty = stringsToDisplay.get(0).length() == 0;
this.withShadow = withShadow;
this.stroke = stroke;
@@ -90,7 +90,7 @@ public class ComponentRoseDivider extends AbstractTextualComponent { drawSep(ug.apply(new UTranslate(0, dimensionToUse.getHeight() / 2)), dimensionToUse.getWidth());
- ug = ug.apply(new UChangeColor(HtmlColorUtils.BLACK));
+ ug = ug.apply(new UChangeColor(borderColor));
ug = ug.apply(stroke);
final URectangle rect = new URectangle(textWidth + deltaX, textHeight);
if (withShadow) {
@@ -120,7 +120,7 @@ public class ComponentRoseDivider extends AbstractTextualComponent { }
private void drawDoubleLine(UGraphic ug, final double width) {
- ug = ug.apply(new UStroke(stroke.getThickness() / 2)).apply(new UChangeColor(HtmlColorUtils.BLACK));
+ ug = ug.apply(new UStroke(stroke.getThickness() / 2)).apply(new UChangeColor(borderColor));
final ULine line = new ULine(width, 0);
ug.apply(new UTranslate(0, -1)).draw(line);
ug.apply(new UTranslate(0, 2)).draw(line);
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java index 0e296b4..e82e3cf 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java index e0b3d2e..a9cb6cb 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java index 0a3421f..16e2ef9 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java index 6944322..af47ae8 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -44,12 +44,10 @@ import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.SymbolContext;
import net.sourceforge.plantuml.graphic.TextBlock;
-import net.sourceforge.plantuml.graphic.TextBlockUtils;
import net.sourceforge.plantuml.skin.AbstractTextualComponent;
import net.sourceforge.plantuml.skin.Area;
import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
-import net.sourceforge.plantuml.ugraphic.UFont;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UPolygon;
import net.sourceforge.plantuml.ugraphic.URectangle;
@@ -66,8 +64,8 @@ public class ComponentRoseGroupingHeader extends AbstractTextualComponent { private final HtmlColor background;
private final SymbolContext symbolContext;
- public ComponentRoseGroupingHeader(HtmlColor background, SymbolContext symbolContext, FontConfiguration bigFont, UFont smallFont,
- Display strings, ISkinSimple spriteContainer) {
+ public ComponentRoseGroupingHeader(HtmlColor background, SymbolContext symbolContext, FontConfiguration bigFont,
+ FontConfiguration smallFont2, Display strings, ISkinSimple spriteContainer) {
super(strings.get(0), bigFont, HorizontalAlignment.LEFT, 15, 30, 1, spriteContainer, 0, null, null);
this.symbolContext = symbolContext;
this.background = background;
@@ -75,16 +73,17 @@ public class ComponentRoseGroupingHeader extends AbstractTextualComponent { this.commentTextBlock = null;
} else {
final Display display = Display.getWithNewlines("[" + strings.get(1) + "]");
- this.commentTextBlock = TextBlockUtils.create(display, new FontConfiguration(smallFont, bigFont.getColor(),
- bigFont.getHyperlinkColor(), bigFont.useUnderlineForHyperlink()), HorizontalAlignment.LEFT,
- spriteContainer);
+ // final FontConfiguration smallFont2 = bigFont.forceFont(smallFont, null);
+ this.commentTextBlock = display.create(smallFont2, HorizontalAlignment.LEFT, spriteContainer);
}
if (this.background == null) {
throw new IllegalArgumentException();
}
-
}
+ // new FontConfiguration(smallFont, bigFont.getColor(), bigFont.getHyperlinkColor(),
+ // bigFont.useUnderlineForHyperlink());
+
private double getSuppHeightForComment(StringBounder stringBounder) {
if (commentTextBlock == null) {
return 0;
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java index 6243331..d99f2d7 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java index 30abb6e..394049b 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java index 2ecac3a..0837fdd 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java index 56ee046..cd615bc 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -39,13 +39,10 @@ import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
-import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.SymbolContext;
import net.sourceforge.plantuml.skin.AbstractTextualComponent;
import net.sourceforge.plantuml.skin.Area;
-import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
-import net.sourceforge.plantuml.ugraphic.UChangeColor;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UGraphicStencil;
import net.sourceforge.plantuml.ugraphic.ULine;
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java index cac5ef9..9df137b 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java index b6505cc..e79fbfd 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java index b9cb2dd..573d1ad 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java index 25cbc61..88f3b17 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -71,8 +71,7 @@ public class ComponentRoseReference extends AbstractTextualComponent { this.symbolContext = symbolContext;
this.background = background;
- this.textHeader = TextBlockUtils.create(stringsToDisplay.subList(0, 1), header, HorizontalAlignment.LEFT,
- spriteContainer);
+ this.textHeader = stringsToDisplay.subList(0, 1).create(header, HorizontalAlignment.LEFT, spriteContainer);
}
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java index 85058d4..109eae6 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java index da21aa8..ef34d17 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
diff --git a/src/net/sourceforge/plantuml/skin/rose/Rose.java b/src/net/sourceforge/plantuml/skin/rose/Rose.java index f8782fe..74e9543 100644 --- a/src/net/sourceforge/plantuml/skin/rose/Rose.java +++ b/src/net/sourceforge/plantuml/skin/rose/Rose.java @@ -2,9 +2,9 @@ * PlantUML : a free UML diagram generator
* ========================================================================
*
- * (C) Copyright 2009-2014, Arnaud Roques
+ * (C) Copyright 2009-2017, Arnaud Roques
*
- * Project Info: http://plantuml.sourceforge.net
+ * Project Info: http://plantuml.com
*
* This file is part of PlantUML.
*
@@ -39,6 +39,7 @@ import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.FontParam;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.LineParam;
+import net.sourceforge.plantuml.SkinParamUtils;
import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.cucadiagram.Stereotype;
import net.sourceforge.plantuml.graphic.FontConfiguration;
@@ -60,7 +61,7 @@ public class Rose implements Skin { final private double paddingY = 5;
public HtmlColor getFontColor(ISkinParam skin, FontParam fontParam) {
- return skin.getFontHtmlColor(fontParam, null);
+ return skin.getFontHtmlColor(null, fontParam);
}
public HtmlColor getHtmlColor(ISkinParam param, ColorParam color) {
@@ -78,17 +79,15 @@ public class Rose implements Skin { return result;
}
- private FontConfiguration getUFont2(ISkinParam param, FontParam fontParam) {
- final UFont font = param.getFont(fontParam, null, false);
- final HtmlColor fontColor = getFontColor(param, fontParam);
- return new FontConfiguration(font, fontColor, param.getHyperlinkColor(), param.useUnderlineForHyperlink());
+ private FontConfiguration getUFont2(ISkinParam skinParam, FontParam fontParam) {
+ return new FontConfiguration(skinParam, fontParam, null);
}
public Component createComponent(ComponentType type, ArrowConfiguration config, ISkinParam param,
Display stringsToDisplay) {
- final UFont fontGrouping = param.getFont(FontParam.SEQUENCE_GROUP, null, false);
+ final UFont fontGrouping = param.getFont(null, false, FontParam.SEQUENCE_GROUP);
- final UFont newFontForStereotype = param.getFont(FontParam.SEQUENCE_STEREOTYPE, null, false);
+ final UFont newFontForStereotype = param.getFont(null, false, FontParam.SEQUENCE_STEREOTYPE);
if (type.isArrow()) {
// if (param.maxMessageSize() > 0) {
@@ -189,10 +188,15 @@ public class Rose implements Skin { return new ComponentRoseNoteBox(getSymbolContext(param, ColorParam.noteBorder), getUFont2(param,
FontParam.NOTE), stringsToDisplay, param);
}
+ final FontConfiguration bigFont = getUFont2(param, FontParam.SEQUENCE_GROUP_HEADER);
if (type == ComponentType.GROUPING_HEADER) {
+ FontConfiguration smallFont = bigFont.forceFont(fontGrouping, null);
+ final HtmlColor smallColor = SkinParamUtils.getFontColor(param, FontParam.SEQUENCE_GROUP, null);
+ if (smallColor != null) {
+ smallFont = smallFont.changeColor(smallColor);
+ }
return new ComponentRoseGroupingHeader(param.getBackgroundColor(), getSymbolContext(param,
- ColorParam.sequenceGroupBorder), getUFont2(param, FontParam.SEQUENCE_GROUP_HEADER), fontGrouping,
- stringsToDisplay, param);
+ ColorParam.sequenceGroupBorder), bigFont, smallFont, stringsToDisplay, param);
}
if (type == ComponentType.GROUPING_ELSE) {
return new ComponentRoseGroupingElse(getHtmlColor(param, ColorParam.sequenceGroupBorder), getUFont2(param,
@@ -228,20 +232,21 @@ public class Rose implements Skin { if (type == ComponentType.DIVIDER) {
return new ComponentRoseDivider(getUFont2(param, FontParam.SEQUENCE_DIVIDER), getHtmlColor(param,
ColorParam.sequenceDividerBackground), stringsToDisplay, param, deltaShadow(param) > 0, getStroke(
- param, LineParam.sequenceDividerBorder, 2));
+ param, LineParam.sequenceDividerBorder, 2), getHtmlColor(param, ColorParam.sequenceDividerBorder));
}
if (type == ComponentType.REFERENCE) {
return new ComponentRoseReference(getUFont2(param, FontParam.SEQUENCE_REFERENCE), getSymbolContext(param,
- ColorParam.sequenceReferenceBorder), getUFont2(param, FontParam.SEQUENCE_GROUP_HEADER),
- stringsToDisplay, param.getHorizontalAlignment(AlignParam.SEQUENCE_REFERENCE_ALIGN), param,
- getHtmlColor(param, ColorParam.sequenceReferenceBackground));
+ ColorParam.sequenceReferenceBorder), bigFont, stringsToDisplay,
+ param.getHorizontalAlignment(AlignParam.SEQUENCE_REFERENCE_ALIGN), param, getHtmlColor(param,
+ ColorParam.sequenceReferenceBackground));
}
if (type == ComponentType.TITLE) {
return new ComponentRoseTitle(getUFont2(param, FontParam.SEQUENCE_TITLE), stringsToDisplay, param);
}
if (type == ComponentType.SIGNATURE) {
return new ComponentRoseTitle(fontGrouping.toFont2(HtmlColorUtils.BLACK, param.useUnderlineForHyperlink(),
- param.getHyperlinkColor()), Display.create("This skin was created ", "in April 2009."), param);
+ param.getHyperlinkColor(), param.getTabSize()), Display.create("This skin was created ",
+ "in April 2009."), param);
}
if (type == ComponentType.ENGLOBER) {
return new ComponentRoseEnglober(getSymbolContext(param, ColorParam.sequenceBoxBorder), stringsToDisplay,
|