From b5a6684cd1771927c93f8283996fede53a2375f1 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Fri, 19 Aug 2022 18:34:21 +0200 Subject: [PATCH] Refactoring about colors --- skin/plantuml.skin | 3 + src/net/sourceforge/plantuml/ColorParam.java | 82 +++++++++---------- .../sourceforge/plantuml/PSystemUtils.java | 4 +- src/net/sourceforge/plantuml/ProgressBar.java | 1 - src/net/sourceforge/plantuml/SkinParam.java | 8 +- .../sourceforge/plantuml/TitledDiagram.java | 4 +- .../activitydiagram3/InstructionEnd.java | 4 +- .../activitydiagram3/InstructionGroup.java | 4 +- .../activitydiagram3/InstructionStart.java | 4 +- .../activitydiagram3/InstructionStop.java | 4 +- .../command/CommandPartition3.java | 4 +- .../ftile/CollisionDetector.java | 4 +- .../ftile/UGraphicInterceptorUDrawable2.java | 4 +- .../plantuml/activitydiagram3/ftile/Zad.java | 4 +- .../UGraphicInterceptorOneSwimlane.java | 4 +- .../ftile/vertical/FtileBox.java | 6 +- .../ftile/vertical/FtileBox2.java | 6 +- .../ftile/vertical/FtileBoxOld.java | 7 +- .../ftile/vertical/FtileCircleStart.java | 4 +- .../ftile/vertical/FtileCircleStop.java | 4 +- .../ftile/vertical/FtileThinSplit.java | 4 +- .../activitydiagram3/gtile/GtileBox.java | 6 +- .../gtile/GtileCircleStart.java | 4 +- .../activitydiagram3/gtile/GtileGroup.java | 6 +- .../activitydiagram3/gtile/GtileWhile.java | 4 +- .../activitydiagram3/gtile/Gtiles.java | 1 - .../plantuml/board/BoardDiagram.java | 4 +- .../sourceforge/plantuml/board/CardBox.java | 4 +- .../sourceforge/plantuml/bpm/BpmElement.java | 8 +- .../plantuml/bpm/ConnectorPuzzleEmpty.java | 4 +- .../sourceforge/plantuml/bpm/GridArray.java | 6 +- .../plantuml/braille/BrailleDrawer.java | 4 +- .../sourceforge/plantuml/creole/Position.java | 6 +- .../plantuml/creole/atom/AtomTable.java | 6 +- .../plantuml/creole/legacy/AtomText.java | 51 ++++++------ .../plantuml/cucadiagram/LinkConstraint.java | 4 +- .../cucadiagram/StereotypeDecoration.java | 4 +- .../definition/PSystemDefinition.java | 4 +- .../plantuml/descdiagram/BoxedCharacter.java | 7 +- .../EntityImageDesignedDomain.java | 3 +- .../descdiagram/EntityImageDomain.java | 3 +- .../descdiagram/EntityImageMachine.java | 3 +- .../plantuml/eggs/GraphicsPath.java | 6 +- .../plantuml/eggs/PSystemColors.java | 8 +- .../plantuml/elk/CucaDiagramFileMakerElk.java | 9 +- src/net/sourceforge/plantuml/elk/ElkPath.java | 6 +- .../plantuml/emoji/SvgNanoParser.java | 4 +- .../plantuml/error/PSystemError.java | 20 ++--- .../plantuml/flowdiagram/ActivityBox.java | 6 +- .../plantuml/flowdiagram/FlowDiagram.java | 6 +- src/net/sourceforge/plantuml/golem/Tile.java | 4 +- .../plantuml/golem/TilesField.java | 4 +- .../plantuml/graphic/CircledCharacter.java | 6 +- .../plantuml/graphic/FontConfiguration.java | 4 +- .../plantuml/graphic/GraphicStrings.java | 20 ++--- .../sourceforge/plantuml/graphic/Rainbow.java | 4 +- .../plantuml/graphic/SymbolContext.java | 6 +- .../plantuml/graphic/TextBlockBordered.java | 6 +- .../plantuml/graphic/TextBlockLineBefore.java | 4 +- .../plantuml/graphic/USymbolDatabase.java | 8 +- .../plantuml/graphic/USymbolFrame.java | 4 +- .../plantuml/graphic/USymbolNode.java | 4 +- .../plantuml/graphic/USymbolQueue.java | 4 +- .../plantuml/graphic/USymbolStack.java | 6 +- .../plantuml/logo/PSystemLogo.java | 4 +- .../plantuml/logo/TurtleGraphicsPane.java | 4 +- .../plantuml/nwdiag/NwDiagram.java | 2 +- .../plantuml/nwdiag/VerticalLine.java | 4 +- .../plantuml/openiconic/OpenIcon.java | 4 +- .../openiconic/PSystemOpenIconic.java | 4 +- .../plantuml/project/GanttDiagram.java | 35 ++++++-- .../plantuml/project/OpenClose.java | 8 ++ .../project/command/CommandGroupEnd.java | 2 +- .../project/command/CommandGroupStart.java | 3 +- .../plantuml/project/core/TaskGroup.java | 10 ++- .../project/draw/AbstractTaskDraw.java | 6 +- .../plantuml/project/draw/RectangleTask.java | 10 +-- .../plantuml/project/draw/ResourceDraw.java | 8 +- .../plantuml/project/draw/TaskDrawGroup.java | 51 ++++++------ .../project/draw/TaskDrawSeparator.java | 4 +- .../plantuml/project/draw/TimeHeader.java | 7 +- .../project/lang/CenterBorderColor.java | 6 +- .../project/lang/SubjectDayOfWeek.java | 17 +++- .../plantuml/salt/PSystemSalt.java | 4 +- .../salt/element/AbstractElement.java | 6 +- .../salt/element/ElementDroplist.java | 4 +- .../salt/element/ElementRadioCheckbox.java | 6 +- .../plantuml/sdot/SmetanaPath.java | 7 +- .../teoz/PlayingSpaceWithParticipants.java | 4 +- .../plantuml/skin/AbstractComponent.java | 3 +- .../plantuml/skin/ActorAwesome.java | 3 +- .../plantuml/skin/ActorHollow.java | 3 +- .../plantuml/skin/ActorStickMan.java | 6 +- src/net/sourceforge/plantuml/skin/Area.java | 3 +- .../plantuml/skin/ArrowComponent.java | 2 +- .../sourceforge/plantuml/skin/Component.java | 1 - src/net/sourceforge/plantuml/skin/Padder.java | 9 +- .../plantuml/skin/VisibilityModifier.java | 8 +- .../skin/rose/ComponentRoseGroupingElse.java | 7 +- .../plantuml/sprite/ListSpriteDiagram.java | 4 +- .../plantuml/sprite/SpriteColor.java | 8 +- .../plantuml/sprite/SpriteMonochrome.java | 14 ++-- .../plantuml/sprite/StdlibDiagram.java | 4 +- src/net/sourceforge/plantuml/style/SName.java | 1 + src/net/sourceforge/plantuml/style/Style.java | 4 +- .../sourceforge/plantuml/style/ValueImpl.java | 4 +- .../sourceforge/plantuml/style/ValueNull.java | 4 +- .../plantuml/sudoku/GraphicsSudoku.java | 13 ++- .../sourceforge/plantuml/svek/Boundary.java | 4 +- .../sourceforge/plantuml/svek/Cluster.java | 43 ++++++---- .../svek/CucaDiagramFileMakerSvek.java | 50 ++++++----- .../plantuml/svek/GraphvizCrash.java | 4 +- .../plantuml/svek/GroupPngMakerState.java | 9 +- .../plantuml/svek/InnerStateAutonom.java | 8 +- .../plantuml/svek/RoundedContainer.java | 6 +- .../plantuml/svek/RoundedNorth.java | 4 +- .../plantuml/svek/RoundedSouth.java | 4 +- .../sourceforge/plantuml/svek/SvekLine.java | 8 +- .../sourceforge/plantuml/svek/SvekResult.java | 9 +- .../svek/extremity/ExtremityArrow.java | 4 +- .../extremity/ExtremityArrowAndCircle.java | 4 +- .../svek/extremity/ExtremityCircle.java | 4 +- .../svek/extremity/ExtremityDiamond.java | 7 +- .../svek/extremity/ExtremityHalfArrow.java | 4 +- .../svek/extremity/ExtremityStateLine1.java | 4 +- .../svek/extremity/ExtremityStateLine2.java | 4 +- .../svek/extremity/ExtremityTriangle.java | 4 +- .../svek/extremity/MiddleCircleCircled.java | 6 +- .../plantuml/svek/image/ConnectedCircle.java | 4 +- .../image/EntityImageAssociationPoint.java | 5 +- .../svek/image/EntityImageCircleEnd.java | 6 +- .../svek/image/EntityImageCircleStart.java | 4 +- .../plantuml/svek/image/EntityImageClass.java | 4 +- .../EntityImageLollipopInterfaceEye1.java | 4 +- .../EntityImageLollipopInterfaceEye2.java | 7 +- .../svek/image/EntityImageSynchroBar.java | 4 +- .../plantuml/tikz/TikzGraphics.java | 8 +- .../plantuml/timingdiagram/Highlight.java | 4 +- .../plantuml/timingdiagram/TimeMessage.java | 4 +- .../plantuml/ugraphic/FontChecker.java | 4 +- .../plantuml/ugraphic/ImageBuilder.java | 8 +- .../sourceforge/plantuml/ugraphic/MinMax.java | 4 +- .../plantuml/ugraphic/UGraphicNo.java | 4 +- .../plantuml/ugraphic/UGraphicNull.java | 4 +- .../ugraphic/color/AbstractColorMapper.java | 2 +- .../ugraphic/color/ColorMapperForceDark.java | 4 +- .../ugraphic/color/ColorMapperIdentity.java | 4 +- .../ugraphic/color/ColorMapperMonochrome.java | 4 +- ...omaticLegacy.java => HColorAutomagic.java} | 2 +- .../ugraphic/color/HColorGradient.java | 14 ++-- .../plantuml/ugraphic/color/HColorMiddle.java | 2 +- .../plantuml/ugraphic/color/HColorNone.java | 3 + ...HColorAutomatic.java => HColorScheme.java} | 6 +- .../plantuml/ugraphic/color/HColorSet.java | 14 ++-- .../color/{HColorUtils.java => HColors.java} | 16 +++- .../ugraphic/debug/UGraphicDebug.java | 14 ++-- .../plantuml/ugraphic/eps/DriverTextEps.java | 4 +- .../plantuml/ugraphic/g2d/DriverPathG2d.java | 4 +- .../ugraphic/g2d/DriverPolygonG2d.java | 4 +- .../ugraphic/g2d/DriverRectangleG2d.java | 4 +- .../plantuml/ugraphic/g2d/DriverTextG2d.java | 4 +- .../plantuml/ugraphic/svg/DriverTextSvg.java | 4 +- .../plantuml/ugraphic/txt/UGraphicTxt.java | 4 +- .../sourceforge/plantuml/version/Version.java | 2 +- src/net/sourceforge/plantuml/wire/Block.java | 4 +- src/net/sourceforge/plantuml/wire/Spot.java | 4 +- src/net/sourceforge/plantuml/wire/WBlock.java | 4 +- .../plantuml/wire/WLinkHorizontal.java | 6 +- .../plantuml/wire/WLinkVertical.java | 6 +- src/net/sourceforge/plantuml/wire/WPrint.java | 4 +- .../sourceforge/plantuml/SkinParamTest.java | 6 +- 171 files changed, 625 insertions(+), 573 deletions(-) rename src/net/sourceforge/plantuml/ugraphic/color/{HColorAutomaticLegacy.java => HColorAutomagic.java} (94%) rename src/net/sourceforge/plantuml/ugraphic/color/{HColorAutomatic.java => HColorScheme.java} (88%) rename src/net/sourceforge/plantuml/ugraphic/color/{HColorUtils.java => HColors.java} (93%) diff --git a/skin/plantuml.skin b/skin/plantuml.skin index d2183accf..4a9aeb5b2 100644 --- a/skin/plantuml.skin +++ b/skin/plantuml.skin @@ -215,6 +215,9 @@ stateDiagram { state { RoundCorner 25 } + stateBody { + BackGroundColor transparent + } element { title { FontStyle plain diff --git a/src/net/sourceforge/plantuml/ColorParam.java b/src/net/sourceforge/plantuml/ColorParam.java index 683eb55e0..772a5b630 100644 --- a/src/net/sourceforge/plantuml/ColorParam.java +++ b/src/net/sourceforge/plantuml/ColorParam.java @@ -38,62 +38,62 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; @HaxeIgnored public enum ColorParam { - background(HColorUtils.WHITE, true, ColorType.BACK), - hyperlink(HColorUtils.BLUE), + background(HColors.WHITE, true, ColorType.BACK), + hyperlink(HColors.BLUE), - activityBackground(HColorUtils.MY_YELLOW, true, ColorType.BACK), - activityBorder(HColorUtils.MY_RED, ColorType.LINE), + activityBackground(HColors.MY_YELLOW, true, ColorType.BACK), + activityBorder(HColors.MY_RED, ColorType.LINE), - classBackground(HColorUtils.MY_YELLOW, true, ColorType.BACK), + classBackground(HColors.MY_YELLOW, true, ColorType.BACK), - classBorder(HColorUtils.MY_RED, ColorType.LINE), + classBorder(HColors.MY_RED, ColorType.LINE), - arrowHead(HColorUtils.MY_RED, null), + arrowHead(HColors.MY_RED, null), - stateBorder(HColorUtils.MY_RED, ColorType.LINE), + stateBorder(HColors.MY_RED, ColorType.LINE), - noteBackground(HColorUtils.COL_FBFB77, true, ColorType.BACK), - noteBorder(HColorUtils.MY_RED, ColorType.LINE), + noteBackground(HColors.COL_FBFB77, true, ColorType.BACK), + noteBorder(HColors.MY_RED, ColorType.LINE), diagramBorder(null, ColorType.LINE), - actorBackground(HColorUtils.MY_YELLOW, true, ColorType.BACK), - actorBorder(HColorUtils.MY_RED, ColorType.LINE), - sequenceGroupBodyBackground(HColorUtils.RED, true, ColorType.BACK), - sequenceReferenceHeaderBackground(HColorUtils.COL_EEEEEE, true, ColorType.BACK), - sequenceReferenceBackground(HColorUtils.WHITE, true, ColorType.BACK), - sequenceLifeLineBorder(HColorUtils.MY_RED, ColorType.LINE), - sequenceNewpageSeparator(HColorUtils.BLACK, ColorType.LINE), - sequenceBoxBorder(HColorUtils.MY_RED, ColorType.LINE), + actorBackground(HColors.MY_YELLOW, true, ColorType.BACK), + actorBorder(HColors.MY_RED, ColorType.LINE), + sequenceGroupBodyBackground(HColors.RED, true, ColorType.BACK), + sequenceReferenceHeaderBackground(HColors.COL_EEEEEE, true, ColorType.BACK), + sequenceReferenceBackground(HColors.WHITE, true, ColorType.BACK), + sequenceLifeLineBorder(HColors.MY_RED, ColorType.LINE), + sequenceNewpageSeparator(HColors.BLACK, ColorType.LINE), + sequenceBoxBorder(HColors.MY_RED, ColorType.LINE), - iconPrivate(HColorUtils.COL_C82930), - iconPrivateBackground(HColorUtils.COL_F24D5C), - iconPackage(HColorUtils.COL_1963A0), - iconPackageBackground(HColorUtils.COL_4177AF), - iconProtected(HColorUtils.COL_B38D22), - iconProtectedBackground(HColorUtils.COL_FFFF44), - iconPublic(HColorUtils.COL_038048), - iconPublicBackground(HColorUtils.COL_84BE84), - iconIEMandatory(HColorUtils.BLACK), + iconPrivate(HColors.COL_C82930), + iconPrivateBackground(HColors.COL_F24D5C), + iconPackage(HColors.COL_1963A0), + iconPackageBackground(HColors.COL_4177AF), + iconProtected(HColors.COL_B38D22), + iconProtectedBackground(HColors.COL_FFFF44), + iconPublic(HColors.COL_038048), + iconPublicBackground(HColors.COL_84BE84), + iconIEMandatory(HColors.BLACK), - arrowLollipop(HColorUtils.WHITE), + arrowLollipop(HColors.WHITE), - machineBackground(HColorUtils.WHITE), - machineBorder(HColorUtils.BLACK, ColorType.LINE), - requirementBackground(HColorUtils.WHITE), - requirementBorder(HColorUtils.BLACK, ColorType.LINE), - designedBackground(HColorUtils.WHITE), - designedBorder(HColorUtils.BLACK, ColorType.LINE), - domainBackground(HColorUtils.WHITE), - domainBorder(HColorUtils.BLACK, ColorType.LINE), - lexicalBackground(HColorUtils.WHITE), - lexicalBorder(HColorUtils.BLACK, ColorType.LINE), - biddableBackground(HColorUtils.WHITE), - biddableBorder(HColorUtils.BLACK, ColorType.LINE); + machineBackground(HColors.WHITE), + machineBorder(HColors.BLACK, ColorType.LINE), + requirementBackground(HColors.WHITE), + requirementBorder(HColors.BLACK, ColorType.LINE), + designedBackground(HColors.WHITE), + designedBorder(HColors.BLACK, ColorType.LINE), + domainBackground(HColors.WHITE), + domainBorder(HColors.BLACK, ColorType.LINE), + lexicalBackground(HColors.WHITE), + lexicalBorder(HColors.BLACK, ColorType.LINE), + biddableBackground(HColors.WHITE), + biddableBorder(HColors.BLACK, ColorType.LINE); private final boolean isBackground; private final HColor defaultValue; diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java index 876cbf842..4ea2f442d 100644 --- a/src/net/sourceforge/plantuml/PSystemUtils.java +++ b/src/net/sourceforge/plantuml/PSystemUtils.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.png.PngSplitter; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class PSystemUtils { @@ -179,7 +179,7 @@ public class PSystemUtils { fileFormatOption.isWithMetadata() ? diagram.getMetadata() : null, diagram.getSkinParam().getDpi(), diagram instanceof GanttDiagram - ? new SplitParam(HColorUtils.BLACK, null, 5) // for backwards compatibility + ? new SplitParam(HColors.BLACK, null, 5) // for backwards compatibility : diagram.getSkinParam().getSplitParam() ).getFiles(); diff --git a/src/net/sourceforge/plantuml/ProgressBar.java b/src/net/sourceforge/plantuml/ProgressBar.java index 119d558d2..4ef3c6649 100644 --- a/src/net/sourceforge/plantuml/ProgressBar.java +++ b/src/net/sourceforge/plantuml/ProgressBar.java @@ -142,4 +142,3 @@ public class ProgressBar { } } } - diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java index 5d586392b..f4f5250ce 100644 --- a/src/net/sourceforge/plantuml/SkinParam.java +++ b/src/net/sourceforge/plantuml/SkinParam.java @@ -88,7 +88,7 @@ import net.sourceforge.plantuml.ugraphic.color.ColorMapperReverse; import net.sourceforge.plantuml.ugraphic.color.ColorOrder; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class SkinParam implements ISkinParam { @@ -251,14 +251,14 @@ public class SkinParam implements ISkinParam { public HColor getHyperlinkColor() { final HColor result = getHtmlColor(ColorParam.hyperlink, null, false); if (result == null) - return HColorUtils.BLUE; + return HColors.BLUE; return result; } public HColor getBackgroundColor() { final HColor result = getHtmlColor(ColorParam.background, null, false); - return result != null ? result : HColorUtils.WHITE; + return result != null ? result : HColors.WHITE; } public String getValue(String key) { @@ -316,7 +316,7 @@ public class SkinParam implements ISkinParam { } if ((param == ColorParam.background || param == ColorParam.arrowHead) && (value.equalsIgnoreCase("transparent") || value.equalsIgnoreCase("none"))) { - return HColorUtils.transparent(); + return HColors.transparent(); } if (param == ColorParam.background) { return getIHtmlColorSet().getColorOrWhite(themeStyle, value); diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index 007be77fd..53ad0fd2c 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -61,7 +61,7 @@ import net.sourceforge.plantuml.style.StyleLoader; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.ImageBuilder; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class TitledDiagram extends AbstractPSystem implements Diagram, Annotated { @@ -281,7 +281,7 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram, HColor backgroundColor = style.value(PName.BackGroundColor).asColor(this.getSkinParam().getThemeStyle(), this.getSkinParam().getIHtmlColorSet()); if (backgroundColor == null) - backgroundColor = HColorUtils.transparent(); + backgroundColor = HColors.transparent(); return backgroundColor; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java index fc5624fae..f8c049b0f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class InstructionEnd extends MonoSwimable implements Instruction { @@ -59,7 +59,7 @@ public class InstructionEnd extends MonoSwimable implements Instruction { @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { - return new GtileCircleStart(stringBounder, skinParam, HColorUtils.BLACK, getSwimlaneIn()); + return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java index e68f10979..1c93503bc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class InstructionGroup extends AbstractInstruction implements Instruction, InstructionCollection { @@ -96,7 +96,7 @@ public class InstructionGroup extends AbstractInstruction implements Instruction @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { Gtile tmp = list.createGtile(skinParam, stringBounder); - return new GtileGroup(tmp, title, null, HColorUtils.BLUE, backColor, titleColor, tmp.skinParam(), borderColor, + return new GtileGroup(tmp, title, null, HColors.BLUE, backColor, titleColor, tmp.skinParam(), borderColor, type, roundCorner); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java index 8f32bd229..6dc483af1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class InstructionStart extends MonoSwimable implements Instruction { @@ -64,7 +64,7 @@ public class InstructionStart extends MonoSwimable implements Instruction { @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { - return new GtileCircleStart(stringBounder, skinParam, HColorUtils.BLACK, getSwimlaneIn()); + return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java index 31e8ddede..122c01885 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class InstructionStop extends MonoSwimable implements Instruction { @@ -64,7 +64,7 @@ public class InstructionStop extends MonoSwimable implements Instruction { @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { - return new GtileCircleStart(stringBounder, skinParam, HColorUtils.BLACK, getSwimlaneIn()); + return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index 71839a1a3..4fa50891c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -57,7 +57,7 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class CommandPartition3 extends SingleLineCommand2 { @@ -133,7 +133,7 @@ public class CommandPartition3 extends SingleLineCommand2 { backColor = stylePartition.value(PName.BackGroundColor).asColor(diagram.getSkinParam().getThemeStyle(), diagram.getSkinParam().getIHtmlColorSet()); - final HColor titleColor = HColorUtils.BLUE;// stylePartition.value(PName.FontColor).asColor(diagram.getSkinParam().getIHtmlColorSet()); + final HColor titleColor = HColors.BLUE;// stylePartition.value(PName.FontColor).asColor(diagram.getSkinParam().getIHtmlColorSet()); final double roundCorner = stylePartition.value(PName.RoundCorner).asDouble(); diagram.startGroup(Display.getWithNewlines(partitionTitle), backColor, titleColor, borderColor, symbol, diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java index 7e73b79bf..d42b8f28e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java @@ -55,7 +55,7 @@ import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; @HaxeIgnored public class CollisionDetector extends UGraphicNo { @@ -98,7 +98,7 @@ public class CollisionDetector extends UGraphicNo { if (collision(minmax)) minmax.drawGray(ug); - final HColor color = HColorUtils.BLACK; + final HColor color = HColors.BLACK; ug = ug.apply(color).apply(new UStroke(5)); for (Snake snake : snakes) for (Line2D line : snake.getHorizontalLines()) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java index 90a7bc94d..f2ad6ea01 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator { @@ -91,7 +91,7 @@ public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator { } private void drawGoto(FtileGoto ftile) { - final HColor gotoColor = HColorUtils.MY_RED; + final HColor gotoColor = HColors.MY_RED; final FtileGeometry geom = ftile.calculateDimension(getStringBounder()); final Point2D pt = geom.getPointIn(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java index b5974e008..0aeddfdae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java @@ -40,7 +40,7 @@ import java.util.List; import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Zad { @@ -53,7 +53,7 @@ public class Zad { } public void drawDebug(UGraphic ug) { - ug = ug.apply(HColorUtils.BLUE.bg()).apply(HColorUtils.RED_LIGHT); + ug = ug.apply(HColors.BLUE.bg()).apply(HColors.RED_LIGHT); for (MinMax minMax : rectangles) { System.err.println("minmax=" + minMax); minMax.drawGray(ug); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java index 87099c264..4d0234d9a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { @@ -109,7 +109,7 @@ public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { } private void drawGoto() { - final UGraphic ugGoto = getUg().apply(HColorUtils.GREEN).apply(HColorUtils.GREEN.bg()); + final UGraphic ugGoto = getUg().apply(HColors.GREEN).apply(HColors.GREEN.bg()); ugGoto.draw(new ULine(100, 100)); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index 1e2d5465f..c03078d3a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -74,7 +74,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileBox extends AbstractFtile { @@ -196,12 +196,12 @@ public class FtileBox extends AbstractFtile { final UStroke thickness = style.getStroke(); if (borderColor == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(borderColor); if (backColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backColor.bg()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java index 3a7d63b38..770d31141 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java @@ -75,7 +75,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileBox2 extends AbstractFtile { @@ -201,12 +201,12 @@ public class FtileBox2 extends AbstractFtile { final UStroke thickness = style.getStroke(); if (borderColor == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(borderColor); if (backColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backColor.bg()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java index c4e828a82..f66a36a95 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java @@ -64,7 +64,6 @@ import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -73,7 +72,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileBoxOld extends AbstractFtile { @@ -197,12 +196,12 @@ public class FtileBoxOld extends AbstractFtile { final UStroke thickness = style.getStroke(); if (borderColor == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(borderColor); if (backColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backColor.bg()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java index 11d79be4f..a2c4bf22c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileCircleStart extends AbstractFtile { @@ -65,7 +65,7 @@ public class FtileCircleStart extends AbstractFtile { super(skinParam); this.swimlane = swimlane; this.backColor = backColor; - this.borderColor = new HColorNone(); + this.borderColor = HColors.none(); this.shadowing = style.value(PName.Shadowing).asDouble(); this.backColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), getIHtmlColorSet()); this.borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(), getIHtmlColorSet()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java index 730c07e07..32a10633d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorMiddle; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileCircleStop extends AbstractFtile { @@ -104,7 +104,7 @@ public class FtileCircleStop extends AbstractFtile { // if (skinParam().shadowing(null)) { // circleSmall.setDeltaShadow(3); // } - ug.apply(new HColorMiddle(borderColor, backColor)).apply(borderColor.bg()).apply(new UTranslate(delta, delta)) + ug.apply(HColors.middle(borderColor, backColor)).apply(borderColor.bg()).apply(new UTranslate(delta, delta)) .draw(circleSmall); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java index 9edb438aa..07e4fa2ad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FtileThinSplit extends AbstractFtile { @@ -88,7 +88,7 @@ public class FtileThinSplit extends AbstractFtile { final UShape rect = ULine.hline(last - first); ug = ug.apply(UTranslate.dx(first)); if (colorBar == null) { - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); } else { ug = ug.apply(colorBar); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java index 381c9a851..acf50ca5e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java @@ -68,7 +68,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GtileBox extends AbstractGtile { @@ -173,12 +173,12 @@ public class GtileBox extends AbstractGtile { final UStroke thickness = style.getStroke(); if (borderColor == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(borderColor); if (backColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backColor.bg()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java index 7894e63dd..625db58fc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GtileCircleStart extends AbstractGtile { @@ -72,7 +72,7 @@ public class GtileCircleStart extends AbstractGtile { protected void drawUInternal(UGraphic ug) { final UEllipse circle = new UEllipse(SIZE, SIZE); circle.setDeltaShadow(shadowing); - ug.apply(new HColorNone()).apply(backColor.bg()).draw(circle); + ug.apply(HColors.none()).apply(backColor.bg()).draw(circle); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java index 1ae8a560a..7e4684f4c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java @@ -62,7 +62,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.utils.MathUtils; public class GtileGroup extends AbstractGtileRoot { @@ -96,9 +96,9 @@ public class GtileGroup extends AbstractGtileRoot { super(inner.getStringBounder(), skinParam); this.roundCorner = roundCorner; this.type = type; - this.backColor = backColor == null ? HColorUtils.WHITE : backColor; + this.backColor = backColor == null ? HColors.WHITE : backColor; this.inner = inner; - this.borderColor = borderColor == null ? HColorUtils.BLACK : borderColor; + this.borderColor = borderColor == null ? HColors.BLACK : borderColor; final Style style = getDefaultStyleDefinitionPartition().getMergedStyle(skinParam.getCurrentStyleBuilder()); final FontConfiguration fc = style.getFontConfiguration(skinParam.getThemeStyle(), diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java index cb09ff16b..afc8aeaf7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GtileWhile extends GtileTopDown3 { @@ -58,7 +58,7 @@ public class GtileWhile extends GtileTopDown3 { private static Gtile getShape1(Gtile toto, Swimlane swimlane, Display test, Display yes) { GtileHexagonInside tmp0 = Gtiles.hexagonInside(swimlane, toto.getStringBounder(), toto.skinParam(), - getDefaultStyleDefinitionDiamond(), HColorUtils.BLUE, test); + getDefaultStyleDefinitionDiamond(), HColors.BLUE, test); // final TextBlock tmp0 = branches.get(0).getTextBlockPositive(); // return Gtiles.withSouthMargin(tmp.withSouthLabel(tmp0), 10); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java index 7378e5b2d..5c930c70f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; diff --git a/src/net/sourceforge/plantuml/board/BoardDiagram.java b/src/net/sourceforge/plantuml/board/BoardDiagram.java index e1da058c9..7df76bd20 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagram.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagram.java @@ -60,7 +60,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class BoardDiagram extends UmlDiagram { @@ -120,7 +120,7 @@ public class BoardDiagram extends UmlDiagram { for (int i = 0; i < getMaxStage(); i++) { final double dy = (i + 1) * PostIt.getHeight() - 10; - ug.apply(HColorUtils.BLACK).apply(new UStroke(5, 5, 0.5)).apply(UTranslate.dy(dy)).draw(line); + ug.apply(HColors.BLACK).apply(new UStroke(5, 5, 0.5)).apply(UTranslate.dy(dy)).draw(line); } } diff --git a/src/net/sourceforge/plantuml/board/CardBox.java b/src/net/sourceforge/plantuml/board/CardBox.java index 5da0c4726..adba277d5 100644 --- a/src/net/sourceforge/plantuml/board/CardBox.java +++ b/src/net/sourceforge/plantuml/board/CardBox.java @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class CardBox extends AbstractTextBlock { @@ -72,7 +72,7 @@ public class CardBox extends AbstractTextBlock { final URectangle rect = new URectangle(calculateDimension(ug.getStringBounder())); rect.setDeltaShadow(1); - ug.apply(HColorUtils.BLACK).apply(HColorUtils.LIGHT_GRAY.bg()).draw(rect); + ug.apply(HColors.BLACK).apply(HColors.LIGHT_GRAY.bg()).draw(rect); label.create(FontConfiguration.blackBlueTrue(UFont.sansSerif(14)), HorizontalAlignment.LEFT, skinParam) .drawU(ug.apply(new UTranslate(3, 3))); diff --git a/src/net/sourceforge/plantuml/bpm/BpmElement.java b/src/net/sourceforge/plantuml/bpm/BpmElement.java index 1b6e31a9b..6f32729a5 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmElement.java +++ b/src/net/sourceforge/plantuml/bpm/BpmElement.java @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzzle { @@ -99,7 +99,7 @@ public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzz public void drawU(UGraphic ug) { raw.drawU(ug); - ug = ug.apply(HColorUtils.RED); + ug = ug.apply(HColors.RED); for (Where w : Where.values()) { if (have(w)) { drawLine(ug, w, raw.calculateDimension(ug.getStringBounder())); @@ -148,7 +148,7 @@ public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzz public TextBlock toTextBlockInternal(ISkinParam skinParam) { if (type == BpmElementType.START) { - return new FtileCircleStart(skinParam, HColorUtils.BLACK, null, getStyle(skinParam)); + return new FtileCircleStart(skinParam, HColors.BLACK, null, getStyle(skinParam)); } if (type == BpmElementType.MERGE) { final HColor borderColor = SkinParamUtils.getColor(skinParam, null, ColorParam.activityBorder); @@ -160,7 +160,7 @@ public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzz return FtileBox.create(skinParam, display, null, BoxStyle.PLAIN, null); } final UFont font = UFont.serif(14); - final FontConfiguration fc = FontConfiguration.create(font, HColorUtils.RED, HColorUtils.RED, false); + final FontConfiguration fc = FontConfiguration.create(font, HColors.RED, HColors.RED, false); if (Display.isNull(display)) { return Display.getWithNewlines(type.toString()).create(fc, HorizontalAlignment.LEFT, skinParam); } diff --git a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java index 519fe4f13..1e4adff99 100644 --- a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java +++ b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ConnectorPuzzleEmpty extends AbstractConnectorPuzzle implements Placeable, TextBlock, ConnectorPuzzle { @@ -88,7 +88,7 @@ public class ConnectorPuzzleEmpty extends AbstractConnectorPuzzle implements Pla public void drawU(UGraphic ug) { // System.err.println("DRAWING " + toString()); - ug = ug.apply(HColorUtils.BLUE); + ug = ug.apply(HColors.BLUE); for (Where w : Where.values()) { if (have(w)) { drawLine(ug, w); diff --git a/src/net/sourceforge/plantuml/bpm/GridArray.java b/src/net/sourceforge/plantuml/bpm/GridArray.java index c7136e86a..1394c3e50 100644 --- a/src/net/sourceforge/plantuml/bpm/GridArray.java +++ b/src/net/sourceforge/plantuml/bpm/GridArray.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GridArray implements UDrawable { @@ -154,7 +154,7 @@ public class GridArray implements UDrawable { for (int c = 0; c < cols; c++) { widthMax += getWidthOfCol(ug.getStringBounder(), c) + margin; } - ug = ug.apply(HColorUtils.BLACK); + ug = ug.apply(HColors.BLACK); double y = 0; for (int l = 0; l < lines; l++) { ug.apply(UTranslate.dy(y)).draw(ULine.hline(widthMax)); @@ -169,7 +169,7 @@ public class GridArray implements UDrawable { } private void drawArrow(UGraphic ug, Point2D pt1, Point2D pt2) { - ug = ug.apply(HColorUtils.BLUE); + ug = ug.apply(HColors.BLUE); final ULine line = new ULine(pt2.getX() - pt1.getX(), pt2.getY() - pt1.getY()); ug.apply(new UTranslate(pt1)).draw(line); } diff --git a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java index 6a32f5b40..587f5e354 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java +++ b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class BrailleDrawer implements UDrawable { @@ -64,7 +64,7 @@ public class BrailleDrawer implements UDrawable { ug.apply(UTranslate.dy(y * step + spotSize + 1)) .draw(ULine.hline((grid.getMaxX() - grid.getMinX()) * step)); } - ug = ug.apply(HColorUtils.BLACK).apply(HColorUtils.BLACK.bg()); + ug = ug.apply(HColors.BLACK).apply(HColors.BLACK.bg()); for (int x = grid.getMinX(); x <= grid.getMaxX(); x++) { for (int y = grid.getMinY(); y <= grid.getMaxY(); y++) { if (grid.getState(x, y)) { diff --git a/src/net/sourceforge/plantuml/creole/Position.java b/src/net/sourceforge/plantuml/creole/Position.java index ebd894a19..259629abb 100644 --- a/src/net/sourceforge/plantuml/creole/Position.java +++ b/src/net/sourceforge/plantuml/creole/Position.java @@ -36,13 +36,11 @@ package net.sourceforge.plantuml.creole; import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Position { @@ -97,7 +95,7 @@ public class Position { } public void drawDebug(UGraphic ug) { - ug = ug.apply(HColorUtils.BLACK).apply(new HColorNone().bg()); + ug = ug.apply(HColors.BLACK).apply(HColors.none().bg()); ug = ug.apply(new UTranslate(x, y)); ug.draw(new URectangle(dim)); } diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java index 0a5a3345b..1ea2dccd1 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class AtomTable extends AbstractAtom implements Atom { @@ -107,7 +107,7 @@ public class AtomTable extends AbstractAtom implements Atom { final double y2 = getStartingY(i + 1); final double x1 = getStartingX(0); final double x2 = getStartingX(getNbCols()); - ug.apply(new HColorNone()).apply(line.lineBackColor.bg()).apply(new UTranslate(x1, y1)) + ug.apply(HColors.none()).apply(line.lineBackColor.bg()).apply(new UTranslate(x1, y1)) .draw(new URectangle(x2 - x1, y2 - y1)); } for (int j = 0; j < getNbCols(); j++) { @@ -126,7 +126,7 @@ public class AtomTable extends AbstractAtom implements Atom { if (cellBackColor != null) { final double y1 = getStartingY(i); final double y2 = getStartingY(i + 1); - ug.apply(new HColorNone()).apply(cellBackColor.bg()).apply(new UTranslate(x1, y1)) + ug.apply(HColors.none()).apply(cellBackColor.bg()).apply(new UTranslate(x1, y1)) .draw(new URectangle(x2 - x1, y2 - y1)); } final Position pos = positions.get(cell); diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java index 2fbfde63c..e322ea406 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java @@ -58,8 +58,8 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorAutomatic; -import net.sourceforge.plantuml.ugraphic.color.HColorAutomaticLegacy; +import net.sourceforge.plantuml.ugraphic.color.HColorScheme; +import net.sourceforge.plantuml.ugraphic.color.HColorAutomagic; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; import net.sourceforge.plantuml.utils.CharHidder; @@ -79,9 +79,8 @@ public final class AtomText extends AbstractAtom implements Atom { protected AtomText(String text, FontConfiguration style, Url url, DelayedDouble marginLeft, DelayedDouble marginRight, boolean manageSpecialChars) { - if (text.contains("" + BackSlash.hiddenNewLine())) { + if (text.contains("" + BackSlash.hiddenNewLine())) throw new IllegalArgumentException(text); - } // if (text.length() > 0) { // final VisibilityModifier visibilityModifier = VisibilityModifier.getByUnicode(text.charAt(0)); @@ -118,23 +117,22 @@ public final class AtomText extends AbstractAtom implements Atom { Log.debug("g2d=" + rect); Log.debug("Size for " + text + " is " + rect); double h = rect.getHeight(); - if (h < 10) { + if (h < 10) h = 10; - } + double width = text.indexOf("\t") == -1 ? rect.getWidth() : getWidth(stringBounder, text); final double left = marginLeft.getDouble(stringBounder); final double right = marginRight.getDouble(stringBounder); - if (visibility != null) { + if (visibility != null) width += visibility.calculateDimension(stringBounder).getWidth(); - } return new Dimension2DDouble(width + left + right, h); } public void drawU(UGraphic ug) { - if (url != null) { + if (url != null) ug.startUrl(url); - } + if (ug.matchesProperty("SPECIALTXT")) { ug.draw(this); } else { @@ -145,21 +143,21 @@ public final class AtomText extends AbstractAtom implements Atom { } HColor textColor = fontConfiguration.getColor(); FontConfiguration useFontConfiguration = fontConfiguration; - if (textColor instanceof HColorAutomaticLegacy && ug.getParam().getBackcolor() != null) { + if (textColor instanceof HColorAutomagic && ug.getParam().getBackcolor() != null) { textColor = ((HColorSimple) ug.getParam().getBackcolor()).opposite(); useFontConfiguration = fontConfiguration.changeColor(textColor); } - if (textColor instanceof HColorAutomatic) { + if (textColor instanceof HColorScheme) { HColor backcolor = ug.getParam().getBackcolor(); - if (backcolor == null) { + if (backcolor == null) backcolor = ug.getDefaultBackground(); - } - textColor = ((HColorAutomatic) textColor).getAppropriateColor(backcolor); + + textColor = ((HColorScheme) textColor).getAppropriateColor(backcolor); useFontConfiguration = fontConfiguration.changeColor(textColor); } - if (marginLeft != AtomTextUtils.ZERO) { + + if (marginLeft != AtomTextUtils.ZERO) ug = ug.apply(UTranslate.dx(marginLeft.getDouble(ug.getStringBounder()))); - } final StringTokenizer tokenizer = new StringTokenizer(text, "\t", true); @@ -186,9 +184,9 @@ public final class AtomText extends AbstractAtom implements Atom { } } } - if (url != null) { + if (url != null) ug.closeUrl(); - } + } private double getWidth(StringBounder stringBounder, String text) { @@ -210,9 +208,9 @@ public final class AtomText extends AbstractAtom implements Atom { private String tabString() { final int nb = fontConfiguration.getTabSize(); - if (nb >= 1 && nb < 7) { + if (nb >= 1 && nb < 7) return " ".substring(0, nb); - } + return " "; } @@ -268,9 +266,9 @@ public final class AtomText extends AbstractAtom implements Atom { public List getSplitted(StringBounder stringBounder, LineBreakStrategy maxWidthAsString) { final double maxWidth = maxWidthAsString.getMaxWidth(); - if (maxWidth == 0) { + if (maxWidth == 0) throw new IllegalStateException(); - } + final List result = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(text, " ", true); final StringBuilder currentLine = new StringBuilder(); @@ -281,9 +279,9 @@ public final class AtomText extends AbstractAtom implements Atom { if (w > maxWidth) { result.add(withText(currentLine.toString())); currentLine.setLength(0); - if (tmp.startsWith(" ") == false) { + if (tmp.startsWith(" ") == false) currentLine.append(tmp); - } + } else { currentLine.append(tmp); } @@ -300,9 +298,8 @@ public final class AtomText extends AbstractAtom implements Atom { if (tmp.length() > 0 && getWidth(stringBounder, tmp.toString() + token) > width) { final Atom part1 = withText(tmp.toString()); String remain = text.substring(tmp.length()); - while (remain.startsWith(" ")) { + while (remain.startsWith(" ")) remain = remain.substring(1); - } final Atom part2 = withText(remain); return Arrays.asList(part1, part2); diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java index 3f2310596..cf9a091d5 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class LinkConstraint { @@ -85,7 +85,7 @@ public class LinkConstraint { if (x2 == 0 && y2 == 0) { return; } - ug = ug.apply(HColorUtils.BLACK); + ug = ug.apply(HColors.BLACK); // ug.apply(new UTranslate(x1, y1)).draw(new URectangle(10, 10)); // ug.apply(new UTranslate(x2, y2)).draw(new URectangle(10, 10)); diff --git a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java index 2cdb4517b..76e7c4bac 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java +++ b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.sprite.SpriteUtils; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class StereotypeDecoration { @@ -155,7 +155,7 @@ public class StereotypeDecoration { final String colName = mCircleSprite.get("COLOR", 0); final HColor col = colName == null ? null : htmlColorSet.getColorLEGACY(colName); - htmlColor = col == null ? HColorUtils.BLACK : col; + htmlColor = col == null ? HColors.BLACK : col; character = '\0'; spriteName = mCircleSprite.get("NAME", 0); spriteScale = Parser.getScale(mCircleSprite.get("SCALE", 0), 1); diff --git a/src/net/sourceforge/plantuml/definition/PSystemDefinition.java b/src/net/sourceforge/plantuml/definition/PSystemDefinition.java index 1d8484a44..bb4517665 100644 --- a/src/net/sourceforge/plantuml/definition/PSystemDefinition.java +++ b/src/net/sourceforge/plantuml/definition/PSystemDefinition.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class PSystemDefinition extends PlainDiagram implements UDrawable { @@ -73,7 +73,7 @@ public class PSystemDefinition extends PlainDiagram implements UDrawable { public void drawU(UGraphic ug) { final UFont font = UFont.sansSerif(14); - final FontConfiguration fc = FontConfiguration.create(font, HColorUtils.BLACK, HColorUtils.BLACK, false); + final FontConfiguration fc = FontConfiguration.create(font, HColors.BLACK, HColors.BLACK, false); Display.getWithNewlines(startLine).create(fc, HorizontalAlignment.LEFT, new SpriteContainerEmpty()).drawU(ug); } diff --git a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java index 06c62cb40..5b45e4162 100644 --- a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java +++ b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.descdiagram; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; @@ -47,7 +46,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class BoxedCharacter extends AbstractTextBlock implements TextBlock { @@ -72,7 +71,7 @@ public class BoxedCharacter extends AbstractTextBlock implements TextBlock { ug = ug.apply(circle); } if (innerCircle == null) { - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); } else { ug = ug.apply(innerCircle.bg()); } diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java index acdb9993c..00ec195a8 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; @@ -45,6 +43,7 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.ILeaf; import net.sourceforge.plantuml.cucadiagram.Stereotype; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java index 4305bd35d..d06721b7a 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; @@ -45,6 +43,7 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.ILeaf; import net.sourceforge.plantuml.cucadiagram.Stereotype; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java index 5dbcece83..ba80bb0fd 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; @@ -45,6 +43,7 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.ILeaf; import net.sourceforge.plantuml.cucadiagram.Stereotype; diff --git a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java index 3433a8243..af1ba8f1d 100644 --- a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java +++ b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UMotif; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; public class GraphicsPath { @@ -75,10 +75,10 @@ public class GraphicsPath { final BufferedImage im = builder.getBufferedImage(); final Graphics2D g2d = builder.getGraphics2D(); - final UGraphicG2d ug = new UGraphicG2d(HColorUtils.WHITE, colorMapper, stringBounder, g2d, 1.0); + final UGraphicG2d ug = new UGraphicG2d(HColors.WHITE, colorMapper, stringBounder, g2d, 1.0); ug.setBufferedImage(im); final UMotif motif = new UMotif(path); - motif.drawHorizontal(ug.apply((UChange) HColorUtils.BLACK), 20, 20, 1); + motif.drawHorizontal(ug.apply((UChange) HColors.BLACK), 20, 20, 1); g2d.dispose(); return im; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemColors.java b/src/net/sourceforge/plantuml/eggs/PSystemColors.java index 21cb59e53..a674e48c4 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemColors.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemColors.java @@ -64,7 +64,7 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; // http://www.redblobgames.com/grids/hexagons/ public class PSystemColors extends PlainDiagram implements UDrawable { @@ -169,7 +169,7 @@ public class PSystemColors extends PlainDiagram implements UDrawable { continue; } final String candidat = colorName.substring(0, i) + BackSlash.BS_BS_N + colorName.substring(i); - final TextBlock tt = getTextName(font, candidat, (HColorSimple) HColorUtils.BLACK); + final TextBlock tt = getTextName(font, candidat, (HColorSimple) HColors.BLACK); final double width = tt.calculateDimension(stringBounder).getWidth(); if (width < min) { result = candidat; @@ -239,7 +239,7 @@ public class PSystemColors extends PlainDiagram implements UDrawable { private void drawFull(UGraphic ug) { final UFont font = UFont.sansSerif(14).bold(); - ug = ug.apply(HColorUtils.BLACK); + ug = ug.apply(HColors.BLACK); int i = 0; int j = 0; for (String name : colors.names()) { @@ -260,7 +260,7 @@ public class PSystemColors extends PlainDiagram implements UDrawable { private TextBlock getTextName(final UFont font, String name, final HColorSimple color) { final HColorSimple opposite = color.opposite(); - final FontConfiguration fc = FontConfiguration.create(font, opposite, HColorUtils.BLUE, true); + final FontConfiguration fc = FontConfiguration.create(font, opposite, HColors.BLUE, true); final TextBlock tt = Display.getWithNewlines(name).create(fc, HorizontalAlignment.CENTER, new SpriteContainerEmpty()); return tt; diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index 3acb09eeb..24913c1c5 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -131,7 +131,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; /* * Some notes: @@ -263,8 +263,9 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { final UStroke stroke = Cluster.getStrokeInternal(group, style); HColor backColor = getBackColor(umlDiagramType); - backColor = Cluster.getBackColor(backColor, skinParam, group.getStereotype(), umlDiagramType.getStyleName(), - group.getUSymbol()); + backColor = Cluster.getBackColor(backColor, group.getStereotype(), umlDiagramType.getStyleName(), + group.getUSymbol(), skinParam.getCurrentStyleBuilder(), skinParam.getThemeStyle(), + skinParam.getIHtmlColorSet()); final double roundCorner = style.value(PName.RoundCorner).asDouble(); // final double roundCorner = group.getUSymbol() == null ? 0 @@ -276,7 +277,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { final ClusterDecoration decoration = new ClusterDecoration(packageStyle, group.getUSymbol(), ztitle, zstereo, 0, 0, elkNode.getWidth(), elkNode.getHeight(), stroke); - final HColor borderColor = HColorUtils.BLACK; + final HColor borderColor = HColors.BLACK; decoration.drawU(ug.apply(new UTranslate(corner)), backColor, borderColor, shadowing, roundCorner, skinParam.getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false, null), skinParam.getStereotypeAlignment(), 0); diff --git a/src/net/sourceforge/plantuml/elk/ElkPath.java b/src/net/sourceforge/plantuml/elk/ElkPath.java index e801cc46a..5bbcba62e 100644 --- a/src/net/sourceforge/plantuml/elk/ElkPath.java +++ b/src/net/sourceforge/plantuml/elk/ElkPath.java @@ -82,7 +82,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ElkPath implements UDrawable { @@ -151,8 +151,8 @@ public class ElkPath implements UDrawable { drawSections(ug, sections); } - final UDrawable extremityFactory1 = getDecors(link.getType().getDecor1(), Math.PI / 2, HColorUtils.WHITE); - final UDrawable extremityFactory2 = getDecors(link.getType().getDecor2(), -Math.PI / 2, HColorUtils.WHITE); + final UDrawable extremityFactory1 = getDecors(link.getType().getDecor1(), Math.PI / 2, HColors.WHITE); + final UDrawable extremityFactory2 = getDecors(link.getType().getDecor2(), -Math.PI / 2, HColors.WHITE); if (extremityFactory1 != null) { final double x = sections.get(0).getEndX(); diff --git a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java index 1d5ca3f7b..efcfdd87e 100644 --- a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java +++ b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java @@ -22,9 +22,9 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.ColorChangerMonochrome; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; +import net.sourceforge.plantuml.ugraphic.color.HColors; // Emojji from https://twemoji.twitter.com/ // Shorcut from https://api.github.com/emojis @@ -129,7 +129,7 @@ public class SvgNanoParser implements Sprite { final String strokeString = extractData("stroke", s); if (strokeString == null) return ugs; - ugs = ugs.apply(new HColorNone().bg()); + ugs = ugs.apply(HColors.none().bg()); final HColor stroke = getTrueColor(strokeString, colorForMonochrome); ugs = ugs.apply(stroke); final String strokeWidth = extractData("stroke-width", s); diff --git a/src/net/sourceforge/plantuml/error/PSystemError.java b/src/net/sourceforge/plantuml/error/PSystemError.java index e1fe1be13..1274ceaec 100644 --- a/src/net/sourceforge/plantuml/error/PSystemError.java +++ b/src/net/sourceforge/plantuml/error/PSystemError.java @@ -90,7 +90,7 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; import net.sourceforge.plantuml.version.LicenseInfo; import net.sourceforge.plantuml.version.PSystemVersion; @@ -147,16 +147,16 @@ public abstract class PSystemError extends PlainDiagram { } private TextBlockBackcolored getGraphicalFormatted() { - final FontConfiguration fc0 = GraphicStrings.sansSerif14(HColorUtils.BLACK).bold(); - final FontConfiguration fc1 = GraphicStrings.sansSerif14(HColorUtils.MY_GREEN).bold(); - final FontConfiguration fc2 = GraphicStrings.sansSerif14(HColorUtils.RED).bold(); - final FontConfiguration fc4 = GraphicStrings.sansSerif12(HColorUtils.MY_GREEN).bold().italic(); + final FontConfiguration fc0 = GraphicStrings.sansSerif14(HColors.BLACK).bold(); + final FontConfiguration fc1 = GraphicStrings.sansSerif14(HColors.MY_GREEN).bold(); + final FontConfiguration fc2 = GraphicStrings.sansSerif14(HColors.RED).bold(); + final FontConfiguration fc4 = GraphicStrings.sansSerif12(HColors.MY_GREEN).bold().italic(); final List fullBody = getTextFullBody(); final TextBlock result0 = TextBlockUtils.addBackcolor( - TextBlockUtils.withMargin(new TextBlockRaw(getTextFromStack(), fc0), 1, 1, 1, 4), HColorUtils.MY_GREEN); + TextBlockUtils.withMargin(new TextBlockRaw(getTextFromStack(), fc0), 1, 1, 1, 4), HColors.MY_GREEN); final TextBlock result1 = new TextBlockRaw(allButLast(fullBody), fc1); - final TextBlock result2 = new TextBlockRaw(onlyLast(fullBody), fc1.wave(HColorUtils.RED)); + final TextBlock result2 = new TextBlockRaw(onlyLast(fullBody), fc1.wave(HColors.RED)); final TextBlock result3 = new TextBlockRaw(getTextError(), fc2); final TextBlock result4 = TextBlockUtils.withMargin(new TextBlockRaw(header(), fc4), 0, 2, 0, 8); TextBlock result = result0; @@ -165,7 +165,7 @@ public abstract class PSystemError extends PlainDiagram { result = TextBlockUtils.mergeTB(result, result3, HorizontalAlignment.LEFT); result = TextBlockUtils.mergeTB(result4, result, HorizontalAlignment.LEFT); result = TextBlockUtils.withMargin(result, 5, 5); - return TextBlockUtils.addBackcolor(result, HColorUtils.BLACK); + return TextBlockUtils.addBackcolor(result, HColors.BLACK); } private List header() { @@ -353,7 +353,7 @@ public abstract class PSystemError extends PlainDiagram { "Details on [[https://plantuml.com/dedication]]"); final UFont font = UFont.sansSerif(14); - final FontConfiguration fc = FontConfiguration.create(font, HColorUtils.BLACK, HColorUtils.BLACK, false); + final FontConfiguration fc = FontConfiguration.create(font, HColors.BLACK, HColors.BLACK, false); final TextBlock text = TextBlockUtils .withMargin(disp.create(fc, HorizontalAlignment.LEFT, new SpriteContainerEmpty()), 10, 0); final TextBlock result; @@ -374,7 +374,7 @@ public abstract class PSystemError extends PlainDiagram { "Details on [[http://plantuml.com/adopt]]", " "); final UFont font = UFont.sansSerif(14); - final FontConfiguration fc = FontConfiguration.create(font, HColorUtils.BLACK, HColorUtils.BLACK, false); + final FontConfiguration fc = FontConfiguration.create(font, HColors.BLACK, HColors.BLACK, false); final TextBlock text = TextBlockUtils .withMargin(disp.create(fc, HorizontalAlignment.LEFT, new SpriteContainerEmpty()), 10, 0); final TextBlock result; diff --git a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java index 3a70c475d..b887fb2cf 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java +++ b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ActivityBox extends AbstractTextBlock { @@ -92,8 +92,8 @@ public class ActivityBox extends AbstractTextBlock { final double widthTotal = dimTotal.getWidth(); final double heightTotal = dimTotal.getHeight(); final Shadowable rect = new URectangle(widthTotal, heightTotal).rounded(CORNER); - ug = ug.apply(HColorUtils.MY_RED); - ug = ug.apply(HColorUtils.MY_YELLOW.bg()); + ug = ug.apply(HColors.MY_RED); + ug = ug.apply(HColors.MY_YELLOW.bg()); ug.apply(new UStroke(1.5)).draw(rect); tb.drawU(ug.apply(new UTranslate(MARGIN, MARGIN))); diff --git a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java index acac556c8..cc96c8606 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java +++ b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java @@ -71,7 +71,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FlowDiagram extends UmlDiagram implements TextBlock { @@ -157,8 +157,8 @@ public class FlowDiagram extends UmlDiagram implements TextBlock { box.drawU(ug.apply( new UTranslate((x + xmin * SINGLE_SIZE_X + deltaX / 2), (y + ymin * SINGLE_SIZE_Y + deltaY / 2)))); } - ug = ug.apply(HColorUtils.MY_RED); - ug = ug.apply(HColorUtils.MY_RED.bg()); + ug = ug.apply(HColors.MY_RED); + ug = ug.apply(HColors.MY_RED.bg()); final UShape arrow = new UEllipse(7, 7); for (Path p : field.getPaths()) { final TileArea start = p.getStart(); diff --git a/src/net/sourceforge/plantuml/golem/Tile.java b/src/net/sourceforge/plantuml/golem/Tile.java index 6ec857d0a..ce06e2efa 100644 --- a/src/net/sourceforge/plantuml/golem/Tile.java +++ b/src/net/sourceforge/plantuml/golem/Tile.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Tile extends AbstractTextBlock implements TextBlock { @@ -78,7 +78,7 @@ public class Tile extends AbstractTextBlock implements TextBlock { } public void drawU(UGraphic ug) { - ug = ug.apply(HColorUtils.BLACK); + ug = ug.apply(HColors.BLACK); final TextBlock n = Display.create("" + num).create(fc, HorizontalAlignment.LEFT, new SpriteContainerEmpty()); final Dimension2D dimNum = n.calculateDimension(ug.getStringBounder()); final Dimension2D dimTotal = calculateDimension(ug.getStringBounder()); diff --git a/src/net/sourceforge/plantuml/golem/TilesField.java b/src/net/sourceforge/plantuml/golem/TilesField.java index 5ee06ae3e..296e83ba0 100644 --- a/src/net/sourceforge/plantuml/golem/TilesField.java +++ b/src/net/sourceforge/plantuml/golem/TilesField.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TilesField extends AbstractTextBlock implements TextBlock { @@ -250,7 +250,7 @@ public class TilesField extends AbstractTextBlock implements TextBlock { final double yt = p.getYmin() * dimSingle.getHeight() / 2; t.drawU(ug.apply(new UTranslate((x + xt), (y + yt)))); } - ug = ug.apply(HColorUtils.RED); + ug = ug.apply(HColors.RED); for (Path p : paths) { final TileArea start = p.getStart(); final TileArea dest = p.getDest(); diff --git a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java index ac07c5751..e533b0496 100644 --- a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java +++ b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorAutomatic; +import net.sourceforge.plantuml.ugraphic.color.HColorScheme; public class CircledCharacter extends AbstractTextBlock implements TextBlock { @@ -61,8 +61,8 @@ public class CircledCharacter extends AbstractTextBlock implements TextBlock { this.font = font; this.spotBackColor = spotBackColor; this.spotBorder = spotBorder; - if (fontColor instanceof HColorAutomatic) - this.fontColor = ((HColorAutomatic) fontColor).getAppropriateColor(spotBackColor); + if (fontColor instanceof HColorScheme) + this.fontColor = ((HColorScheme) fontColor).getAppropriateColor(spotBackColor); else this.fontColor = fontColor; } diff --git a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java b/src/net/sourceforge/plantuml/graphic/FontConfiguration.java index 7b7e3b7da..a4f9126e2 100644 --- a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java +++ b/src/net/sourceforge/plantuml/graphic/FontConfiguration.java @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FontConfiguration { @@ -82,7 +82,7 @@ public class FontConfiguration { } public static FontConfiguration blackBlueTrue(UFont font) { - return create(font, HColorUtils.BLACK.withDark(HColorUtils.WHITE), HColorUtils.BLUE, true, 8); + return create(font, HColors.BLACK.withDark(HColors.WHITE), HColors.BLUE, true, 8); } public static FontConfiguration create(ISkinParam skinParam, FontParam fontParam, Stereotype stereo) { diff --git a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java index 3db773ff3..1e066050d 100644 --- a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java +++ b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GraphicStrings extends AbstractTextBlock implements IEntityImage { @@ -62,7 +62,7 @@ public class GraphicStrings extends AbstractTextBlock implements IEntityImage { private final HColor background; - private final static HColor hyperlinkColor = HColorUtils.BLUE; + private final static HColor hyperlinkColor = HColors.BLUE; private final static boolean useUnderlineForHyperlink = true; @@ -82,36 +82,36 @@ public class GraphicStrings extends AbstractTextBlock implements IEntityImage { private static HColor getForeColor(boolean useRed) { if (useRed) { - return HColorUtils.BLACK; + return HColors.BLACK; } - return HColorUtils.MY_GREEN; + return HColors.MY_GREEN; } private static HColor getBackColor(boolean useRed) { if (useRed) { - return HColorUtils.RED_LIGHT; + return HColors.RED_LIGHT; } - return HColorUtils.BLACK; + return HColors.BLACK; } public static TextBlockBackcolored createGreenOnBlackMonospaced(List strings) { - return new GraphicStrings(strings, monospaced14(HColorUtils.GREEN), HColorUtils.BLACK, null, null, + return new GraphicStrings(strings, monospaced14(HColors.GREEN), HColors.BLACK, null, null, CreoleMode.SIMPLE_LINE); } public static TextBlockBackcolored createBlackOnWhite(List strings) { - return new GraphicStrings(strings, sansSerif12(HColorUtils.BLACK), HColorUtils.WHITE, null, null, + return new GraphicStrings(strings, sansSerif12(HColors.BLACK), HColors.WHITE, null, null, CreoleMode.FULL); } public static TextBlockBackcolored createBlackOnWhiteMonospaced(List strings) { - return new GraphicStrings(strings, monospaced14(HColorUtils.BLACK), HColorUtils.WHITE, null, null, + return new GraphicStrings(strings, monospaced14(HColors.BLACK), HColors.WHITE, null, null, CreoleMode.FULL); } public static TextBlockBackcolored createBlackOnWhite(List strings, BufferedImage image, GraphicPosition position) { - return new GraphicStrings(strings, sansSerif12(HColorUtils.BLACK), HColorUtils.WHITE, image, position, + return new GraphicStrings(strings, sansSerif12(HColors.BLACK), HColors.WHITE, image, position, CreoleMode.FULL); } diff --git a/src/net/sourceforge/plantuml/graphic/Rainbow.java b/src/net/sourceforge/plantuml/graphic/Rainbow.java index 78e7552e8..bd876f96f 100644 --- a/src/net/sourceforge/plantuml/graphic/Rainbow.java +++ b/src/net/sourceforge/plantuml/graphic/Rainbow.java @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.style.Value; import net.sourceforge.plantuml.style.ValueNull; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class Rainbow { @@ -90,7 +90,7 @@ public class Rainbow { else colorHead = head.asColor(themeStyle, set); if (colorHead == null) - colorHead = HColorUtils.transparent(); + colorHead = HColors.transparent(); return fromColor(color, colorHead); } diff --git a/src/net/sourceforge/plantuml/graphic/SymbolContext.java b/src/net/sourceforge/plantuml/graphic/SymbolContext.java index 0ab21e0c7..92363d508 100644 --- a/src/net/sourceforge/plantuml/graphic/SymbolContext.java +++ b/src/net/sourceforge/plantuml/graphic/SymbolContext.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorBackground; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class SymbolContext { @@ -73,11 +73,11 @@ public class SymbolContext { public UGraphic applyColors(UGraphic ug) { if (foreColor == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(foreColor); if (backColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backColor.bg()); diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java index 124839390..124da0c64 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TextBlockBordered extends AbstractTextBlock implements TextBlock { @@ -118,13 +118,13 @@ public class TextBlockBordered extends AbstractTextBlock implements TextBlock { polygon.setDeltaShadow(4); if (backgroundColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backgroundColor.bg()); HColor color = noBorder() ? backgroundColor : borderColor; if (color == null) - color = new HColorNone(); + color = HColors.none(); ug = ug.apply(color); ug = applyStroke(ug); diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java index 783e51ae3..51ba66e07 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TextBlockLineBefore extends AbstractTextBlock implements TextBlock, WithPorts { @@ -84,7 +84,7 @@ public class TextBlockLineBefore extends AbstractTextBlock implements TextBlock, textBlock.drawU(ug); if (color == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(color); diff --git a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java index ecb1d00c0..727f3e349 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class USymbolDatabase extends USymbol { @@ -68,7 +68,7 @@ class USymbolDatabase extends USymbol { ug.draw(shape); final UPath closing = getClosingPath(width); - ug.apply(new HColorNone().bg()).draw(closing); + ug.apply(HColors.none().bg()).draw(closing); ug.apply(new UTranslate(width, height)).draw(new UEmpty(10, 10)); } @@ -99,9 +99,9 @@ class USymbolDatabase extends USymbol { protected void drawHline(UGraphic ug, UHorizontalLine line, UTranslate translate) { final UPath closing = getClosingPath(endingX); ug = ug.apply(translate); - ug.apply(line.getStroke()).apply(new HColorNone().bg()).apply(UTranslate.dy(-15)).draw(closing); + ug.apply(line.getStroke()).apply(HColors.none().bg()).apply(UTranslate.dy(-15)).draw(closing); if (line.isDouble()) { - ug.apply(line.getStroke()).apply(new HColorNone().bg()).apply(UTranslate.dy(-15 + 2)).draw(closing); + ug.apply(line.getStroke()).apply(HColors.none().bg()).apply(UTranslate.dy(-15 + 2)).draw(closing); } line.drawTitleInternal(ug, 0, endingX, 0, true); } diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java index 7c7a072cd..0c48d3af8 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphicStencil; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class USymbolFrame extends USymbol { @@ -80,7 +80,7 @@ class USymbolFrame extends USymbol { polygon.lineTo(textWidth - cornersize, textHeight); polygon.lineTo(0, textHeight); - ug.apply(new HColorNone().bg()).draw(polygon); + ug.apply(HColors.none().bg()).draw(polygon); } diff --git a/src/net/sourceforge/plantuml/graphic/USymbolNode.java b/src/net/sourceforge/plantuml/graphic/USymbolNode.java index a4775ae4c..0d16477cf 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolNode.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolNode.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.ugraphic.UHorizontalLine; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class USymbolNode extends USymbol { @@ -112,7 +112,7 @@ class USymbolNode extends USymbol { } private void drawHlineInternal(UGraphic ug, UHorizontalLine line) { - ug = ug.apply(line.getStroke()).apply(new HColorNone().bg()); + ug = ug.apply(line.getStroke()).apply(HColors.none().bg()); ug.draw(ULine.hline(endingX - 10)); ug.apply(UTranslate.dx(endingX - 10)).draw(new ULine(10, -10)); } diff --git a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java index e9a5e140a..81b4cf7a4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class USymbolQueue extends USymbol { @@ -71,7 +71,7 @@ class USymbolQueue extends USymbol { ug.draw(shape); final UPath closing = getClosingPath(width, height); - ug.apply(new HColorNone().bg()).draw(closing); + ug.apply(HColors.none().bg()).draw(closing); } diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStack.java b/src/net/sourceforge/plantuml/graphic/USymbolStack.java index 5acfda06d..e5bff1f35 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStack.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStack.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphicStencil; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class USymbolStack extends USymbol { @@ -58,7 +58,7 @@ class USymbolStack extends USymbol { final double border = 15; final URectangle rect = new URectangle(width - 2 * border, height).rounded(roundCorner); - ug.apply(new HColorNone()).apply(UTranslate.dx(border)).draw(rect); + ug.apply(HColors.none()).apply(UTranslate.dx(border)).draw(rect); final UPath path = new UPath(); if (roundCorner == 0) { @@ -81,7 +81,7 @@ class USymbolStack extends USymbol { path.lineTo(width, 0); } path.setDeltaShadow(shadowing); - ug.apply(new HColorNone().bg()).draw(path); + ug.apply(HColors.none().bg()).draw(path); } private Margin getMargin() { diff --git a/src/net/sourceforge/plantuml/logo/PSystemLogo.java b/src/net/sourceforge/plantuml/logo/PSystemLogo.java index 3d0f22461..4eed117b2 100644 --- a/src/net/sourceforge/plantuml/logo/PSystemLogo.java +++ b/src/net/sourceforge/plantuml/logo/PSystemLogo.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; public class PSystemLogo extends AbstractPSystem { @@ -73,7 +73,7 @@ public class PSystemLogo extends AbstractPSystem { final StringBounder stringBounder = FileFormat.PNG.getDefaultStringBounder(); final EmptyImageBuilder builder = new EmptyImageBuilder(fileFormat.getWatermark(), width, height, Color.WHITE, stringBounder); final BufferedImage im = builder.getBufferedImage(); - final UGraphic ug = new UGraphicG2d(HColorUtils.WHITE, new ColorMapperIdentity(), stringBounder, builder.getGraphics2D(), 1.0); + final UGraphic ug = new UGraphicG2d(HColors.WHITE, new ColorMapperIdentity(), stringBounder, builder.getGraphics2D(), 1.0); ((UGraphicG2d) ug).setBufferedImage(im); final TurtleGraphicsPane turtleGraphicsPane = new TurtleGraphicsPane(width, height); diff --git a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java index 205ea6072..1f5f33baf 100644 --- a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java +++ b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class TurtleGraphicsPane { final private double width; @@ -63,7 +63,7 @@ class TurtleGraphicsPane { private double turtleDirection = 90; private boolean penIsDown = true; private boolean showTurtle = true; - private HColor penColor = HColorUtils.BLACK; + private HColor penColor = HColors.BLACK; private List lines = new ArrayList(); private List colors = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java index 04f9f2118..452900c18 100644 --- a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java +++ b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java @@ -34,7 +34,6 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.api.ThemeStyle; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; diff --git a/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java b/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java index a4d06c7fb..ae74be78d 100644 --- a/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java +++ b/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java @@ -39,7 +39,7 @@ import java.util.Set; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class VerticalLine implements UDrawable { @@ -54,7 +54,7 @@ public class VerticalLine implements UDrawable { } public void drawU(UGraphic ug) { - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); boolean drawn = false; double current = y1; UPath path = new UPath(); diff --git a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java index ba2906b02..cd77973b3 100644 --- a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java +++ b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.openiconic.data.DummyIcon; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorAutomaticLegacy; +import net.sourceforge.plantuml.ugraphic.color.HColorAutomagic; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; public class OpenIcon { @@ -136,7 +136,7 @@ public class OpenIcon { return new AbstractTextBlock() { public void drawU(UGraphic ug) { HColor textColor = color; - if (textColor instanceof HColorAutomaticLegacy && ug.getParam().getBackcolor() != null) { + if (textColor instanceof HColorAutomagic && ug.getParam().getBackcolor() != null) { textColor = ((HColorSimple) ug.getParam().getBackcolor()).opposite(); } svgPath.drawMe(ug.apply(textColor), factor); diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java index db4adae9a..9c09783ab 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class PSystemOpenIconic extends PlainDiagram { @@ -59,7 +59,7 @@ public class PSystemOpenIconic extends PlainDiagram { final OpenIcon icon = OpenIcon.retrieve(iconName); // final Dimension2D dim = new Dimension2DDouble(100, 100); - return icon.asTextBlock(HColorUtils.BLACK, factor); + return icon.asTextBlock(HColors.BLACK, factor); // UGraphic2 ug = fileFormat.createUGraphic(dim); // ug = (UGraphic2) ug.apply(new UTranslate(10, 10)); diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 8399e83a1..22a20e4a2 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -115,7 +115,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprite { @@ -227,7 +227,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit final HColor back = timelineStyle.value(PName.BackGroundColor) .asColor(getSkinParam().getThemeStyle(), getIHtmlColorSet()); - if (HColorUtils.isTransparent(back) == false) { + if (HColors.isTransparent(back) == false) { final URectangle rect1 = new URectangle(calculateDimension(ug.getStringBounder()).getWidth(), timeHeader.getTimeHeaderHeight()); ug.apply(back.bg()).draw(rect1); @@ -388,10 +388,17 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit } } - public void closeDayOfWeek(DayOfWeek day) { + public void closeDayOfWeek(DayOfWeek day, String task) { openClose.close(day); } + public void openDayOfWeek(DayOfWeek day, String task) { + if (task.length() == 0) + openClose.open(day); + else + getOpenCloseForTask(task).open(day); + } + public void closeDayAsDate(Day day, String task) { if (task.length() == 0) openClose.close(day); @@ -634,10 +641,24 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit private TaskGroup currentGroup = null; - public void addGroup(String comment) { - TaskGroup group = new TaskGroup(getSkinParam().getCurrentStyleBuilder(), comment); - currentGroup = group; + public CommandExecutionResult addGroup(String name) { + TaskGroup group = new TaskGroup(this.currentGroup, getSkinParam().getCurrentStyleBuilder(), name); + + if (this.currentGroup != null) + this.currentGroup.addTask(group); + + this.currentGroup = group; tasks.put(group.getCode(), group); + return CommandExecutionResult.ok(); + } + + public CommandExecutionResult endGroup() { + if (this.currentGroup == null) + return CommandExecutionResult.error("No group to be closed"); + + this.currentGroup = this.currentGroup.getParent(); + + return CommandExecutionResult.ok(); } public void addContraint(GanttConstraint constraint) { @@ -771,7 +792,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit } public CommandExecutionResult deleteTask(Task task) { - task.setColors(new CenterBorderColor(HColorUtils.WHITE, HColorUtils.BLACK)); + task.setColors(new CenterBorderColor(HColors.WHITE, HColors.BLACK)); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/project/OpenClose.java b/src/net/sourceforge/plantuml/project/OpenClose.java index b0d01523a..625d15a1d 100644 --- a/src/net/sourceforge/plantuml/project/OpenClose.java +++ b/src/net/sourceforge/plantuml/project/OpenClose.java @@ -47,6 +47,7 @@ import net.sourceforge.plantuml.project.time.DayOfWeek; public class OpenClose implements Histogram, LoadPlanable { private final Collection closedDayOfWeek = EnumSet.noneOf(DayOfWeek.class); + private final Collection openedDayOfWeek = EnumSet.noneOf(DayOfWeek.class); private final Collection closedDays = new HashSet<>(); private final Collection openedDays = new HashSet<>(); private Day startingDay; @@ -97,6 +98,11 @@ public class OpenClose implements Histogram, LoadPlanable { closedDayOfWeek.add(day); } + public void open(DayOfWeek day) { + closedDayOfWeek.remove(day); + openedDayOfWeek.add(day); + } + public void close(Day day) { closedDays.add(day); } @@ -178,6 +184,8 @@ public class OpenClose implements Histogram, LoadPlanable { return 100; if (except.closedDays.contains(instant)) return 0; + if (except.openedDayOfWeek.size() > 0 && except.openedDayOfWeek.contains(instant.getDayOfWeek())) + return 100; return OpenClose.this.getLoadAt(instant); } }; diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java index 823976234..fad916acb 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java @@ -62,7 +62,7 @@ public class CommandGroupEnd extends SingleLineCommand2 { @Override protected CommandExecutionResult executeArg(GanttDiagram diagram, LineLocation location, RegexResult arg) { - return CommandExecutionResult.ok(); + return diagram.endGroup(); } } diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java index 45bbd415f..5c8f0ca22 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java @@ -64,8 +64,7 @@ public class CommandGroupStart extends SingleLineCommand2 { @Override protected CommandExecutionResult executeArg(GanttDiagram diagram, LineLocation location, RegexResult arg) { final String name = arg.get("NAME", 0); - diagram.addGroup(name); - return CommandExecutionResult.ok(); + return diagram.addGroup(name); } } diff --git a/src/net/sourceforge/plantuml/project/core/TaskGroup.java b/src/net/sourceforge/plantuml/project/core/TaskGroup.java index 8dc45e558..d8d3537b2 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskGroup.java +++ b/src/net/sourceforge/plantuml/project/core/TaskGroup.java @@ -48,10 +48,12 @@ import net.sourceforge.plantuml.style.StyleBuilder; public class TaskGroup extends AbstractTask implements Task { + private final TaskGroup parent; private final List children = new ArrayList<>(); - public TaskGroup(StyleBuilder styleBuilder, String comment) { - super(styleBuilder, new TaskCode(comment)); + public TaskGroup(TaskGroup parent, StyleBuilder styleBuilder, String name) { + super(styleBuilder, new TaskCode(name)); + this.parent = parent; } public Day getStart() { @@ -133,4 +135,8 @@ public class TaskGroup extends AbstractTask implements Task { children.add(child); } + public final TaskGroup getParent() { + return parent; + } + } diff --git a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java index 97e65965a..cce78957d 100644 --- a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java @@ -56,7 +56,7 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class AbstractTaskDraw implements TaskDraw { @@ -107,7 +107,7 @@ public abstract class AbstractTaskDraw implements TaskDraw { .asColor(getStyleBuilder().getSkinParam().getThemeStyle(), getColorSet()); final HColor regular = getStyle().value(PName.LineColor) .asColor(getStyleBuilder().getSkinParam().getThemeStyle(), getColorSet()); - return HColorUtils.unlinear(unstarted, regular, completion); + return HColors.unlinear(unstarted, regular, completion); } final protected HColor getBackgroundColor() { @@ -115,7 +115,7 @@ public abstract class AbstractTaskDraw implements TaskDraw { .asColor(getStyleBuilder().getSkinParam().getThemeStyle(), getColorSet()); final HColor regular = getStyle().value(PName.BackGroundColor) .asColor(getStyleBuilder().getSkinParam().getThemeStyle(), getColorSet()); - return HColorUtils.unlinear(unstarted, regular, completion); + return HColors.unlinear(unstarted, regular, completion); } final protected FontConfiguration getFontConfiguration() { diff --git a/src/net/sourceforge/plantuml/project/draw/RectangleTask.java b/src/net/sourceforge/plantuml/project/draw/RectangleTask.java index cd412a0de..2efd13426 100644 --- a/src/net/sourceforge/plantuml/project/draw/RectangleTask.java +++ b/src/net/sourceforge/plantuml/project/draw/RectangleTask.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class RectangleTask { @@ -113,11 +113,11 @@ public class RectangleTask { ug.apply(UTranslate.dx(segment.getPos1())).draw(partial); } else { final double x1 = width * completion / 100; - ug.apply(new HColorNone()).apply(UTranslate.dx(segment.getPos1())) + ug.apply(HColors.none()).apply(UTranslate.dx(segment.getPos1())) .draw(PathUtils.UtoLeft(x1, height, round)); - ug.apply(documentBackground.bg()).apply(new HColorNone()).apply(UTranslate.dx(segment.getPos1() + x1)) + ug.apply(documentBackground.bg()).apply(HColors.none()).apply(UTranslate.dx(segment.getPos1() + x1)) .draw(PathUtils.UtoRight(width * (100 - completion) / 100, height, round)); - ug.apply(new HColorNone().bg()).apply(UTranslate.dx(segment.getPos1())).draw(partial); + ug.apply(HColors.none().bg()).apply(UTranslate.dx(segment.getPos1())).draw(partial); } } @@ -197,7 +197,7 @@ public class RectangleTask { width++; } if (width > 0) { - drawRect(widthCompletion, ug.apply(new HColorNone()).apply(UTranslate.dx(segment.getPos1())), + drawRect(widthCompletion, ug.apply(HColors.none()).apply(UTranslate.dx(segment.getPos1())), documentBackground, width, height); } diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java index 9bb90526a..6fcadf478 100644 --- a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ResourceDraw implements UDrawable { @@ -75,7 +75,7 @@ public class ResourceDraw implements UDrawable { HorizontalAlignment.LEFT, new SpriteContainerEmpty()); title.drawU(ug); final ULine line = ULine.hline(timeScale.getEndingPosition(max) - timeScale.getStartingPosition(min)); - ug.apply(HColorUtils.BLACK).apply(UTranslate.dy(title.calculateDimension(ug.getStringBounder()).getHeight())) + ug.apply(HColors.BLACK).apply(UTranslate.dy(title.calculateDimension(ug.getStringBounder()).getHeight())) .draw(line); double startingPosition = -1; @@ -89,7 +89,7 @@ public class ResourceDraw implements UDrawable { if (totalLoad > 0) { final boolean over = totalLoad > totalLimit; final FontConfiguration fontConfiguration = getFontConfiguration(9, - over ? HColorUtils.RED : HColorUtils.BLACK); + over ? HColors.RED : HColors.BLACK); final TextBlock value = Display.getWithNewlines("" + totalLoad).create(fontConfiguration, HorizontalAlignment.LEFT, new SpriteContainerEmpty()); if (startingPosition == -1) @@ -111,7 +111,7 @@ public class ResourceDraw implements UDrawable { } private FontConfiguration getFontConfiguration(int size) { - return getFontConfiguration(size, HColorUtils.BLACK); + return getFontConfiguration(size, HColors.BLACK); } private FontConfiguration getFontConfiguration(int size, HColor color) { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java index 192898cff..dc6e99f3c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java @@ -57,10 +57,8 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TaskDrawGroup extends AbstractTaskDraw { @@ -79,7 +77,17 @@ public class TaskDrawGroup extends AbstractTaskDraw { protected double getShapeHeight(StringBounder stringBounder) { final Style style = getStyle(); final ClockwiseTopRightBottomLeft padding = style.getPadding(); - return padding.getTop() + getTitle().calculateDimension(stringBounder).getHeight() + padding.getBottom() + 8; + // return padding.getTop() + + // getTitle().calculateDimension(stringBounder).getHeight() + + // padding.getBottom() + 8; + final double pos1 = timeScale.getStartingPosition(start) + 6; + final double pos2 = timeScale.getEndingPosition(end) - 6; + final TextBlock title = getTitle(); + final Dimension2D dim = title.calculateDimension(stringBounder); + if (pos2 - pos1 > dim.getWidth()) + return dim.getHeight() + 2; + else + return dim.getHeight(); } @Override @@ -92,27 +100,19 @@ public class TaskDrawGroup extends AbstractTaskDraw { final ClockwiseTopRightBottomLeft margin = style.getMargin(); final ClockwiseTopRightBottomLeft padding = style.getPadding(); - ug = ug.apply(UTranslate.dy(margin.getTop() + padding.getTop())); - -// if (labelStrategy.titleInFirstColumn()) { -// if (labelStrategy.rightAligned()) -// title.drawU(ug.apply(UTranslate.dx(colTitles - dim.getWidth() - margin.getRight()))); -// else -// title.drawU(ug.apply(UTranslate.dx(margin.getLeft()))); -// return; -// } else if (labelStrategy.titleInLastColumn()) { -// title.drawU(ug.apply(UTranslate.dx(colBars + margin.getLeft()))); -// return; -// } -// final double pos1 = timeScale.getStartingPosition(start) + 6; final double pos2 = timeScale.getEndingPosition(end) - 6; final double pos; - if (pos2 - pos1 > dim.getWidth()) + final double y; + if (pos2 - pos1 > dim.getWidth()) { pos = pos1 + (pos2 - pos1 - dim.getWidth()) / 2; - else - pos = pos2 + 3; - title.drawU(ug.apply(UTranslate.dx(pos))); + // y = margin.getTop() + padding.getTop(); + y = 0; + } else { + pos = pos2 + 6; + y = (getFullHeightTask(stringBounder) - dim.getHeight()); + } + title.drawU(ug.apply(new UTranslate(pos, y))); } @Override @@ -127,7 +127,7 @@ public class TaskDrawGroup extends AbstractTaskDraw { } public void drawU(UGraphic ug) { - final double startPos = timeScale.getStartingPosition(start); + // final double startPos = timeScale.getStartingPosition(start); ug = applyColors(ug); drawShape(ug); } @@ -183,9 +183,9 @@ public class TaskDrawGroup extends AbstractTaskDraw { ug.startUrl(url); // ug = ug.apply(UTranslate.dy(margin.getTop() + 7)); - ug = ug.apply(UTranslate.dy(getShapeHeight(ug.getStringBounder()) - 10)); + ug = ug.apply(UTranslate.dy(getFullHeightTask(ug.getStringBounder()) - height)); - ug = ug.apply(HColorUtils.BLACK).apply(HColorUtils.BLACK.bg()); + ug = ug.apply(HColors.BLACK).apply(HColors.BLACK.bg()); ug.draw(getShape(startPos, endPos)); if (url != null) @@ -193,10 +193,11 @@ public class TaskDrawGroup extends AbstractTaskDraw { } + final private double height = 10; + private UPath getShape(final double startPos, final double endPos) { final UPath rect = new UPath(); - final double height = 10; final double thick = 2; final double y1 = (height - thick) / 2; final double y2 = height - (height - thick) / 2; diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java index fa6fb946f..c3f8750ea 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java @@ -63,7 +63,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TaskDrawSeparator implements TaskDraw { @@ -142,7 +142,7 @@ public class TaskDrawSeparator implements TaskDraw { final HColor backColor = getStyle().value(PName.BackGroundColor) .asColor(styleBuilder.getSkinParam().getThemeStyle(), colorSet); - if (HColorUtils.isTransparent(backColor) == false) { + if (HColors.isTransparent(backColor) == false) { final double height = padding.getTop() + getTextHeight(stringBounder) + padding.getBottom(); if (height > 0) { final URectangle rect = new URectangle(end - start, height); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java index 97c4ac05f..a97d7f55e 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java @@ -54,9 +54,8 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class TimeHeader { @@ -173,13 +172,13 @@ public abstract class TimeHeader { if (height == 0) return; - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); ug = ug.apply(new UTranslate(x1, getFullHeaderHeight())); ug.draw(new URectangle(x2 - x1, height)); } protected final UGraphic goBold(UGraphic ug) { - return ug.apply(HColorUtils.BLACK).apply(new UStroke(2)); + return ug.apply(HColors.BLACK).apply(new UStroke(2)); } diff --git a/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java b/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java index 82ecb3c12..b4d9ad478 100644 --- a/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java +++ b/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class CenterBorderColor { @@ -81,8 +81,8 @@ public class CenterBorderColor { } public CenterBorderColor unlinearTo(CenterBorderColor other, int completion) { - final HColor newCenter = HColorUtils.unlinear(this.center, other.center, completion); - final HColor newBorder = HColorUtils.unlinear(this.border, other.border, completion); + final HColor newCenter = HColors.unlinear(this.center, other.center, completion); + final HColor newBorder = HColors.unlinear(this.border, other.border, completion); return new CenterBorderColor(newCenter, newBorder, style); } diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java index 5845e789b..1f2d5307e 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java @@ -59,7 +59,20 @@ public class SubjectDayOfWeek implements Subject { } public Collection getSentences() { - return Arrays.asList(new AreClose(), new InColor()); + return Arrays.asList(new AreClose(), new AreOpen(), new InColor()); + } + + class AreOpen extends SentenceSimple { + public AreOpen() { + super(SubjectDayOfWeek.this, Verbs.are(), new ComplementOpen()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final DayOfWeek day = (DayOfWeek) subject; + project.openDayOfWeek(day, (String) complement); + return CommandExecutionResult.ok(); + } } class AreClose extends SentenceSimple { @@ -71,7 +84,7 @@ public class SubjectDayOfWeek implements Subject { @Override public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { final DayOfWeek day = (DayOfWeek) subject; - project.closeDayOfWeek(day); + project.closeDayOfWeek(day, (String) complement); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/salt/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index 0df568bbe..50ca4fadb 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -90,7 +90,7 @@ import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class PSystemSalt extends TitledDiagram implements WithSprite { @@ -261,6 +261,6 @@ public class PSystemSalt extends TitledDiagram implements WithSprite { } private HColor getBlack() { - return HColorUtils.BLACK; + return HColors.BLACK; } } diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java index 32fe5e2c8..2cd0334e3 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java @@ -40,12 +40,12 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class AbstractElement implements Element { final protected HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } final protected HColor getColor88() { @@ -69,7 +69,7 @@ public abstract class AbstractElement implements Element { } final protected HColor getWhite() { - return HColorUtils.WHITE.withDark(HColorUtils.BLACK); + return HColors.WHITE.withDark(HColors.BLACK); } private HColor buildColor(String color1, String color2) { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java index 969f53f2f..0a3307cfc 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ElementDroplist extends AbstractElementText implements Element { @@ -106,7 +106,7 @@ public class ElementDroplist extends AbstractElementText implements Element { final Dimension2D dimText = getPureTextDimension(ug.getStringBounder()); poly.addPoint((box - 6) / 2, dimText.getHeight() - 8); - ug.apply(HColorUtils.changeBack(ug)).apply(new UTranslate(xline + 3, 6)).draw(poly); + ug.apply(HColors.changeBack(ug)).apply(new UTranslate(xline + 3, 6)).draw(poly); } if (openDrop != null) { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java index e20fa3561..0b5342aca 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ElementRadioCheckbox extends AbstractElement { @@ -104,7 +104,7 @@ public class ElementRadioCheckbox extends AbstractElement { poly.addPoint(3, 3); poly.addPoint(10, -6); poly.addPoint(3, 1); - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); ug = ug.apply(new UTranslate(3, 6)); ug.draw(poly); } @@ -113,7 +113,7 @@ public class ElementRadioCheckbox extends AbstractElement { private void drawRadio(UGraphic ug, final double height) { ug.apply(new UTranslate(2, (height - ELLIPSE) / 2)).draw(new UEllipse(ELLIPSE, ELLIPSE)); if (checked) { - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); ug = ug.apply(new UTranslate(2 + (ELLIPSE - ELLIPSE2) / 2, (height - ELLIPSE2) / 2)); ug.draw(new UEllipse(ELLIPSE2, ELLIPSE2)); } diff --git a/src/net/sourceforge/plantuml/sdot/SmetanaPath.java b/src/net/sourceforge/plantuml/sdot/SmetanaPath.java index f4529eb1d..0d81e668e 100644 --- a/src/net/sourceforge/plantuml/sdot/SmetanaPath.java +++ b/src/net/sourceforge/plantuml/sdot/SmetanaPath.java @@ -62,8 +62,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import smetana.core.Macro; public class SmetanaPath implements UDrawable { @@ -181,7 +180,7 @@ public class SmetanaPath implements UDrawable { } private void printDebug(UGraphic ug) { - ug = ug.apply(HColorUtils.BLUE).apply(HColorUtils.BLUE.bg()); + ug = ug.apply(HColors.BLUE).apply(HColors.BLUE.bg()); final ST_splines splines = getSplines(edge); final ST_bezier beziers = splines.list.get__(0); for (int i = 0; i < beziers.size; i++) { @@ -192,7 +191,7 @@ public class SmetanaPath implements UDrawable { ug.apply(new UTranslate(pt).compose(new UTranslate(-1, -1))).draw(new UEllipse(3, 3)); } if (getLabelRectangleTranslate("label") != null && getLabelURectangle() != null) { - ug = ug.apply(HColorUtils.BLUE).apply(new HColorNone().bg()); + ug = ug.apply(HColors.BLUE).apply(HColors.none().bg()); ug.apply(getLabelRectangleTranslate("label")).draw(getLabelURectangle()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java index 913f4b688..c98fb7b5d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class PlayingSpaceWithParticipants extends AbstractTextBlock implements TextBlock { @@ -130,7 +130,7 @@ public class PlayingSpaceWithParticipants extends AbstractTextBlock implements T } private void drawNewPages(UGraphic ug) { - ug = ug.apply(HColorUtils.BLUE); + ug = ug.apply(HColors.BLUE); for (Double change : yNewPages()) { if (change == 0 || change == Double.MAX_VALUE) { continue; diff --git a/src/net/sourceforge/plantuml/skin/AbstractComponent.java b/src/net/sourceforge/plantuml/skin/AbstractComponent.java index a3463dd28..8a466589d 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractComponent.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; diff --git a/src/net/sourceforge/plantuml/skin/ActorAwesome.java b/src/net/sourceforge/plantuml/skin/ActorAwesome.java index cef018a08..739d155d4 100644 --- a/src/net/sourceforge/plantuml/skin/ActorAwesome.java +++ b/src/net/sourceforge/plantuml/skin/ActorAwesome.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; diff --git a/src/net/sourceforge/plantuml/skin/ActorHollow.java b/src/net/sourceforge/plantuml/skin/ActorHollow.java index 215df2aeb..0add37b40 100644 --- a/src/net/sourceforge/plantuml/skin/ActorHollow.java +++ b/src/net/sourceforge/plantuml/skin/ActorHollow.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; diff --git a/src/net/sourceforge/plantuml/skin/ActorStickMan.java b/src/net/sourceforge/plantuml/skin/ActorStickMan.java index 8a862a755..1f202ae6f 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStickMan.java +++ b/src/net/sourceforge/plantuml/skin/ActorStickMan.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ActorStickMan extends AbstractTextBlock implements TextBlock { @@ -93,7 +93,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock { if (actorBusiness) { specialBusiness(ug.apply(new UTranslate(startX + headDiam / 2, thickness() + headDiam / 2))); } - ug.apply(new UTranslate(centerX, headDiam + thickness())).apply(new HColorNone().bg()).draw(path); + ug.apply(new UTranslate(centerX, headDiam + thickness())).apply(HColors.none().bg()).draw(path); } private void specialBusiness(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/skin/Area.java b/src/net/sourceforge/plantuml/skin/Area.java index c4c9e6367..7586cd9c5 100644 --- a/src/net/sourceforge/plantuml/skin/Area.java +++ b/src/net/sourceforge/plantuml/skin/Area.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; public class Area { diff --git a/src/net/sourceforge/plantuml/skin/ArrowComponent.java b/src/net/sourceforge/plantuml/skin/ArrowComponent.java index a2e80af52..877c86ba2 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowComponent.java +++ b/src/net/sourceforge/plantuml/skin/ArrowComponent.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; public interface ArrowComponent extends Component { diff --git a/src/net/sourceforge/plantuml/skin/Component.java b/src/net/sourceforge/plantuml/skin/Component.java index 3735632e1..348b9fd66 100644 --- a/src/net/sourceforge/plantuml/skin/Component.java +++ b/src/net/sourceforge/plantuml/skin/Component.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.style.WithStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/skin/Padder.java b/src/net/sourceforge/plantuml/skin/Padder.java index f23740686..085cffc11 100644 --- a/src/net/sourceforge/plantuml/skin/Padder.java +++ b/src/net/sourceforge/plantuml/skin/Padder.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; - import net.sourceforge.plantuml.Dimension2DDouble; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; @@ -45,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Padder { @@ -119,12 +118,12 @@ public class Padder { ug = ug.apply(new UTranslate(margin, margin)); UGraphic ug2 = ug; if (borderColor == null) { - ug2 = ug2.apply(new HColorNone()); + ug2 = ug2.apply(HColors.none()); } else { ug2 = ug2.apply(borderColor); } if (backgroundColor == null) { - ug2 = ug2.apply(new HColorNone().bg()); + ug2 = ug2.apply(HColors.none().bg()); } else { ug2 = ug2.apply(backgroundColor.bg()); } diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index f9c3e829f..8691557a8 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.InnerStrategy; import net.sourceforge.plantuml.graphic.StringBounder; @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public enum VisibilityModifier { PRIVATE_FIELD(StringUtils.PRIVATE_FIELD, ColorParam.iconPrivate, null), @@ -108,7 +108,7 @@ public enum VisibilityModifier { public void drawU(UGraphic ug) { if (withInvisibleRectanble) - ug.apply(new HColorNone()).draw(new URectangle(size * 2, size)); + ug.apply(HColors.none()).draw(new URectangle(size * 2, size)); drawInternal(ug, size, foregroundColor, backgoundColor, 0, 0); } @@ -118,7 +118,7 @@ public enum VisibilityModifier { private void drawInternal(UGraphic ug, int size, final HColor foregroundColor, final HColor backgoundColor, double x, double y) { if (backgoundColor == null) - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); else ug = ug.apply(backgoundColor.bg()); diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java index da337c8ca..b33105467 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java @@ -53,8 +53,7 @@ import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorBackground; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ComponentRoseGroupingElse extends AbstractTextualComponent { @@ -76,11 +75,11 @@ public class ComponentRoseGroupingElse extends AbstractTextualComponent { if (backgroundColor instanceof HColorBackground) return; - if (HColorUtils.isTransparent(backgroundColor)) + if (HColors.isTransparent(backgroundColor)) return; final Dimension2D dimensionToUse = area.getDimensionToUse(); - ug = ug.apply(new HColorNone()).apply(backgroundColor.bg()); + ug = ug.apply(HColors.none()).apply(backgroundColor.bg()); final double width = dimensionToUse.getWidth(); final double height = dimensionToUse.getHeight(); final UShape rect; diff --git a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java index fa31c6bf5..101bc8b6f 100644 --- a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.ugraphic.ImageBuilder; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ListSpriteDiagram extends UmlDiagram { @@ -94,7 +94,7 @@ public class ListSpriteDiagram extends UmlDiagram { final Sprite sprite = getSkinParam().getSprite(n); TextBlock blockName = Display.create(n).create(FontConfiguration.blackBlueTrue(UFont.sansSerif(14)), HorizontalAlignment.LEFT, getSkinParam()); - TextBlock tb = sprite.asTextBlock(HColorUtils.BLACK, 1.0, getSkinParam().getColorMapper()); + TextBlock tb = sprite.asTextBlock(HColors.BLACK, 1.0, getSkinParam().getColorMapper()); tb = TextBlockUtils.mergeTB(tb, blockName, HorizontalAlignment.CENTER); tb.drawU(ug.apply(new UTranslate(x, y))); final Dimension2D dim = tb.calculateDimension(ug.getStringBounder()); diff --git a/src/net/sourceforge/plantuml/sprite/SpriteColor.java b/src/net/sourceforge/plantuml/sprite/SpriteColor.java index 1cea8b348..375f39c08 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteColor.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteColor.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class SpriteColor implements Sprite { @@ -103,12 +103,12 @@ public class SpriteColor implements Sprite { final BufferedImage im = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); if (backcolor == null) { - backcolor = HColorUtils.WHITE; + backcolor = HColors.WHITE; } if (forecolor == null) { - forecolor = HColorUtils.BLACK; + forecolor = HColors.BLACK; } - final HColorGradient gradient = new HColorGradient(backcolor, forecolor, '\0'); + final HColorGradient gradient = HColors.gradient(backcolor, forecolor, '\0'); for (int col = 0; col < width; col++) { for (int line = 0; line < height; line++) { final int localColor = color[line][col]; diff --git a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java index 485655dcc..d5f054443 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class SpriteMonochrome implements Sprite { @@ -180,14 +180,14 @@ public class SpriteMonochrome implements Sprite { public UImage toUImage(ColorMapper colorMapper, HColor backcolor, HColor color) { - if (backcolor == null || HColorUtils.isTransparent(backcolor)) - backcolor = HColorUtils.WHITE.withDark(HColorUtils.BLACK); + if (backcolor == null || HColors.isTransparent(backcolor)) + backcolor = HColors.WHITE.withDark(HColors.BLACK); - if (color == null || HColorUtils.isTransparent(color)) - color = HColorUtils.BLACK.withDark(HColorUtils.WHITE); + if (color == null || HColors.isTransparent(color)) + color = HColors.BLACK.withDark(HColors.WHITE); final BufferedImage im = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); - final HColorGradient gradient = new HColorGradient(backcolor, color, '\0'); + final HColorGradient gradient = HColors.gradient(backcolor, color, '\0'); for (int col = 0; col < width; col++) { for (int line = 0; line < height; line++) { final double coef = 1.0 * gray[line][col] / (grayLevel - 1); @@ -204,7 +204,7 @@ public class SpriteMonochrome implements Sprite { for (int line = 0; line < height; line++) { final HColor backColorLocal = new HColorSimple(backcolor.getColor(colorMapper, 1.0 * line / height), false); - final HColorGradient gradient = new HColorGradient(backColorLocal, color, '\0'); + final HColorGradient gradient = HColors.gradient(backColorLocal, color, '\0'); final double coef = 1.0 * gray[line][col] / (grayLevel - 1); final Color c = gradient.getColor(colorMapper, coef); im.setRGB(col, line, c.getRGB()); diff --git a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java index a8f11f637..99caf49d0 100644 --- a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java @@ -67,7 +67,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class StdlibDiagram extends UmlDiagram { @@ -163,6 +163,6 @@ public class StdlibDiagram extends UmlDiagram { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } } diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java index 62158bad4..c5fd0d3d4 100644 --- a/src/net/sourceforge/plantuml/style/SName.java +++ b/src/net/sourceforge/plantuml/style/SName.java @@ -121,6 +121,7 @@ public enum SName { stack, // stateDiagram, // state, // + stateBody, // stereotype, // storage, // swimlane, // diff --git a/src/net/sourceforge/plantuml/style/Style.java b/src/net/sourceforge/plantuml/style/Style.java index 9fc2b5763..3afd6195b 100644 --- a/src/net/sourceforge/plantuml/style/Style.java +++ b/src/net/sourceforge/plantuml/style/Style.java @@ -55,8 +55,8 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Style { @@ -292,7 +292,7 @@ public class Style { public UGraphic applyStrokeAndLineColor(UGraphic ug, HColorSet colorSet, ThemeStyle themeStyle) { final HColor color = value(PName.LineColor).asColor(themeStyle, colorSet); if (color == null) - ug = ug.apply(new HColorNone()); + ug = ug.apply(HColors.none()); else ug = ug.apply(color); diff --git a/src/net/sourceforge/plantuml/style/ValueImpl.java b/src/net/sourceforge/plantuml/style/ValueImpl.java index cd251e645..8b2cfadfb 100644 --- a/src/net/sourceforge/plantuml/style/ValueImpl.java +++ b/src/net/sourceforge/plantuml/style/ValueImpl.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ValueImpl implements Value { @@ -97,7 +97,7 @@ public class ValueImpl implements Value { return null; if ("transparent".equalsIgnoreCase(value1)) - return HColorUtils.transparent(); + return HColors.transparent(); if (value1 == null) throw new IllegalArgumentException(value.toString()); diff --git a/src/net/sourceforge/plantuml/style/ValueNull.java b/src/net/sourceforge/plantuml/style/ValueNull.java index 06e2b2c13..7c1973ca7 100644 --- a/src/net/sourceforge/plantuml/style/ValueNull.java +++ b/src/net/sourceforge/plantuml/style/ValueNull.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.api.ThemeStyle; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ValueNull extends ValueAbstract implements Value { @@ -77,7 +77,7 @@ public class ValueNull extends ValueAbstract implements Value { @Override public HColor asColor(ThemeStyle themeStyle, HColorSet set) { - return HColorUtils.BLACK; + return HColors.BLACK; } @Override diff --git a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java index a61b8b7e1..74f47b5ac 100644 --- a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java @@ -62,8 +62,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.eps.UGraphicEps; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; import net.sourceforge.plantuml.ugraphic.svg.UGraphicSvg; @@ -80,7 +79,7 @@ public class GraphicsSudoku { } public ImageData writeImageEps(OutputStream os) throws IOException { - final UGraphicEps ug = new UGraphicEps(HColorUtils.WHITE, new ColorMapperIdentity(), + final UGraphicEps ug = new UGraphicEps(HColors.WHITE, new ColorMapperIdentity(), FileFormat.EPS_TEXT.getDefaultStringBounder(), EpsStrategy.WITH_MACRO_AND_TEXT); drawInternal(ug); os.write(ug.getEPSCode().getBytes()); @@ -88,7 +87,7 @@ public class GraphicsSudoku { } public ImageData writeImageSvg(OutputStream os) throws IOException { - final UGraphicSvg ug = new UGraphicSvg(HColorUtils.WHITE, true, new Dimension2DDouble(0, 0), + final UGraphicSvg ug = new UGraphicSvg(HColors.WHITE, true, new Dimension2DDouble(0, 0), new ColorMapperIdentity(), false, 1.0, null, null, 0, "none", FileFormat.SVG.getDefaultStringBounder(), LengthAdjust.defaultValue(), false); drawInternal(ug); @@ -97,7 +96,7 @@ public class GraphicsSudoku { } public ImageData writeImageLatex(OutputStream os, FileFormat fileFormat) throws IOException { - final UGraphicTikz ug = new UGraphicTikz(HColorUtils.WHITE, new ColorMapperIdentity(), FileFormat.LATEX.getDefaultStringBounder(), 1, + final UGraphicTikz ug = new UGraphicTikz(HColors.WHITE, new ColorMapperIdentity(), FileFormat.LATEX.getDefaultStringBounder(), 1, fileFormat == FileFormat.LATEX); drawInternal(ug); ug.writeToStream(os, null, -1); // dpi param is not used @@ -111,7 +110,7 @@ public class GraphicsSudoku { final BufferedImage im = builder.getBufferedImage(); final Graphics2D g3d = builder.getGraphics2D(); - final UGraphic ug = new UGraphicG2d(HColorUtils.WHITE, new ColorMapperIdentity(), stringBounder, g3d, 1.0); + final UGraphic ug = new UGraphicG2d(HColors.WHITE, new ColorMapperIdentity(), stringBounder, g3d, 1.0); drawInternal(ug); g3d.dispose(); @@ -149,7 +148,7 @@ public class GraphicsSudoku { } } - ug = ug.apply(HColorUtils.BLACK.bg()).apply(new HColorNone()); + ug = ug.apply(HColors.BLACK.bg()).apply(HColors.none()); for (int i = 0; i < 10; i++) { final boolean bold = i % boldWidth == 0; final int w = bold ? boldWidth : 1; diff --git a/src/net/sourceforge/plantuml/svek/Boundary.java b/src/net/sourceforge/plantuml/svek/Boundary.java index f5fa27ae5..582e9ed3c 100644 --- a/src/net/sourceforge/plantuml/svek/Boundary.java +++ b/src/net/sourceforge/plantuml/svek/Boundary.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Boundary extends AbstractTextBlock { @@ -79,7 +79,7 @@ public class Boundary extends AbstractTextBlock { path.moveTo(0, radius); path.lineTo(left, radius); path.setDeltaShadow(symbolContext.getDeltaShadow()); - ug.apply(new UTranslate(x, y)).apply(new HColorNone().bg()).draw(path); + ug.apply(new UTranslate(x, y)).apply(HColors.none().bg()).draw(path); // final ULine line1 = ULine.dy(radius * 2); // line1.setDeltaShadow(deltaShadow); diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java index ec5294365..099b8c2c8 100644 --- a/src/net/sourceforge/plantuml/svek/Cluster.java +++ b/src/net/sourceforge/plantuml/svek/Cluster.java @@ -50,13 +50,12 @@ import java.util.Objects; import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; -import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.api.ThemeStyle; import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.cucadiagram.EntityUtils; @@ -75,6 +74,7 @@ import net.sourceforge.plantuml.posimo.Moveable; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.EntityImageState; @@ -86,7 +86,8 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.utils.UniqueSequence; public class Cluster implements Moveable { @@ -281,10 +282,6 @@ public class Cluster implements Moveable { this.yTitle = y; } - private static HColor getColor(ColorParam colorParam, ISkinParam skinParam, Stereotype stereotype) { - return SkinParamUtils.getColor(skinParam, stereotype, colorParam); - } - static public StyleSignatureBasic getDefaultStyleDefinition(SName diagramStyleName, USymbol symbol) { if (diagramStyleName == SName.stateDiagram) return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state, SName.group); @@ -347,8 +344,9 @@ public class Cluster implements Moveable { final UStroke stroke = getStrokeInternal(group, style); HColor backColor = getBackColor(umlDiagramType, style); - backColor = getBackColor(backColor, skinParam, group.getStereotype(), umlDiagramType.getStyleName(), - group.getUSymbol()); + backColor = getBackColor(backColor, group.getStereotype(), umlDiagramType.getStyleName(), + group.getUSymbol(), skinParam.getCurrentStyleBuilder(), skinParam.getThemeStyle(), + skinParam.getIHtmlColorSet()); if (ztitle != null || zstereo != null) { final ClusterDecoration decoration = new ClusterDecoration(packageStyle, group.getUSymbol(), ztitle, zstereo, minX, minY, maxX, maxY, stroke); @@ -425,6 +423,12 @@ public class Cluster implements Moveable { return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state) .withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder()); } + + private Style getStyleStateBody() { + return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.stateBody) + .withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder()); + } + // GroupPngMakerState private void drawUState(UGraphic ug, UmlDiagramType umlDiagramType, double rounded, double shadowing) { @@ -449,7 +453,12 @@ public class Cluster implements Moveable { backColor = getStyleState().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); - final HColor imgBackcolor = getBackColor(umlDiagramType, styleGroup); + // final HColor imgBackcolor = HColorUtils.transparent(); + + final HColor imgBackcolor = getStyleStateBody().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), + skinParam.getIHtmlColorSet()); + + // final HColor imgBackcolor = getBackColor(umlDiagramType, styleGroup); // final Style style = getStyle(FontParam.STATE_ATTRIBUTE, skinParam2); @@ -889,17 +898,15 @@ public class Cluster implements Moveable { return group == ent; } - public static HColor getBackColor(HColor backColor, ISkinParam skinParam, Stereotype stereotype, SName styleName, - USymbol symbol) { + public static HColor getBackColor(HColor backColor, Stereotype stereotype, SName styleName, USymbol symbol, + StyleBuilder styleBuilder, ThemeStyle themeStyle, HColorSet colorSet) { - final Style style = getDefaultStyleDefinition(styleName, symbol) - .getMergedStyle(skinParam.getCurrentStyleBuilder()); + final Style style = getDefaultStyleDefinition(styleName, symbol).getMergedStyle(styleBuilder); if (backColor == null) - backColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), - skinParam.getIHtmlColorSet()); + backColor = style.value(PName.BackGroundColor).asColor(themeStyle, colorSet); - if (backColor == null || backColor.equals(HColorUtils.transparent())) - backColor = HColorUtils.transparent(); + if (backColor == null || backColor.equals(HColors.transparent())) + backColor = HColors.transparent(); return backColor; } diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java index 97acbf02b..b1d5dc516 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java @@ -86,52 +86,48 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { private ImageData createFileInternal(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) throws IOException, InterruptedException { final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(diagram.getSkinParam()); - if (diagram.getUmlDiagramType() == UmlDiagramType.ACTIVITY) { + if (diagram.getUmlDiagramType() == UmlDiagramType.ACTIVITY) new CucaDiagramSimplifierActivity(diagram, dotStrings, stringBounder); - } else if (diagram.getUmlDiagramType() == UmlDiagramType.STATE) { + else if (diagram.getUmlDiagramType() == UmlDiagramType.STATE) new CucaDiagramSimplifierState(diagram, dotStrings, stringBounder); - } - // System.err.println("FOO11 type=" + os.getClass()); GeneralImageBuilder svek2 = createDotDataImageBuilder(DotMode.NORMAL, stringBounder); BaseFile basefile = null; - if (fileFormatOption.isDebugSvek() && os instanceof NamedOutputStream) { + if (fileFormatOption.isDebugSvek() && os instanceof NamedOutputStream) basefile = ((NamedOutputStream) os).getBasefile(); - } - // System.err.println("FOO11 basefile=" + basefile); TextBlockBackcolored result = svek2.buildImage(basefile, diagram.getDotStringSkek()); if (result instanceof GraphvizCrash) { svek2 = createDotDataImageBuilder(DotMode.NO_LEFT_RIGHT_AND_XLABEL, stringBounder); result = svek2.buildImage(basefile, diagram.getDotStringSkek()); } - // TODO There is something strange with the left margin of mainframe, I think because AnnotatedWorker is used here - // It can be looked at in another PR + // TODO There is something strange with the left margin of mainframe, I think + // because AnnotatedWorker is used here + // It can be looked at in another PR result = new AnnotatedWorker(diagram, diagram.getSkinParam(), stringBounder).addAdd(result); - // TODO UmlDiagram.getWarningOrError() looks similar so this might be simplified? - will leave for a separate PR + // TODO UmlDiagram.getWarningOrError() looks similar so this might be + // simplified? - will leave for a separate PR final String widthwarning = diagram.getSkinParam().getValue("widthwarning"); String warningOrError = null; - if (widthwarning != null && widthwarning.matches("\\d+")) { + if (widthwarning != null && widthwarning.matches("\\d+")) warningOrError = svek2.getWarningOrError(Integer.parseInt(widthwarning)); - } - - // Sorry about this hack. There is a side effect in SvekResult::calculateDimension() - result.calculateDimension(stringBounder); // Ensure text near the margins is not cut off - return diagram.createImageBuilder(fileFormatOption) - .annotations(false) // backwards compatibility (AnnotatedWorker is used above) - .drawable(result) - .status(result instanceof GraphvizCrash ? 503 : 0) - .warningOrError(warningOrError) + // Sorry about this hack. There is a side effect in + // SvekResult::calculateDimension() + result.calculateDimension(stringBounder); // Ensure text near the margins is not cut off + + return diagram.createImageBuilder(fileFormatOption).annotations(false) // backwards compatibility + // (AnnotatedWorker is used above) + .drawable(result).status(result instanceof GraphvizCrash ? 503 : 0).warningOrError(warningOrError) .write(os); } private List getOrderedLinks() { final List result = new ArrayList<>(); - for (Link l : diagram.getLinks()) { + for (Link l : diagram.getLinks()) addLinkNew(result, l); - } + return result; } @@ -139,14 +135,14 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { for (int i = 0; i < result.size(); i++) { final Link other = result.get(i); if (other.sameConnections(link)) { - while (i < result.size() && result.get(i).sameConnections(link)) { + while (i < result.size() && result.get(i).sameConnections(link)) i++; - } - if (i == result.size()) { + + if (i == result.size()) result.add(link); - } else { + else result.add(i, link); - } + return; } } diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java index 05fc913ec..fb325f147 100644 --- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java +++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java @@ -62,7 +62,7 @@ import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; @@ -194,7 +194,7 @@ public class GraphvizCrash extends AbstractTextBlock implements IEntityImage { } public HColor getBackcolor() { - return HColorUtils.WHITE; + return HColors.WHITE; } public Dimension2D calculateDimension(StringBounder stringBounder) { diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java index 8bf77e7ee..0ed1ab132 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java @@ -128,6 +128,11 @@ public final class GroupPngMakerState { .withTOBECHANGED(group.getStereotype()).getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder()); } + private Style getStyleStateBody() { + return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.stateBody) + .withTOBECHANGED(group.getStereotype()).getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder()); + } + public IEntityImage getImage() { final Display display = group.getDisplay(); final ISkinParam skinParam = diagram.getSkinParam(); @@ -181,8 +186,10 @@ public final class GroupPngMakerState { final IEntityImage image = containsOnlyConcurrentStates ? buildImageForConcurrentState(dotData) : svek2.buildImage(null, new String[0]); + final HColor bodyColor = getStyleStateBody().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), + skinParam.getIHtmlColorSet()); return new InnerStateAutonom(image, title, attribute, borderColor, backColor, group.getUrl99(), withSymbol, - stroke, rounded, shadowing); + stroke, rounded, shadowing, bodyColor); } diff --git a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java index 815a75bfd..fda6dfedb 100644 --- a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java +++ b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java @@ -59,9 +59,11 @@ public final class InnerStateAutonom extends AbstractTextBlock implements IEntit private final UStroke stroke; private final double rounded; private final double shadowing; + private final HColor bodyColor; public InnerStateAutonom(IEntityImage im, TextBlock title, TextBlock attribute, HColor borderColor, - HColor backColor, Url url, boolean withSymbol, UStroke stroke, double rounded, double shadowing) { + HColor backColor, Url url, boolean withSymbol, UStroke stroke, double rounded, double shadowing, + HColor bodyColor) { this.im = im; this.withSymbol = withSymbol; this.title = title; @@ -72,6 +74,7 @@ public final class InnerStateAutonom extends AbstractTextBlock implements IEntit this.url = url; this.stroke = stroke; this.rounded = rounded; + this.bodyColor = bodyColor; } public void drawU(UGraphic ug) { @@ -81,8 +84,9 @@ public final class InnerStateAutonom extends AbstractTextBlock implements IEntit final double marginForFields = attr.getHeight() > 0 ? IEntityImage.MARGIN : 0; final double titreHeight = IEntityImage.MARGIN + text.getHeight() + IEntityImage.MARGIN_LINE; + // final HColor foo = im.getBackcolor(); final RoundedContainer r = new RoundedContainer(total, titreHeight, attr.getHeight() + marginForFields, - borderColor, backColor, im.getBackcolor(), stroke, rounded, shadowing); + borderColor, backColor, bodyColor, stroke, rounded, shadowing); if (url != null) ug.startUrl(url); diff --git a/src/net/sourceforge/plantuml/svek/RoundedContainer.java b/src/net/sourceforge/plantuml/svek/RoundedContainer.java index 6e84018fc..0b5588636 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedContainer.java +++ b/src/net/sourceforge/plantuml/svek/RoundedContainer.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public final class RoundedContainer { @@ -78,7 +78,7 @@ public final class RoundedContainer { if (shadowing > 0) { rect.setDeltaShadow(shadowing); - ug.apply(HColorUtils.transparent().bg()).draw(rect); + ug.apply(HColors.transparent().bg()).draw(rect); rect.setDeltaShadow(0); } @@ -88,7 +88,7 @@ public final class RoundedContainer { new RoundedSouth(dim.getWidth(), dim.getHeight() - headerHeight, imgBackcolor, rounded) .drawU(ug.apply(UTranslate.dy(headerHeight))); - ug.apply(HColorUtils.transparent().bg()).draw(rect); + ug.apply(HColors.transparent().bg()).draw(rect); if (headerHeight > 0) ug.apply(UTranslate.dy(headerHeight)).draw(ULine.hline(dim.getWidth())); diff --git a/src/net/sourceforge/plantuml/svek/RoundedNorth.java b/src/net/sourceforge/plantuml/svek/RoundedNorth.java index 6c6834bc8..5043fa2c6 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedNorth.java +++ b/src/net/sourceforge/plantuml/svek/RoundedNorth.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public final class RoundedNorth implements UDrawable { @@ -64,7 +64,7 @@ public final class RoundedNorth implements UDrawable { } public void drawU(UGraphic ug) { - if (HColorUtils.isTransparent(backColor)) + if (HColors.isTransparent(backColor)) return; final UShape header; diff --git a/src/net/sourceforge/plantuml/svek/RoundedSouth.java b/src/net/sourceforge/plantuml/svek/RoundedSouth.java index c17677485..4091d356c 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedSouth.java +++ b/src/net/sourceforge/plantuml/svek/RoundedSouth.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public final class RoundedSouth implements UDrawable { @@ -64,7 +64,7 @@ public final class RoundedSouth implements UDrawable { } public void drawU(UGraphic ug) { - if (HColorUtils.isTransparent(backColor)) + if (HColors.isTransparent(backColor)) return; final UShape header; diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java index f601da5f5..c2eda3545 100644 --- a/src/net/sourceforge/plantuml/svek/SvekLine.java +++ b/src/net/sourceforge/plantuml/svek/SvekLine.java @@ -103,7 +103,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class SvekLine implements Moveable, Hideable, GuideLine { @@ -663,7 +663,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { } else if (this.link.getSpecificColor() != null) color = this.link.getSpecificColor(); - ug = ug.apply(new HColorNone().bg()).apply(color); + ug = ug.apply(HColors.none().bg()).apply(color); final LinkType linkType = link.getType(); UStroke stroke; if (suggestedStroke == null || linkType.getStyle().isNormal() == false) @@ -797,7 +797,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { if (linkType.getDecor1().isFill()) ug2 = ug2.apply(color.bg()); else - ug2 = ug2.apply(new HColorNone().bg()); + ug2 = ug2.apply(HColors.none().bg()); // System.err.println("Line::draw EXTREMITY1"); this.extremity2.drawU(ug2); @@ -807,7 +807,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { if (linkType.getDecor2().isFill()) ug2 = ug2.apply(color.bg()); else - ug2 = ug2.apply(new HColorNone().bg()); + ug2 = ug2.apply(HColors.none().bg()); // System.err.println("Line::draw EXTREMITY2"); this.extremity1.drawU(ug2); diff --git a/src/net/sourceforge/plantuml/svek/SvekResult.java b/src/net/sourceforge/plantuml/svek/SvekResult.java index f4e97db62..8d1d27171 100644 --- a/src/net/sourceforge/plantuml/svek/SvekResult.java +++ b/src/net/sourceforge/plantuml/svek/SvekResult.java @@ -45,7 +45,6 @@ import net.sourceforge.plantuml.cucadiagram.dot.DotData; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -57,12 +56,10 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHidden; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public final class SvekResult extends AbstractTextBlock implements IEntityImage { - private final Rose rose = new Rose(); - private final DotData dotData; private final DotStringFactory dotStringFactory; @@ -81,7 +78,7 @@ public final class SvekResult extends AbstractTextBlock implements IEntityImage HColor color = style2.value(PName.LineColor).asColor(dotData.getSkinParam().getThemeStyle(), dotData.getSkinParam().getIHtmlColorSet()); - color = HColorUtils.noGradient(color); + color = HColors.noGradient(color); for (SvekNode node : dotStringFactory.getBibliotekon().allNodes()) { final double minX = node.getMinX(); @@ -103,7 +100,7 @@ public final class SvekResult extends AbstractTextBlock implements IEntityImage final Style styleLine = getDefaultStyleDefinition(line.getStereotype()).getMergedStyle(currentStyleBuilder); color = styleLine.value(PName.LineColor).asColor(dotData.getSkinParam().getThemeStyle(), dotData.getSkinParam().getIHtmlColorSet()); - color = HColorUtils.noGradient(color); + color = HColors.noGradient(color); line.drawU(ug2, styleLine.getStroke(), color, ids); } diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java index 510cfb99e..be2219724 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityArrow extends Extremity { @@ -89,7 +89,7 @@ class ExtremityArrow extends Extremity { public void drawU(UGraphic ug) { final HColor color = ug.getParam().getColor(); if (color == null) { - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); } else { ug = ug.apply(color.bg()); } diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java index 0cb0d252e..1893e25d2 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityArrowAndCircle extends Extremity { @@ -77,7 +77,7 @@ class ExtremityArrowAndCircle extends Extremity { } public void drawU(UGraphic ug) { - ug.apply(HColorUtils.changeBack(ug)).draw(polygon); + ug.apply(HColors.changeBack(ug)).draw(polygon); ug.apply(new UStroke(1.5)).apply(backgroundColor.bg()) .apply(new UTranslate(dest.getX() - radius, dest.getY() - radius)) .draw(new UEllipse(radius * 2, radius * 2)); diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java index 74a141d4e..ad42627ec 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityCircle extends Extremity { @@ -74,7 +74,7 @@ class ExtremityCircle extends Extremity { ug = ug.apply(new UStroke(1.5)); if (fill) { - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); } else { ug = ug.apply(backgroundColor.bg()); } diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java index 6feed96a6..22b194588 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java @@ -39,8 +39,7 @@ import java.awt.geom.Point2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityDiamond extends Extremity { @@ -70,9 +69,9 @@ class ExtremityDiamond extends Extremity { public void drawU(UGraphic ug) { if (fill) - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); else - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); ug.draw(polygon); } diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java index 4409e2da7..68e568ed5 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java @@ -41,7 +41,7 @@ import java.awt.geom.Point2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityHalfArrow extends Extremity { @@ -71,7 +71,7 @@ class ExtremityHalfArrow extends Extremity { } public void drawU(UGraphic ug) { - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); if (line != null && line.getLength() > 2) { ug.apply(new UTranslate(contact.getX(), contact.getY())).draw(line); ug.apply(new UTranslate(contact.getX(), contact.getY())).draw(otherLine); diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java index 41c1d22c7..6c5af6983 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityStateLine1 extends Extremity { @@ -75,7 +75,7 @@ class ExtremityStateLine1 extends Extremity { public void drawU(UGraphic ug) { ug.apply(ug.getParam().getColor().bg()).apply(new UTranslate(-radius * Math.cos(angle), -radius * Math.sin(angle))).draw(polygon); - ug = ug.apply(HColorUtils.WHITE.bg()); + ug = ug.apply(HColors.WHITE.bg()); ug.apply(new UStroke(1.5)).apply(new UTranslate(dest.getX() - radius, dest.getY() - radius)).draw(new UEllipse(radius * 2, radius * 2)); drawLine(ug, getPointOnCircle(dest.getX(), dest.getY(), Math.PI / 4), getPointOnCircle(dest.getX(), dest.getY(), Math.PI + Math.PI / 4)); diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java index 00bbd8b5b..48704fce7 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityStateLine2 extends Extremity { @@ -74,7 +74,7 @@ class ExtremityStateLine2 extends Extremity { public void drawU(UGraphic ug) { ug.apply(ug.getParam().getColor().bg()).apply(new UTranslate(-radius * Math.cos(angle), -radius * Math.sin(angle))).draw(polygon); - ug.apply(new UStroke(1.5)).apply(HColorUtils.WHITE.bg()).apply(new UTranslate(dest.getX() - radius, dest.getY() - radius)).draw(new UEllipse(radius * 2, radius * 2)); + ug.apply(new UStroke(1.5)).apply(HColors.WHITE.bg()).apply(new UTranslate(dest.getX() - radius, dest.getY() - radius)).draw(new UEllipse(radius * 2, radius * 2)); } } diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java index f6e93c00c..1bad35404 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java @@ -40,7 +40,7 @@ import java.awt.geom.Point2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityTriangle extends Extremity { @@ -72,7 +72,7 @@ class ExtremityTriangle extends Extremity { if (backgroundColor != null) { ug = ug.apply(backgroundColor.bg()); } else if (fill) { - ug = ug.apply(HColorUtils.changeBack(ug)); + ug = ug.apply(HColors.changeBack(ug)); } ug.draw(polygon); } diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java index 1741c925c..6ec3c16b9 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; class MiddleCircleCircled extends Extremity { @@ -80,11 +80,11 @@ class MiddleCircleCircled extends Extremity { final double d = 0; if (mode == MiddleCircleCircledMode.MODE1 || mode == MiddleCircleCircledMode.BOTH) { final UEllipse arc1 = new UEllipse(2 * radius2, 2 * radius2, angle, 90); - ug.apply(new HColorNone().bg()).apply(new UTranslate(-radius2 + d, -radius2 + d)).draw(arc1); + ug.apply(HColors.none().bg()).apply(new UTranslate(-radius2 + d, -radius2 + d)).draw(arc1); } if (mode == MiddleCircleCircledMode.MODE2 || mode == MiddleCircleCircledMode.BOTH) { final UEllipse arc2 = new UEllipse(2 * radius2, 2 * radius2, angle + 180, 90); - ug.apply(new HColorNone().bg()).apply(new UTranslate(-radius2 + d, -radius2 + d)).draw(arc2); + ug.apply(HColors.none().bg()).apply(new UTranslate(-radius2 + d, -radius2 + d)).draw(arc2); } ug.apply(new UTranslate(-radius1, -radius1)).draw(circle); } diff --git a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java index d4821c144..078079402 100644 --- a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class ConnectedCircle implements UDrawable { @@ -63,7 +63,7 @@ public class ConnectedCircle implements UDrawable { final UEllipse part = new UEllipse(2 * radius, 2 * radius, angle - delta, 2 * delta); ug.draw(part); } - ug = ug.apply(HColorUtils.GREEN).apply(HColorUtils.GREEN.bg()); + ug = ug.apply(HColors.GREEN).apply(HColors.GREEN.bg()); for (Point2D pt : points) { final UTranslate tr = new UTranslate(pt); // ug.apply(tr).draw(new UEllipse(2, 2)); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java index 98dd958d6..9e1b6d5c0 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java @@ -45,8 +45,7 @@ import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageAssociationPoint extends AbstractEntityImage { @@ -62,7 +61,7 @@ public class EntityImageAssociationPoint extends AbstractEntityImage { final public void drawU(UGraphic ug) { final UShape circle = new UEllipse(SIZE, SIZE); - ug.apply(new HColorNone()).apply(HColorUtils.BLACK.bg()).draw(circle); + ug.apply(HColors.none()).apply(HColors.BLACK.bg()).draw(circle); } public ShapeType getShapeType() { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java index 06321c6c6..bc36cb134 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageCircleEnd extends AbstractEntityImage { @@ -78,11 +78,11 @@ public class EntityImageCircleEnd extends AbstractEntityImage { final double shadowing = style.value(PName.Shadowing).asDouble(); circle.setDeltaShadow(shadowing); - ug.apply(new HColorNone().bg()).apply(color).draw(circle); + ug.apply(HColors.none().bg()).apply(color).draw(circle); final double delta = 4; final UShape circleSmall = new UEllipse(SIZE - delta * 2, SIZE - delta * 2); - ug.apply(color.bg()).apply(new HColorNone()).apply(new UTranslate(delta + 0.5, delta + 0.5)).draw(circleSmall); + ug.apply(color.bg()).apply(HColors.none()).apply(new UTranslate(delta + 0.5, delta + 0.5)).draw(circleSmall); } public ShapeType getShapeType() { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java index 22e9b1f63..e80b987c6 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageCircleStart extends AbstractEntityImage { @@ -76,7 +76,7 @@ public class EntityImageCircleStart extends AbstractEntityImage { final double shadowing = style.value(PName.Shadowing).asDouble(); circle.setDeltaShadow(shadowing); - ug.apply(color.bg()).apply(new HColorNone()).draw(circle); + ug.apply(color.bg()).apply(HColors.none()).draw(circle); } public ShapeType getShapeType() { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index 5faae7513..84f6ad0f6 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -73,7 +73,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageClass extends AbstractEntityImage implements Stencil, WithPorts { @@ -211,7 +211,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi ugHeader.apply(stroke).draw(rect2); ugHeader.apply(stroke).apply(UTranslate.dy(dimHeader.getHeight() - rect3.getHeight())).draw(rect3); rect.setDeltaShadow(0); - ug.apply(stroke).apply(new HColorNone().bg()).draw(rect); + ug.apply(stroke).apply(HColors.none().bg()).draw(rect); } else { ug.apply(stroke).draw(rect); } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java index 815d1bc34..74c0d9b86 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageLollipopInterfaceEye1 extends AbstractEntityImage { @@ -95,7 +95,7 @@ public class EntityImageLollipopInterfaceEye1 extends AbstractEntityImage { // circle.setDeltaShadow(4); } ug.apply(new UStroke(1.5)).apply(new UTranslate(diff, diff)).draw(circle1); - ug = ug.apply(new HColorNone().bg()); + ug = ug.apply(HColors.none().bg()); Point2D pos = bibliotekon.getNode(getEntity()).getPosition(); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java index a1dc819d5..df05f2689 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.svek.image; -import java.util.Objects; - import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.Guillemet; @@ -53,7 +51,6 @@ 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.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -64,7 +61,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageLollipopInterfaceEye2 extends AbstractEntityImage { @@ -93,7 +90,7 @@ public class EntityImageLollipopInterfaceEye2 extends AbstractEntityImage { // if (backcolor == null) // backcolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), symbol.getColorParamBack()); - final HColor forecolor = HColorUtils.BLACK; + final HColor forecolor = HColors.BLACK; // final HColor forecolor = SkinParamUtils.getColor(getSkinParam(), getStereo(), // symbol.getColorParamBorder()); this.ctx = new SymbolContext(backcolor, forecolor).withStroke(new UStroke(1.5)) diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java index c4a1d27dd..2815de432 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageSynchroBar extends AbstractEntityImage { @@ -84,7 +84,7 @@ public class EntityImageSynchroBar extends AbstractEntityImage { final double shadowing = style.value(PName.Shadowing).asDouble(); rect.setDeltaShadow(shadowing); - ug.apply(new HColorNone()).apply(color.bg()).draw(rect); + ug.apply(HColors.none()).apply(color.bg()).draw(rect); } public ShapeType getShapeType() { diff --git a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java index 53f6272f0..721515ab7 100644 --- a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java +++ b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java @@ -57,7 +57,7 @@ import net.sourceforge.plantuml.ugraphic.USegment; import net.sourceforge.plantuml.ugraphic.USegmentType; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.version.Version; public class TikzGraphics { @@ -68,8 +68,8 @@ public class TikzGraphics { private final List cmd = new ArrayList<>(); private final boolean withPreamble; - private HColor color = HColorUtils.BLACK; - private HColor fillcolor = HColorUtils.BLACK; + private HColor color = HColors.BLACK; + private HColor fillcolor = HColors.BLACK; private HColor fillcolorGradient2 = null; private char gradientPolicy; private double thickness = 1.0; @@ -124,7 +124,7 @@ public class TikzGraphics { if (fillcolor == null) return false; - if (HColorUtils.isTransparent(fillcolor)) + if (HColors.isTransparent(fillcolor)) return false; if (mapper.toColor(fillcolor).getAlpha() == 0) diff --git a/src/net/sourceforge/plantuml/timingdiagram/Highlight.java b/src/net/sourceforge/plantuml/timingdiagram/Highlight.java index 7565f0907..9ab4541b1 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/Highlight.java +++ b/src/net/sourceforge/plantuml/timingdiagram/Highlight.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorNone; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Highlight { @@ -118,7 +118,7 @@ public class Highlight { } public void drawHighlightsBack(UGraphic ug, TimingRuler ruler, double height) { - ug = ug.apply(new HColorNone()).apply(getBackColor().bg()); + ug = ug.apply(HColors.none()).apply(getBackColor().bg()); final double start = ruler.getPosInPixel(this.getTickFrom()); final double end = ruler.getPosInPixel(this.getTickTo()); final URectangle rect = new URectangle(end - start, height); diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java b/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java index e84042ea6..23c1d2f9b 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class TimeMessage extends WithLinkType { @@ -77,7 +77,7 @@ public class TimeMessage extends WithLinkType { private HColor getColor() { // return HColorUtils.BLUE; if (styleBuilder == null) { - return HColorUtils.MY_RED; + return HColors.MY_RED; } return getStyle().value(PName.LineColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); } diff --git a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java index 530f1347c..67c466852 100644 --- a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java +++ b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java @@ -61,7 +61,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.svg.DarkStrategy; import net.sourceforge.plantuml.svg.LengthAdjust; import net.sourceforge.plantuml.svg.SvgGraphics; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class FontChecker { @@ -174,7 +174,7 @@ public class FontChecker { final double dim = 20; final UDrawable drawable = new UDrawable() { public void drawU(UGraphic ug) { - ug = ug.apply(HColorUtils.BLACK); + ug = ug.apply(HColors.BLACK); ug.draw(new URectangle(dim - 1, dim - 1)); if (!(ug instanceof LimitFinder)) { ug = ug.apply(new UTranslate(dim / 3, 2 * dim / 3)); diff --git a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java index 92b684ef4..808b99994 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java @@ -97,7 +97,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColorBackground; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; import net.sourceforge.plantuml.ugraphic.color.HColorNone; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.debug.UGraphicDebug; import net.sourceforge.plantuml.ugraphic.eps.UGraphicEps; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; @@ -155,7 +155,7 @@ public class ImageBuilder { } public ImageBuilder blackBackcolor() { - return backcolor(HColorUtils.BLACK); + return backcolor(HColors.BLACK); } public ImageBuilder dimension(Dimension2D dimension) { @@ -310,7 +310,7 @@ public class ImageBuilder { dim.getHeight() - stroke.getThickness()) .rounded(skinParam.getRoundCorner(CornerParam.diagramBorder, null)); - ug.apply(color == null ? HColorUtils.BLACK : color).apply(stroke).draw(rectangle); + ug.apply(color == null ? HColors.BLACK : color).apply(stroke).draw(rectangle); } private void drawRandomPoint(UGraphic ug2) { @@ -482,7 +482,7 @@ public class ImageBuilder { } static private HColor getDefaultHBackColor() { - return HColorUtils.WHITE; + return HColors.WHITE; } private String getHoverPathColorRGB() { diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMax.java b/src/net/sourceforge/plantuml/ugraphic/MinMax.java index d8ad883c0..d49106b3a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMax.java +++ b/src/net/sourceforge/plantuml/ugraphic/MinMax.java @@ -40,7 +40,7 @@ import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class MinMax { @@ -154,7 +154,7 @@ public class MinMax { } public void drawGray(UGraphic ug) { - draw(ug, HColorUtils.GRAY); + draw(ug, HColors.GRAY); } public void draw(UGraphic ug, HColor color) { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java index 5747ec653..da62250f5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; import java.io.IOException; import java.io.OutputStream; @@ -87,7 +87,7 @@ public abstract class UGraphicNo implements UGraphic { @Override public HColor getDefaultBackground() { - return HColorUtils.BLACK; + return HColors.BLACK; } @Override diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java index 5ccf646f1..d99d3962f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java @@ -41,7 +41,7 @@ import java.io.OutputStream; import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicNull extends AbstractUGraphic implements EnsureVisible { @@ -55,7 +55,7 @@ public class UGraphicNull extends AbstractUGraphic implements EnsureVisi } public UGraphicNull() { - super(HColorUtils.BLACK, new ColorMapperIdentity(), FileFormat.PNG.getDefaultStringBounder(), "foo"); + super(HColors.BLACK, new ColorMapperIdentity(), FileFormat.PNG.getDefaultStringBounder(), "foo"); } @Override diff --git a/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java b/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java index 318d829f1..8958c5474 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java @@ -59,7 +59,7 @@ public abstract class AbstractColorMapper implements ColorMapper { // System.exit(0); // return toHtml(result); } - if (HColorUtils.isTransparent(hcolor)) + if (HColors.isTransparent(hcolor)) return "#00000000"; final Color color = toColor(hcolor); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperForceDark.java b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperForceDark.java index 97c15b612..7a72544b0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperForceDark.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperForceDark.java @@ -52,10 +52,10 @@ public class ColorMapperForceDark extends AbstractColorMapper implements ColorMa if (color instanceof HColorMiddle) { return ((HColorMiddle) color).getMappedColor(this); } - if (color instanceof HColorAutomatic) { + if (color instanceof HColorScheme) { throw new IllegalStateException(); } - if (color instanceof HColorAutomaticLegacy) { + if (color instanceof HColorAutomagic) { throw new IllegalStateException(); } final HColor tmp = ((HColorSimple) color).darkSchemeTheme(); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperIdentity.java b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperIdentity.java index b8e6eb002..0e5ce7fa2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperIdentity.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperIdentity.java @@ -52,10 +52,10 @@ public class ColorMapperIdentity extends AbstractColorMapper implements ColorMap if (color instanceof HColorMiddle) { return ((HColorMiddle) color).getMappedColor(this); } - if (color instanceof HColorAutomatic) { + if (color instanceof HColorScheme) { throw new IllegalStateException(); } - if (color instanceof HColorAutomaticLegacy) { + if (color instanceof HColorAutomagic) { throw new IllegalStateException(); } return ((HColorSimple) color).getColor999(); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperMonochrome.java b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperMonochrome.java index 33f639b7f..314933cd9 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperMonochrome.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/ColorMapperMonochrome.java @@ -50,10 +50,10 @@ public class ColorMapperMonochrome extends AbstractColorMapper implements ColorM return null; final Color color = new ColorMapperIdentity().toColor(htmlColor); - if (HColorUtils.isTransparent(htmlColor)) + if (HColors.isTransparent(htmlColor)) return color; - if (reverse && HColorUtils.isTransparent(htmlColor) == false) + if (reverse && HColors.isTransparent(htmlColor) == false) return ColorUtils.getGrayScaleColorReverse(color); return ColorUtils.getGrayScaleColor(color); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomaticLegacy.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java similarity index 94% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorAutomaticLegacy.java rename to src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java index b7b0f2f11..774d1ebde 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomaticLegacy.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java @@ -34,6 +34,6 @@ */ package net.sourceforge.plantuml.ugraphic.color; -public class HColorAutomaticLegacy extends HColorAbstract implements HColor { +public class HColorAutomagic extends HColorAbstract implements HColor { } diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java index f3ae458a6..6862deb36 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java @@ -43,13 +43,13 @@ public class HColorGradient extends HColorAbstract implements HColor { private final HColor color2; private final char policy; - public HColorGradient(HColor color1, HColor color2, char policy) { - if (color1 instanceof HColorGradient) { + HColorGradient(HColor color1, HColor color2, char policy) { + if (color1 instanceof HColorGradient) color1 = ((HColorGradient) color1).color1; - } - if (color2 instanceof HColorGradient) { + + if (color2 instanceof HColorGradient) color2 = ((HColorGradient) color2).color2; - } + this.color1 = Objects.requireNonNull(color1); this.color2 = Objects.requireNonNull(color2); this.policy = policy; @@ -64,9 +64,9 @@ public class HColorGradient extends HColorAbstract implements HColor { } public final Color getColor(ColorMapper mapper, double coeff) { - if (coeff > 1 || coeff < 0) { + if (coeff > 1 || coeff < 0) throw new IllegalArgumentException("c=" + coeff); - } + final Color c1 = mapper.toColor(color1); final Color c2 = mapper.toColor(color2); final int vred = c2.getRed() - c1.getRed(); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java index 229958983..e63e83f8e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java @@ -42,7 +42,7 @@ public class HColorMiddle extends HColorAbstract implements HColor { private final HColor c1; private final HColor c2; - public HColorMiddle(HColor c1, HColor c2) { + HColorMiddle(HColor c1, HColor c2) { this.c1 = c1; this.c2 = c2; } diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorNone.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorNone.java index fcc986dfa..b899901ab 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorNone.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorNone.java @@ -38,6 +38,9 @@ import net.sourceforge.plantuml.ugraphic.UBackground; public class HColorNone extends HColorAbstract implements HColor { + HColorNone() { + } + @Override public UBackground bg() { return new UBackground() { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomatic.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java similarity index 88% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorAutomatic.java rename to src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java index a5ea4b1c6..26c83b63c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomatic.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java @@ -34,20 +34,20 @@ */ package net.sourceforge.plantuml.ugraphic.color; -public class HColorAutomatic extends HColorAbstract implements HColor { +public class HColorScheme extends HColorAbstract implements HColor { private final HColor colorForLight; private final HColor colorForDark; private final HColor colorForTransparent; - public HColorAutomatic(HColor colorForLight, HColor colorForDark, HColor colorForTransparent) { + public HColorScheme(HColor colorForLight, HColor colorForDark, HColor colorForTransparent) { this.colorForLight = colorForLight; this.colorForDark = colorForDark; this.colorForTransparent = colorForTransparent; } public HColor getAppropriateColor(HColor back) { - if (back == null || HColorUtils.isTransparent(back)) { + if (back == null || HColors.isTransparent(back)) { if (colorForTransparent != null) return colorForTransparent; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java index 942b4edfa..a66bc2702 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java @@ -245,7 +245,7 @@ public class HColorSet { } HColorGradient buildInternal(HColor background) { - return new HColorGradient(build(s1, background), build(s2, background), sep); + return HColors.gradient(build(s1, background), build(s2, background), sep); } } @@ -265,11 +265,11 @@ public class HColorSet { return true; } - HColorAutomatic buildInternal(HColor background) { + HColorScheme buildInternal(HColor background) { if (colors.length == 2) - return new HColorAutomatic(build(colors[0], background), build(colors[1], background), null); + return new HColorScheme(build(colors[0], background), build(colors[1], background), null); - return new HColorAutomatic(build(colors[0], background), build(colors[1], background), + return new HColorScheme(build(colors[0], background), build(colors[1], background), build(colors[2], background)); } @@ -311,13 +311,13 @@ public class HColorSet { public HColor getColorOrWhite(ThemeStyle UNUSED, String s, HColor background) { if (isColorValid(Objects.requireNonNull(s)) == false) - return HColorUtils.WHITE; + return HColors.WHITE; try { return getColor(null, s, background); } catch (NoSuchColorException e) { assert false; - return HColorUtils.WHITE; + return HColors.WHITE; } } @@ -373,7 +373,7 @@ public class HColorSet { if (s.equalsIgnoreCase("transparent") || s.equalsIgnoreCase("background")) { return new HColorBackground(background); } else if (s.equalsIgnoreCase("automatic")) { - return new HColorAutomaticLegacy(); + return new HColorAutomagic(); } else if (s.matches("[0-9A-Fa-f]")) { s = "" + s.charAt(0) + s.charAt(0) + s.charAt(0) + s.charAt(0) + s.charAt(0) + s.charAt(0); color = new Color(Integer.parseInt(s, 16)); diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java b/src/net/sourceforge/plantuml/ugraphic/color/HColors.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java rename to src/net/sourceforge/plantuml/ugraphic/color/HColors.java index 6e3e81518..b867cc91e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColors.java @@ -40,7 +40,7 @@ import java.awt.Color; import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UGraphic; -public class HColorUtils { +public class HColors { public static final HColorSimple BLACK; public static final HColorSimple WHITE; @@ -128,7 +128,7 @@ public class HColorUtils { public static UChange changeBack(UGraphic ug) { final HColor color = ug.getParam().getColor(); if (color == null) - return new HColorNone().bg(); + return HColors.none().bg(); return color.bg(); } @@ -165,4 +165,16 @@ public class HColorUtils { return color1; } + public static HColor none() { + return new HColorNone(); + } + + public static HColor middle(HColor c1, HColor c2) { + return new HColorMiddle(c1, c2); + } + + public static HColorGradient gradient(HColor color1, HColor color2, char policy) { + return new HColorGradient(color1, color2, policy); + } + } diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java index 5d32d9db3..bdc636832 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.ugraphic.debug; import static java.nio.charset.StandardCharsets.UTF_8; import java.awt.Color; -import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.io.IOException; import java.io.OutputStream; @@ -47,6 +46,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; @@ -66,7 +66,7 @@ import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorMiddle; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContainer { @@ -98,7 +98,7 @@ public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContain public UGraphicDebug(double scaleFactor, Dimension2D dim, String svgLinkTarget, String hoverPathColorRGB, long seed, String preserveAspectRatio) { - super(HColorUtils.WHITE, new ColorMapperIdentity(), new StringBounderDebug()); + super(HColors.WHITE, new ColorMapperIdentity(), new StringBounderDebug()); this.output = new ArrayList<>(); this.scaleFactor = scaleFactor; this.dim = dim; @@ -255,15 +255,15 @@ public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContain } private String colorToString(HColor color) { - if (color == null) { + if (color == null) return "NULL_COLOR"; - } + if (color instanceof HColorSimple) { final HColorSimple simple = (HColorSimple) color; final Color internal = simple.getColor999(); - if (simple.isMonochrome()) { + if (simple.isMonochrome()) return "monochrome " + Integer.toHexString(internal.getRGB()); - } + return Integer.toHexString(internal.getRGB()); } if (color instanceof HColorMiddle) { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java index 34e061ce0..9a1941384 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java @@ -56,7 +56,7 @@ import net.sourceforge.plantuml.ugraphic.UParam; import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class DriverTextEps implements UDriver { @@ -75,7 +75,7 @@ public class DriverTextEps implements UDriver { } final FontConfiguration fontConfiguration = shape.getFontConfiguration(); - if (HColorUtils.isTransparent(fontConfiguration.getColor())) { + if (HColors.isTransparent(fontConfiguration.getColor())) { return; } diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java index 12e73fe7e..22be82310 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.ugraphic.USegmentType; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class DriverPathG2d extends DriverShadowedG2d implements UDriver { @@ -93,7 +93,7 @@ public class DriverPathG2d extends DriverShadowedG2d implements UDriver { @@ -85,7 +85,7 @@ public class DriverPolygonG2d extends DriverShadowedG2d implements UDriver { @@ -85,7 +85,7 @@ public class DriverRectangleG2d extends DriverShadowedG2d implements UDriver { @@ -75,7 +75,7 @@ public class DriverTextG2d implements UDriver { public void draw(UText shape, double x, double y, ColorMapper mapper, UParam param, Graphics2D g2d) { final FontConfiguration fontConfiguration = shape.getFontConfiguration(); - if (HColorUtils.isTransparent(fontConfiguration.getColor())) { + if (HColors.isTransparent(fontConfiguration.getColor())) { return; } final String text = shape.getText(); diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java index 01eb818de..9baff1dc4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java @@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class DriverTextSvg implements UDriver { @@ -70,7 +70,7 @@ public class DriverTextSvg implements UDriver { } final FontConfiguration fontConfiguration = shape.getFontConfiguration(); - if (HColorUtils.isTransparent(fontConfiguration.getColor())) { + if (HColors.isTransparent(fontConfiguration.getColor())) { return; } final UFont font = fontConfiguration.getFont(); diff --git a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java index 8a169b6ab..5e188b93b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java +++ b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicTxt extends AbstractCommonUGraphic implements ClipContainer { @@ -71,7 +71,7 @@ public class UGraphicTxt extends AbstractCommonUGraphic implements ClipContainer } public UGraphicTxt() { - super(HColorUtils.BLACK, new ColorMapperIdentity(), new TextStringBounder()); + super(HColors.BLACK, new ColorMapperIdentity(), new TextStringBounder()); this.charArea = new UmlCharAreaImpl(); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 44f0bb47d..b3d0c352e 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -81,7 +81,7 @@ public class Version { } public static int beta() { - final int beta = 11; + final int beta = 12; return beta; } diff --git a/src/net/sourceforge/plantuml/wire/Block.java b/src/net/sourceforge/plantuml/wire/Block.java index 364a51413..3afd53dbf 100644 --- a/src/net/sourceforge/plantuml/wire/Block.java +++ b/src/net/sourceforge/plantuml/wire/Block.java @@ -58,7 +58,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Block extends AbstractTextBlock { @@ -145,7 +145,7 @@ public class Block extends AbstractTextBlock { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } private void drawPins(Position pos, UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/wire/Spot.java b/src/net/sourceforge/plantuml/wire/Spot.java index 3fde31e82..97b654652 100644 --- a/src/net/sourceforge/plantuml/wire/Spot.java +++ b/src/net/sourceforge/plantuml/wire/Spot.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class Spot { @@ -51,7 +51,7 @@ public class Spot { public Spot(WBlock block, HColor color, String x, String y) { this.block = block; - this.color = color == null ? HColorUtils.RED : color; + this.color = color == null ? HColors.RED : color; this.x = x == null ? "0" : x; this.y = y == null ? "0" : y; } diff --git a/src/net/sourceforge/plantuml/wire/WBlock.java b/src/net/sourceforge/plantuml/wire/WBlock.java index b4cf5b15c..7f8735dc4 100644 --- a/src/net/sourceforge/plantuml/wire/WBlock.java +++ b/src/net/sourceforge/plantuml/wire/WBlock.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class WBlock { @@ -243,7 +243,7 @@ public class WBlock { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } private void drawBox(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java index 05c8e4778..8ee464dc0 100644 --- a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java +++ b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class WLinkHorizontal { @@ -73,11 +73,11 @@ public class WLinkHorizontal { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } private HColor getWhite() { - return HColorUtils.WHITE.withDark(HColorUtils.BLACK); + return HColors.WHITE.withDark(HColors.BLACK); } private TextBlock getTextBlock() { diff --git a/src/net/sourceforge/plantuml/wire/WLinkVertical.java b/src/net/sourceforge/plantuml/wire/WLinkVertical.java index 11efd68f3..e39f1cbea 100644 --- a/src/net/sourceforge/plantuml/wire/WLinkVertical.java +++ b/src/net/sourceforge/plantuml/wire/WLinkVertical.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class WLinkVertical { @@ -70,11 +70,11 @@ public class WLinkVertical { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } private HColor getWhite() { - return HColorUtils.WHITE.withDark(HColorUtils.BLACK); + return HColors.WHITE.withDark(HColors.BLACK); } private TextBlock getTextBlock() { diff --git a/src/net/sourceforge/plantuml/wire/WPrint.java b/src/net/sourceforge/plantuml/wire/WPrint.java index 025d64f58..bfab6d401 100644 --- a/src/net/sourceforge/plantuml/wire/WPrint.java +++ b/src/net/sourceforge/plantuml/wire/WPrint.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; public class WPrint { @@ -63,7 +63,7 @@ public class WPrint { } private HColor getBlack() { - return HColorUtils.BLACK.withDark(HColorUtils.WHITE); + return HColors.BLACK.withDark(HColors.WHITE); } private TextBlock getTextBlock() { diff --git a/test/net/sourceforge/plantuml/SkinParamTest.java b/test/net/sourceforge/plantuml/SkinParamTest.java index 6b79b14cb..c7bebc384 100644 --- a/test/net/sourceforge/plantuml/SkinParamTest.java +++ b/test/net/sourceforge/plantuml/SkinParamTest.java @@ -21,7 +21,7 @@ import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svg.LengthAdjust; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.color.HColorUtils; +import net.sourceforge.plantuml.ugraphic.color.HColors; class SkinParamTest { @@ -44,7 +44,7 @@ class SkinParamTest { assertThat(skinParam.getAllSpriteNames()).isEmpty(); - assertThat(skinParam.getBackgroundColor()).isEqualTo(HColorUtils.WHITE); + assertThat(skinParam.getBackgroundColor()).isEqualTo(HColors.WHITE); assertThat(skinParam.getCircledCharacter(fooStereotype)).isEqualTo('\0'); @@ -94,7 +94,7 @@ class SkinParamTest { assertThat(skinParam.forceSequenceParticipantUnderlined()).isFalse(); - assertThat(skinParam.getHyperlinkColor()).isEqualTo(HColorUtils.BLUE); + assertThat(skinParam.getHyperlinkColor()).isEqualTo(HColors.BLUE); assertThat(skinParam.getlengthAdjust()).isEqualTo(LengthAdjust.SPACING);