diff options
Diffstat (limited to 'src/net/sourceforge/plantuml/activitydiagram3/ftile')
26 files changed, 93 insertions, 49 deletions
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java index 7d3984a..4a7a25a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java @@ -98,7 +98,7 @@ public abstract class AbstractFtile extends AbstractTextBlock implements Ftile { } public HorizontalAlignment arrowHorizontalAlignment() { - return skinParam.getHorizontalAlignment(AlignmentParam.arrowMessageAlignment, null); + return skinParam.getHorizontalAlignment(AlignmentParam.arrowMessageAlignment, null, false); } private FtileGeometry cachedGeometry; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index 3e4f03b..dd0bffb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.activitydiagram3.PositionedNote; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.Colors; public interface FtileFactory { @@ -89,6 +90,6 @@ public interface FtileFactory { public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label); public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note, - HtmlColor borderColor); + HtmlColor borderColor, USymbol type, double roundCorner); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index 8061639..cebcfa1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.graphic.HtmlColorAndStyle; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.skin.rose.Rose; @@ -167,8 +168,8 @@ public class FtileFactoryDelegator implements FtileFactory { } public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note, - HtmlColor borderColor) { - return factory.createGroup(list, name, backColor, titleColor, note, borderColor); + HtmlColor borderColor, USymbol type, double roundCorner) { + return factory.createGroup(list, name, backColor, titleColor, note, borderColor, type, roundCorner); } public StringBounder getStringBounder() { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java index 33dbcb2..94a8185 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java @@ -76,7 +76,7 @@ public class FloatingNote extends AbstractTextBlock implements Stencil, TextBloc skinParam, CreoleMode.FULL).createSheet(note); final SheetBlock2 sheetBlock2 = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), this, new UStroke(1)); - this.opale = new Opale(borderColor, noteBackgroundColor, sheetBlock2, skinParam.shadowing(), false); + this.opale = new Opale(borderColor, noteBackgroundColor, sheetBlock2, skinParam.shadowing(null), false); // this.text = sheetBlock2; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java index aa4ce66..701da90 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java @@ -65,7 +65,7 @@ public class FtileFactoryDelegatorAddNote extends FtileFactoryDelegator { if (note.getColors() != null) { skinParam = note.getColors().mute(skinParam); } - return new FtileNoteAlone(skinParam.shadowing(), note.getDisplay(), skinParam, + return new FtileNoteAlone(skinParam.shadowing(null), note.getDisplay(), skinParam, note.getType() == NoteType.NOTE, swimlane); } return FtileWithNoteOpale.create(ftile, notes, skinParam, true); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java index 557fa3e..e9a72a5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HtmlColor; +import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.skin.rose.Rose; public class FtileFactoryDelegatorCreateGroup extends FtileFactoryDelegator { @@ -56,9 +57,10 @@ public class FtileFactoryDelegatorCreateGroup extends FtileFactoryDelegator { @Override public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note, - HtmlColor borderColor) { + HtmlColor borderColor, USymbol type, double roundCorner) { final HtmlColor arrowColor = rose.getHtmlColor(skinParam(), ColorParam.arrow); - Ftile result = new FtileGroup(list, name, null, arrowColor, backColor, titleColor, skinParam(), borderColor); + Ftile result = new FtileGroup(list, name, null, arrowColor, backColor, titleColor, skinParam(), borderColor, + type, roundCorner); if (note != null) { result = new FtileWithNotes(result, Collections.singleton(note), skinParam()); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java index 682188b..2accc7c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java @@ -75,19 +75,19 @@ public class FtileFactoryDelegatorIf extends FtileFactoryDelegator { final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam()); final FontConfiguration fcArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null); - // .changeColor(fontColor(FontParam.ACTIVITY_DIAMOND)); + + final FontParam testParam = conditionStyle == ConditionStyle.INSIDE ? FontParam.ACTIVITY_DIAMOND + : FontParam.ARROW; + final FontConfiguration fcTest = new FontConfiguration(skinParam(), testParam, null) + .changeColor(fontColor(FontParam.ACTIVITY_DIAMOND)); + if (thens.size() > 1) { if (pragma.useVerticalIf()/* OptionFlags.USE_IF_VERTICAL */) return FtileIfLongVertical.create(swimlane, borderColor, backColor, arrowColor, getFactory(), conditionStyle, thens, elseBranch, fcArrow, topInlinkRendering, afterEndwhile); return FtileIfLongHorizontal.create(swimlane, borderColor, backColor, arrowColor, getFactory(), - conditionStyle, thens, elseBranch, fcArrow, topInlinkRendering, afterEndwhile); + conditionStyle, thens, elseBranch, fcArrow, topInlinkRendering, afterEndwhile, fcTest); } - final FontParam testParam = conditionStyle == ConditionStyle.INSIDE ? FontParam.ACTIVITY_DIAMOND - : FontParam.ARROW; - final FontConfiguration fcTest = new FontConfiguration(skinParam(), testParam, null) - .changeColor(fontColor(FontParam.ACTIVITY_DIAMOND)); - return ConditionalBuilder.create(swimlane, borderColor, backColor, arrowColor, getFactory(), conditionStyle, thens.get(0), elseBranch, skinParam(), getStringBounder(), fcArrow, fcTest); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java index c566a34..6af1933 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java @@ -77,10 +77,14 @@ public class FtileGroup extends AbstractFtile { private final HtmlColor borderColor; private final HtmlColor backColor; private final UStroke stroke; + private final USymbol type; + private final double roundCorner; public FtileGroup(Ftile inner, Display title, Display displayNote, HtmlColor arrowColor, HtmlColor backColor, - HtmlColor titleColor, ISkinParam skinParam, HtmlColor borderColor) { + HtmlColor titleColor, ISkinParam skinParam, HtmlColor borderColor, USymbol type, double roundCorner) { super(inner.skinParam()); + this.roundCorner = roundCorner; + this.type = type; this.backColor = backColor == null ? HtmlColorUtils.WHITE : backColor; this.inner = FtileUtils.addHorizontalMargin(inner, 10); this.borderColor = borderColor == null ? HtmlColorUtils.BLACK : borderColor; @@ -194,9 +198,11 @@ public class FtileGroup extends AbstractFtile { final StringBounder stringBounder = ug.getStringBounder(); final Dimension2D dimTotal = calculateDimension(stringBounder); - final SymbolContext symbolContext = new SymbolContext(backColor, borderColor).withShadow( - skinParam().shadowing()).withStroke(stroke); - USymbol.FRAME.asBig(name, inner.skinParam().getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null), + // final double roundCorner = type.getSkinParameter().getRoundCorner(skinParam(), null); + final SymbolContext symbolContext = new SymbolContext(backColor, borderColor) + .withShadow(skinParam().shadowing(null)).withStroke(stroke).withCorner(roundCorner, 0); + + type.asBig(name, inner.skinParam().getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false), TextBlockUtils.empty(0, 0), dimTotal.getWidth(), dimTotal.getHeight(), symbolContext).drawU(ug); final Dimension2D dimHeaderNote = headerNote.calculateDimension(stringBounder); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java index 557ca5d..eafabd1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java @@ -45,6 +45,7 @@ import java.util.List; import java.util.Set; import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; @@ -142,7 +143,8 @@ class FtileIfLongHorizontal extends AbstractFtile { static Ftile create(Swimlane swimlane, HtmlColor borderColor, HtmlColor backColor, Rainbow arrowColor, FtileFactory ftileFactory, ConditionStyle conditionStyle, List<Branch> thens, Branch branch2, - FontConfiguration fc, LinkRendering topInlinkRendering, LinkRendering afterEndwhile) { + FontConfiguration fcArrow, LinkRendering topInlinkRendering, LinkRendering afterEndwhile, + FontConfiguration fcTest) { if (afterEndwhile == null) { throw new IllegalArgumentException(); } @@ -157,9 +159,9 @@ class FtileIfLongHorizontal extends AbstractFtile { List<Ftile> diamonds = new ArrayList<Ftile>(); List<Double> inlabelSizes = new ArrayList<Double>(); for (Branch branch : thens) { - final TextBlock tb1 = branch.getLabelPositive().create(fc, HorizontalAlignment.LEFT, + final TextBlock tb1 = branch.getLabelPositive().create(fcArrow, HorizontalAlignment.LEFT, ftileFactory.skinParam()); - final TextBlock tbTest = branch.getLabelTest().create(fc, HorizontalAlignment.LEFT, + final TextBlock tbTest = branch.getLabelTest().create(fcTest, HorizontalAlignment.LEFT, ftileFactory.skinParam()); final HtmlColor diamondColor = branch.getColor() == null ? backColor : branch.getColor(); @@ -169,7 +171,7 @@ class FtileIfLongHorizontal extends AbstractFtile { if (Display.isNull(branch.getInlabel())) { inlabelSizes.add(0.0); } else { - tbInlabel = branch.getInlabel().create(fc, HorizontalAlignment.LEFT, ftileFactory.skinParam()); + tbInlabel = branch.getInlabel().create(fcArrow, HorizontalAlignment.LEFT, ftileFactory.skinParam()); inlabelSizes.add(tbInlabel.calculateDimension(ftileFactory.getStringBounder()).getWidth()); diamond = diamond.withWest(tbInlabel); } @@ -177,7 +179,8 @@ class FtileIfLongHorizontal extends AbstractFtile { diamonds.add(diamond); } - final TextBlock tb2 = branch2.getLabelPositive().create(fc, HorizontalAlignment.LEFT, ftileFactory.skinParam()); + final TextBlock tb2 = branch2.getLabelPositive().create(fcArrow, HorizontalAlignment.LEFT, + ftileFactory.skinParam()); final int last = diamonds.size() - 1; diamonds.set(last, ((FtileDiamondInside2) diamonds.get(last)).withEast(tb2)); @@ -193,8 +196,13 @@ class FtileIfLongHorizontal extends AbstractFtile { final Rainbow rainbowIn = FtileIfWithLinks.getInColor(thens.get(i), arrowColor); final Branch branch = thens.get(i); final Rainbow rainbowOut = branch.getInlinkRenderingColorAndStyle(); + TextBlock out2 = null; + if (branch.getSpecial() != null) { + out2 = branch.getSpecial().getDisplay() + .create(fcTest, HorizontalAlignment.LEFT, ftileFactory.skinParam()); + } conns.add(result.new ConnectionVerticalIn(diam, ftile, rainbowIn.size() == 0 ? arrowColor : rainbowIn)); - conns.add(result.new ConnectionVerticalOut(ftile, rainbowOut.size() == 0 ? arrowColor : rainbowOut)); + conns.add(result.new ConnectionVerticalOut(ftile, rainbowOut.size() == 0 ? arrowColor : rainbowOut, out2)); } final Rainbow topInColor = topInlinkRendering.getRainbow(arrowColor); @@ -204,8 +212,13 @@ class FtileIfLongHorizontal extends AbstractFtile { conns.add(result.new ConnectionHorizontal(diam1, diam2, arrowColor)); } conns.add(result.new ConnectionIn(topInColor)); + TextBlock out2 = null; + if (branch2.getSpecial() != null) { + out2 = branch2.getSpecial().getDisplay().create(fcTest, HorizontalAlignment.LEFT, ftileFactory.skinParam()); + } + conns.add(result.new ConnectionLastElseIn(FtileIfWithLinks.getInColor(branch2, arrowColor))); - conns.add(result.new ConnectionLastElseOut(arrowColor)); + conns.add(result.new ConnectionLastElseOut(arrowColor, out2)); final Rainbow horizontalOutColor = afterEndwhile.getRainbow(arrowColor); conns.add(result.new ConnectionHline(horizontalOutColor)); // conns.add(result.new ConnectionHline(HtmlColorUtils.BLUE)); @@ -213,6 +226,13 @@ class FtileIfLongHorizontal extends AbstractFtile { return FtileUtils.addConnection(result, conns); } + static private TextBlock getSpecial(Branch branch, FontConfiguration fcTest, ISkinParam skinParam) { + if (branch.getSpecial() == null) { + return null; + } + return branch.getSpecial().getDisplay().create(fcTest, HorizontalAlignment.LEFT, skinParam); + } + class ConnectionHorizontal extends AbstractConnection { private final Rainbow color; @@ -308,10 +328,12 @@ class FtileIfLongHorizontal extends AbstractFtile { class ConnectionLastElseOut extends AbstractConnection { private final Rainbow arrowColor; + private final TextBlock out2; - public ConnectionLastElseOut(Rainbow arrowColor) { + public ConnectionLastElseOut(Rainbow arrowColor, TextBlock out2) { super(tile2, null); this.arrowColor = arrowColor; + this.out2 = out2; } public void drawU(UGraphic ug) { @@ -326,6 +348,7 @@ class FtileIfLongHorizontal extends AbstractFtile { final Point2D p2 = new Point2D.Double(p1.getX(), totalHeight); final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown()); + snake.setLabel(out2); snake.addPoint(p1); snake.addPoint(p2); ug.draw(snake); @@ -384,10 +407,12 @@ class FtileIfLongHorizontal extends AbstractFtile { class ConnectionVerticalOut extends AbstractConnection { private final Rainbow color; + private final TextBlock out2; - public ConnectionVerticalOut(Ftile tile, Rainbow color) { + public ConnectionVerticalOut(Ftile tile, Rainbow color, TextBlock out2) { super(tile, null); this.color = color; + this.out2 = out2; } public void drawU(UGraphic ug) { @@ -400,6 +425,7 @@ class FtileIfLongHorizontal extends AbstractFtile { final Point2D p2 = new Point2D.Double(p1.getX(), totalHeight); final Snake snake = new Snake(arrowHorizontalAlignment(), color, Arrows.asToDown()); + snake.setLabel(out2); snake.addPoint(p1); snake.addPoint(p2); ug.draw(snake); @@ -477,7 +503,6 @@ class FtileIfLongHorizontal extends AbstractFtile { return Collections.unmodifiableList(result); } - @Override public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) { if (child == tile2) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java index 0a3ab2d..0cfb8ad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java @@ -105,7 +105,7 @@ public class FtileNoteAlone extends AbstractFtile implements Stencil { final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT), skinParam, CreoleMode.FULL).createSheet(note); final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), this, new UStroke(1)); - opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(), false); + opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(null), false); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java index 85c1736..b35b338 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java @@ -522,7 +522,12 @@ class FtileWhile extends AbstractFtile { final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; final double y1 = Math.max(3 * half, 4 * Diamond.diamondHalfSize); - final double x1 = getTranslateForWhile(stringBounder).getDx() - xDeltaBecauseSpecial(stringBounder); + final double xWhile = getTranslateForWhile(stringBounder).getDx() - Diamond.diamondHalfSize; + final double xDiamond = getTranslateDiamond1(stringBounder).getDx(); + // final double x1 = xWhile - xDeltaBecauseSpecial(stringBounder); + final double x1 = Math.min(xWhile, xDiamond) - xDeltaBecauseSpecial(stringBounder); + // final double x1 = getTranslateForWhile(stringBounder).getDx() - dimDiamond1.getWidth() + // - xDeltaBecauseSpecial(stringBounder); return new UTranslate(x1, y1); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java index d4b41bd..e2a574e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java @@ -135,9 +135,9 @@ public class FtileWithNoteOpale extends AbstractFtile implements Stencil { final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT), skinParam, CreoleMode.FULL).createSheet(note.getDisplay()); - final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), + final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, skinParam.wrapWidth() , skinParam.getPadding()), this, new UStroke(1)); - opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(), withLink); + opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(null), withLink); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java index cf2e906..805065f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java @@ -116,7 +116,7 @@ public class FtileWithNotes extends AbstractFtile { } }, new UStroke()); - final Opale opale = new Opale(borderColor, noteBackgroundColor, sheet2, skinParam.shadowing(), false); + final Opale opale = new Opale(borderColor, noteBackgroundColor, sheet2, skinParam.shadowing(null), false); final TextBlock opaleMarged = TextBlockUtils.withMargin(opale, 10, 10); if (note.getNotePosition() == NotePosition.LEFT) { if (left == null) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java index c442271..d810706 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java @@ -78,7 +78,7 @@ public class ParallelBuilderSplit2 extends ParallelFtilesBuilder { for (Ftile tmp : getList()) { final FtileGeometry dim = tmp.calculateDimension(getStringBounder()); if (first == 0) { - first = dim.getLeft(); + first = x + dim.getLeft(); } last = x + dim.getLeft(); conns.add(new ConnectionIn(thin, tmp, x, tmp.getInLinkRendering().getRainbow( @@ -123,7 +123,7 @@ public class ParallelBuilderSplit2 extends ParallelFtilesBuilder { final FtileGeometry dim = tmp.calculateDimension(getStringBounder()); if (dim.hasPointOut()) { if (first == 0) { - first = dim.getLeft(); + first = x + dim.getLeft(); } last = x + dim.getLeft(); } @@ -134,6 +134,9 @@ public class ParallelBuilderSplit2 extends ParallelFtilesBuilder { if (last < geom.getLeft()) { last = geom.getLeft(); } + if (first > geom.getLeft()) { + first = geom.getLeft(); + } ((FtileThinSplit) out).setGeom(first, last, geom.getWidth()); result = FtileUtils.addConnection(result, conns); return result; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index 11ca981..1ca6377 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -63,6 +63,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorateOut import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UFont; @@ -149,7 +150,7 @@ public class VCompactFactory implements FtileFactory { } public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note, - HtmlColor borderColor) { + HtmlColor borderColor, USymbol type, double roundCorner) { return list; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java index 92973f2..5b13e81 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java @@ -92,7 +92,7 @@ public class FtileBlackBlock extends AbstractFtile { public void drawU(UGraphic ug) { final URectangle rect = new URectangle(width, height, 5, 5); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { rect.setDeltaShadow(3); } ug.apply(new UChangeColor(colorBar)).apply(new UChangeBackColor(colorBar)).draw(rect); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index d7868eb..5a5b46e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -140,7 +140,7 @@ public class FtileBox extends AbstractFtile { final Dimension2D dimTotal = calculateDimension(ug.getStringBounder()); final double widthTotal = dimTotal.getWidth(); final double heightTotal = dimTotal.getHeight(); - final UDrawable rect = style.getUDrawable(widthTotal, heightTotal, skinParam().shadowing()); + final UDrawable rect = style.getUDrawable(widthTotal, heightTotal, skinParam().shadowing(null)); final HtmlColor borderColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBorder, null); final HtmlColor backColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBackground, null); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java index 0654f33..af85b48 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java @@ -95,7 +95,7 @@ public class FtileCircleEnd extends AbstractFtile { yTheoricalPosition = Math.round(yTheoricalPosition); final UEllipse circle = new UEllipse(SIZE, SIZE); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { circle.setDeltaShadow(3); } ug = ug.apply(new UChangeColor(backColor)); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java index 56bb8bb..c5c965d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java @@ -100,7 +100,7 @@ public class FtileCircleSpot extends AbstractFtile { final HtmlColor backColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBackground, null); final UEllipse circle = new UEllipse(SIZE, SIZE); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { circle.setDeltaShadow(3); } ug.apply(new UChangeColor(borderColor)).apply(new UChangeBackColor(backColor)).apply(getThickness()) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java index d1bcc52..b625fd9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java @@ -86,7 +86,7 @@ public class FtileCircleStart extends AbstractFtile { public void drawU(UGraphic ug) { final UEllipse circle = new UEllipse(SIZE, SIZE); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { circle.setDeltaShadow(3); } ug.apply(new UChangeColor(null)).apply(new UChangeBackColor(backColor)).draw(circle); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java index c121fe0..0048261 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java @@ -92,7 +92,7 @@ public class FtileCircleStop extends AbstractFtile { yTheoricalPosition = Math.round(yTheoricalPosition); final UEllipse circle = new UEllipse(SIZE, SIZE); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { circle.setDeltaShadow(3); } ug.apply(new UChangeColor(backColor)).apply(new UChangeBackColor(null)) @@ -100,7 +100,7 @@ public class FtileCircleStop extends AbstractFtile { final double delta = 4; final UEllipse circleSmall = new UEllipse(SIZE - delta * 2, SIZE - delta * 2); - if (skinParam().shadowing()) { + if (skinParam().shadowing(null)) { circleSmall.setDeltaShadow(3); } ug.apply(new UChangeColor(null)).apply(new UChangeBackColor(backColor)) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java index fab6461..20c2f4a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java @@ -130,7 +130,7 @@ public class FtileDiamond extends AbstractFtile { final double suppY1 = north.calculateDimension(ug.getStringBounder()).getHeight(); ug = ug.apply(new UTranslate(0, suppY1)); ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)) - .draw(Diamond.asPolygon(skinParam().shadowing())); + .draw(Diamond.asPolygon(skinParam().shadowing(null))); // final Dimension2D dimNorth = north.calculateDimension(ug.getStringBounder()); north.drawU(ug.apply(new UTranslate(Diamond.diamondHalfSize * 1.5, -suppY1))); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java index 4d95012..52b1cd8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java @@ -114,7 +114,7 @@ public class FtileDiamondFoo1 extends AbstractFtile { final Dimension2D dimLabel = label.calculateDimension(stringBounder); final Dimension2D dimTotal = calculateDimensionInternal(stringBounder); ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)); - ug.draw(Diamond.asPolygonFoo1(skinParam().shadowing(), dimTotal.getWidth(), dimTotal.getHeight())); + ug.draw(Diamond.asPolygonFoo1(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight())); north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java index d655fd4..46415dc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java @@ -131,7 +131,7 @@ public class FtileDiamondInside extends AbstractFtile { final Dimension2D dimLabel = label.calculateDimension(stringBounder); final Dimension2D dimTotal = calculateDimensionAlone(stringBounder); ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)); - ug.draw(Diamond.asPolygon(skinParam().shadowing(), dimTotal.getWidth(), dimTotal.getHeight())); + ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight())); north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java index 979ef38..f902659 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java @@ -120,7 +120,7 @@ public class FtileDiamondInside2 extends AbstractFtile { final Dimension2D dimLabel = label.calculateDimension(stringBounder); final Dimension2D dimTotal = calculateDimensionAlone(stringBounder); ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)); - ug.draw(Diamond.asPolygon(skinParam().shadowing(), dimTotal.getWidth(), dimTotal.getHeight())); + ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight())); north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java index 28eeab3..c9dc6ec 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java @@ -122,7 +122,7 @@ public class FtileDiamondInside3 extends AbstractFtile implements FtileOverpassi final Dimension2D dimLabel = label.calculateDimension(stringBounder); final Dimension2D dimTotal = calculateDimensionAlone(stringBounder); ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)); - ug.draw(Diamond.asPolygon(skinParam().shadowing(), dimTotal.getWidth(), dimTotal.getHeight())); + ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight())); north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight()))); |