From 4888ac976d4e58562f73de9a0dc599ca04a620e6 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 2 Feb 2023 18:59:43 +0100 Subject: [PATCH] Start major packages refactoring --- src/com/plantuml/wasm/RunInit.java | 6 +- src/jcckit/util/ConfigParameters.java | 6 +- .../plantuml => atmp}/ISkinSimple.java | 9 +- .../graphic => atmp}/SpecialText.java | 9 +- .../sourceforge/plantuml/AbstractPSystem.java | 7 +- .../sourceforge/plantuml/AlignmentParam.java | 2 +- .../plantuml/AnnotatedBuilder.java | 13 +- .../sourceforge/plantuml/AnnotatedWorker.java | 4 +- src/net/sourceforge/plantuml/BlockUml.java | 6 +- .../sourceforge/plantuml/BlockUmlBuilder.java | 2 +- src/net/sourceforge/plantuml/ColorParam.java | 10 +- .../sourceforge/plantuml/EmbeddedDiagram.java | 13 +- .../plantuml/EmptyImageBuilder.java | 10 +- src/net/sourceforge/plantuml/FileFormat.java | 51 +++--- .../plantuml/FileFormatOption.java | 10 +- src/net/sourceforge/plantuml/FileGroup.java | 6 +- src/net/sourceforge/plantuml/FileSystem.java | 14 +- src/net/sourceforge/plantuml/ISkinParam.java | 17 +- .../plantuml/LineConfigurable.java | 4 +- .../sourceforge/plantuml/NewpagedDiagram.java | 2 +- src/net/sourceforge/plantuml/Option.java | 14 +- src/net/sourceforge/plantuml/OptionFlags.java | 2 + .../sourceforge/plantuml/PSystemBuilder.java | 41 ++--- .../sourceforge/plantuml/PSystemUtils.java | 2 +- src/net/sourceforge/plantuml/SkinParam.java | 28 ++-- .../plantuml/SkinParamBackcolored.java | 8 +- .../SkinParamBackcoloredReference.java | 2 +- .../sourceforge/plantuml/SkinParamColors.java | 5 +- .../plantuml/SkinParamDelegator.java | 20 ++- .../plantuml/SkinParamForceColor.java | 2 +- .../plantuml/SkinParamForecolored.java | 2 +- .../sourceforge/plantuml/SkinParamUtils.java | 5 +- .../plantuml/SourceFileReader.java | 4 +- .../plantuml/SourceStringReader.java | 4 +- src/net/sourceforge/plantuml/SplitParam.java | 4 +- .../plantuml/SpriteContainerEmpty.java | 9 +- src/net/sourceforge/plantuml/StdrptV1.java | 1 + src/net/sourceforge/plantuml/StdrptV2.java | 1 + src/net/sourceforge/plantuml/StringUtils.java | 6 +- .../sourceforge/plantuml/TitledDiagram.java | 10 +- src/net/sourceforge/plantuml/UmlDiagram.java | 7 +- .../acearth/PSystemXearthFactory.java | 6 +- .../activitydiagram/command/CommandElse.java | 8 +- .../command/CommandEndPartition.java | 10 +- .../activitydiagram/command/CommandEndif.java | 8 +- .../activitydiagram/command/CommandIf.java | 12 +- .../command/CommandInnerConcurrent.java | 8 +- .../command/CommandLinkActivity.java | 26 +-- .../command/CommandLinkLongActivity.java | 28 ++-- .../command/CommandPartition.java | 16 +- .../activitydiagram3/AbstractInstruction.java | 5 +- .../activitydiagram3/ActivityDiagram3.java | 8 +- .../plantuml/activitydiagram3/Branch.java | 18 +- .../activitydiagram3/Instruction.java | 6 +- .../activitydiagram3/InstructionBreak.java | 4 +- .../activitydiagram3/InstructionEnd.java | 6 +- .../activitydiagram3/InstructionFork.java | 4 +- .../activitydiagram3/InstructionGoto.java | 4 +- .../activitydiagram3/InstructionGroup.java | 8 +- .../activitydiagram3/InstructionIf.java | 8 +- .../activitydiagram3/InstructionLabel.java | 4 +- .../activitydiagram3/InstructionList.java | 4 +- .../activitydiagram3/InstructionRepeat.java | 6 +- .../activitydiagram3/InstructionSimple.java | 6 +- .../activitydiagram3/InstructionSplit.java | 4 +- .../activitydiagram3/InstructionSpot.java | 12 +- .../activitydiagram3/InstructionStart.java | 6 +- .../activitydiagram3/InstructionStop.java | 6 +- .../activitydiagram3/InstructionSwitch.java | 6 +- .../activitydiagram3/InstructionWhile.java | 6 +- .../activitydiagram3/PositionedNote.java | 4 +- .../command/CommandActivity3.java | 20 +-- .../command/CommandActivityLegacy1.java | 8 +- .../command/CommandActivityLong3.java | 14 +- .../command/CommandArrow3.java | 12 +- .../command/CommandArrowLong3.java | 12 +- .../command/CommandBackward3.java | 14 +- .../command/CommandBackwardLong3.java | 10 +- .../command/CommandBreak.java | 8 +- .../activitydiagram3/command/CommandCase.java | 8 +- .../command/CommandCircleSpot3.java | 14 +- .../command/CommandElse3.java | 14 +- .../command/CommandElseIf2.java | 18 +- .../command/CommandElseIf3.java | 18 +- .../command/CommandElseLegacy1.java | 8 +- .../activitydiagram3/command/CommandEnd3.java | 8 +- .../command/CommandEndPartition3.java | 8 +- .../command/CommandEndSwitch.java | 8 +- .../command/CommandEndif3.java | 8 +- .../command/CommandFork3.java | 8 +- .../command/CommandForkAgain3.java | 8 +- .../command/CommandForkEnd3.java | 10 +- .../activitydiagram3/command/CommandGoto.java | 8 +- .../command/CommandGroupEnd3.java | 8 +- .../activitydiagram3/command/CommandIf2.java | 22 +-- .../activitydiagram3/command/CommandIf4.java | 14 +- .../command/CommandIfLegacy1.java | 8 +- .../command/CommandKill3.java | 8 +- .../command/CommandLabel.java | 8 +- .../command/CommandLink3.java | 12 +- .../command/CommandNolink.java | 8 +- .../command/CommandNote3.java | 14 +- .../command/CommandNoteLong3.java | 14 +- .../command/CommandPartition3.java | 18 +- .../command/CommandRepeat3.java | 18 +- .../command/CommandRepeatWhile3.java | 14 +- .../CommandRepeatWhile3Multilines.java | 12 +- .../command/CommandSplit3.java | 8 +- .../command/CommandSplitAgain3.java | 8 +- .../command/CommandSplitEnd3.java | 10 +- .../command/CommandStart3.java | 8 +- .../command/CommandStop3.java | 8 +- .../command/CommandSwimlane.java | 14 +- .../command/CommandSwimlane2.java | 16 +- .../command/CommandSwitch.java | 14 +- .../command/CommandWhile3.java | 16 +- .../command/CommandWhileEnd3.java | 12 +- .../ftile/AbstractConnection.java | 2 +- .../activitydiagram3/ftile/AbstractFtile.java | 12 +- .../activitydiagram3/ftile/ArrowsRegular.java | 3 +- .../ftile/ArrowsTriangle.java | 3 +- .../activitydiagram3/ftile/BoxStyle.java | 14 +- .../activitydiagram3/ftile/CenteredText.java | 2 +- .../ftile/CollisionDetector.java | 28 ++-- .../activitydiagram3/ftile/Connection.java | 2 +- .../ftile/ConnectionTranslatable.java | 2 +- .../activitydiagram3/ftile/Ftile.java | 8 +- .../ftile/FtileAssemblySimple.java | 8 +- .../activitydiagram3/ftile/FtileBreak.java | 2 +- .../activitydiagram3/ftile/FtileEmpty.java | 2 +- .../activitydiagram3/ftile/FtileFactory.java | 6 +- .../ftile/FtileFactoryDelegator.java | 10 +- .../activitydiagram3/ftile/FtileGeometry.java | 2 +- .../activitydiagram3/ftile/FtileGoto.java | 2 +- .../ftile/FtileHeightFixedCentered.java | 4 +- .../ftile/FtileHeightFixedMarged.java | 4 +- .../activitydiagram3/ftile/FtileKilled.java | 2 +- .../activitydiagram3/ftile/FtileMarged.java | 4 +- .../ftile/FtileMargedRight.java | 2 +- .../ftile/FtileMargedVertically.java | 4 +- .../ftile/FtileMargedWest.java | 4 +- .../ftile/FtileMinWidthCentered.java | 4 +- .../activitydiagram3/ftile/FtileWithUrl.java | 2 +- .../activitydiagram3/ftile/Genealogy.java | 4 +- .../ftile/GotoInterceptor.java | 2 +- .../activitydiagram3/ftile/Hexagon.java | 4 +- .../activitydiagram3/ftile/LaneDivider.java | 12 +- .../activitydiagram3/ftile/Snake.java | 12 +- .../activitydiagram3/ftile/Swimlane.java | 8 +- .../activitydiagram3/ftile/Swimlanes.java | 28 ++-- .../ftile/TextBlockInterceptorUDrawable.java | 4 +- .../ftile/UGraphicInterceptorUDrawable2.java | 17 +- .../plantuml/activitydiagram3/ftile/Worm.java | 15 +- .../activitydiagram3/ftile/WormMutation.java | 2 +- .../activitydiagram3/ftile/WormTexted.java | 7 +- .../plantuml/activitydiagram3/ftile/Zad.java | 4 +- .../activitydiagram3/ftile/ZadBuilder.java | 21 ++- .../AbstractParallelFtilesBuilder.java | 6 +- .../vcompact/ConnectionVerticalDown.java | 4 +- .../ftile/vcompact/FloatingNote.java | 10 +- .../vcompact/FtileFactoryDelegatorAddUrl.java | 2 +- .../FtileFactoryDelegatorAssembly.java | 4 +- .../FtileFactoryDelegatorCreateGroup.java | 2 +- .../vcompact/FtileFactoryDelegatorIf.java | 6 +- .../vcompact/FtileFactoryDelegatorRepeat.java | 6 +- .../vcompact/FtileFactoryDelegatorSwitch.java | 6 +- .../vcompact/FtileFactoryDelegatorWhile.java | 6 +- .../ftile/vcompact/FtileForkInner.java | 4 +- .../vcompact/FtileForkInnerOverlapped.java | 4 +- .../ftile/vcompact/FtileGroup.java | 14 +- .../ftile/vcompact/FtileIfAndStop.java | 12 +- .../ftile/vcompact/FtileIfDown.java | 4 +- .../ftile/vcompact/FtileIfLongHorizontal.java | 10 +- .../ftile/vcompact/FtileIfLongVertical.java | 10 +- .../ftile/vcompact/FtileNoteAlone.java | 12 +- .../ftile/vcompact/FtileRepeat.java | 12 +- .../ftile/vcompact/FtileSwitch.java | 10 +- .../ftile/vcompact/FtileWhile.java | 10 +- .../ftile/vcompact/FtileWithNoteOpale.java | 12 +- .../ftile/vcompact/FtileWithNotes.java | 12 +- .../ftile/vcompact/ParallelBuilderFork.java | 4 +- .../ftile/vcompact/ParallelBuilderMerge.java | 8 +- .../ftile/vcompact/ParallelBuilderSplit.java | 6 +- .../vcompact/UGraphicInterceptorGoto.java | 4 +- .../UGraphicInterceptorOneSwimlane.java | 11 +- .../ftile/vcompact/VCompactFactory.java | 10 +- .../vcompact/cond/ConditionalBuilder.java | 12 +- .../vcompact/cond/FtileDimensionMemoize.java | 2 +- .../ftile/vcompact/cond/FtileIfNude.java | 4 +- .../vcompact/cond/FtileIfWithDiamonds.java | 4 +- .../ftile/vcompact/cond/FtileIfWithLinks.java | 6 +- .../ftile/vcompact/cond/FtileSwitchNude.java | 4 +- .../cond/FtileSwitchWithDiamonds.java | 4 +- .../cond/FtileSwitchWithManyLinks.java | 6 +- .../vcompact/cond/FtileSwitchWithOneLink.java | 2 +- .../ftile/vertical/FtileBlackBlock.java | 8 +- .../ftile/vertical/FtileBox.java | 14 +- .../ftile/vertical/FtileBox2.java | 14 +- .../ftile/vertical/FtileBoxOld.java | 14 +- .../ftile/vertical/FtileCircleEnd.java | 10 +- .../ftile/vertical/FtileCircleSpot.java | 12 +- .../ftile/vertical/FtileCircleStart.java | 6 +- .../ftile/vertical/FtileCircleStop.java | 8 +- .../ftile/vertical/FtileDecorate.java | 8 +- .../ftile/vertical/FtileDecorateInLabel.java | 4 +- .../ftile/vertical/FtileDecorateOutLabel.java | 2 +- .../ftile/vertical/FtileDecoratePointOut.java | 2 +- .../ftile/vertical/FtileDiamond.java | 6 +- .../ftile/vertical/FtileDiamondInside.java | 6 +- .../ftile/vertical/FtileDiamondInside2.java | 6 +- .../ftile/vertical/FtileDiamondSquare.java | 6 +- .../ftile/vertical/FtileDiamondWIP.java | 2 +- .../ftile/vertical/FtileThinSplit.java | 14 +- .../activitydiagram3/gtile/AbstractGtile.java | 6 +- .../gtile/AbstractGtileRoot.java | 6 +- .../gtile/GAbstractConnection.java | 2 +- .../activitydiagram3/gtile/GConnection.java | 2 +- ...GConnectionHorizontalThenVerticalDown.java | 6 +- .../GConnectionSideThenVerticalThenSide.java | 6 +- .../gtile/GConnectionVerticalDown.java | 4 +- .../GConnectionVerticalDownThenBack.java | 6 +- ...GConnectionVerticalDownThenHorizontal.java | 6 +- .../activitydiagram3/gtile/GPoint.java | 2 +- .../activitydiagram3/gtile/Gtile.java | 5 +- .../activitydiagram3/gtile/GtileAssembly.java | 8 +- .../activitydiagram3/gtile/GtileBox.java | 14 +- .../activitydiagram3/gtile/GtileBreak.java | 2 +- .../gtile/GtileCircleSpot.java | 12 +- .../gtile/GtileCircleStart.java | 6 +- .../activitydiagram3/gtile/GtileColumns.java | 4 +- .../activitydiagram3/gtile/GtileEmpty.java | 2 +- .../activitydiagram3/gtile/GtileGoto.java | 2 +- .../activitydiagram3/gtile/GtileGroup.java | 14 +- .../gtile/GtileHexagonInside.java | 6 +- .../gtile/GtileHexagonInsideLabelled.java | 4 +- .../activitydiagram3/gtile/GtileIfAlone.java | 4 +- .../gtile/GtileIfHexagon.java | 4 +- .../activitydiagram3/gtile/GtileLabel.java | 2 +- .../activitydiagram3/gtile/GtileRepeat.java | 4 +- .../activitydiagram3/gtile/GtileSplit.java | 10 +- .../activitydiagram3/gtile/GtileTopDown.java | 4 +- .../activitydiagram3/gtile/GtileTopDown3.java | 4 +- .../activitydiagram3/gtile/GtileWhile.java | 2 +- .../gtile/GtileWithIncomingArrow.java | 2 +- .../gtile/GtileWithMargin.java | 4 +- .../gtile/GtileWithNoteOpale.java | 12 +- .../gtile/GtileWithNotes.java | 12 +- .../gtile/GtileWithOutgoingArrow.java | 2 +- .../activitydiagram3/gtile/Gtiles.java | 10 +- .../plantuml/anim/AffineTransformation.java | 2 +- .../sourceforge/plantuml/anim/Animation.java | 2 +- .../annotation/{HaxeIgnored.java => Foo.java} | 2 +- .../plantuml/api/ImageDataAbstract.java | 4 +- .../plantuml/api/ImageDataComplex.java | 5 +- .../plantuml/api/ImageDataSimple.java | 8 +- .../plantuml/api/NumberAnalyzed.java | 4 +- .../plantuml/api/NumberAnalyzed2.java | 4 +- .../plantuml/api/NumberAnalyzedDated.java | 4 +- .../plantuml/api/mda/option2/MDADiagram.java | 1 + .../plantuml/api/mda/option3/MDAVisitor.java | 1 + .../sourceforge/plantuml/argon2/Argon2.java | 1 + .../asciiart/AbstractComponentText.java | 2 +- .../asciiart/ComponentTextActiveLine.java | 2 +- .../plantuml/asciiart/ComponentTextActor.java | 2 +- .../plantuml/asciiart/ComponentTextArrow.java | 2 +- .../plantuml/asciiart/ComponentTextDelay.java | 2 +- .../asciiart/ComponentTextDestroy.java | 2 +- .../asciiart/ComponentTextDivider.java | 2 +- .../asciiart/ComponentTextGroupingBody.java | 2 +- .../asciiart/ComponentTextGroupingElse.java | 2 +- .../asciiart/ComponentTextGroupingHeader.java | 2 +- .../asciiart/ComponentTextGroupingTail.java | 2 +- .../plantuml/asciiart/ComponentTextLine.java | 2 +- .../asciiart/ComponentTextNewpage.java | 2 +- .../plantuml/asciiart/ComponentTextNote.java | 2 +- .../asciiart/ComponentTextParticipant.java | 2 +- .../asciiart/ComponentTextReference.java | 2 +- .../asciiart/ComponentTextSelfArrow.java | 2 +- .../plantuml/asciiart/ComponentTextShape.java | 2 +- .../plantuml/asciiart/TextStringBounder.java | 9 +- .../plantuml/awt/geom/XLine2D.java | 4 +- .../plantuml/baraye/CucaDiagram.java | 2 +- .../plantuml/baraye/EntityImp.java | 19 ++- .../sourceforge/plantuml/board/Activity.java | 2 +- .../plantuml/board/BoardDiagram.java | 14 +- .../plantuml/board/BoardDiagramFactory.java | 1 + .../sourceforge/plantuml/board/CardBox.java | 14 +- .../plantuml/board/CommandBoardPlus.java | 8 +- .../sourceforge/plantuml/bpm/BpmDiagram.java | 1 + .../sourceforge/plantuml/bpm/BpmElement.java | 18 +- .../plantuml/bpm/CommandDockedEvent.java | 8 +- .../plantuml/bpm/CommandElseBranch.java | 8 +- .../plantuml/bpm/CommandEndBranch.java | 8 +- .../sourceforge/plantuml/bpm/CommandGoto.java | 8 +- .../plantuml/bpm/CommandMerge.java | 8 +- .../plantuml/bpm/CommandNewBranch.java | 8 +- .../plantuml/bpm/CommandResume.java | 8 +- .../plantuml/bpm/ConnectorPuzzleEmpty.java | 10 +- .../sourceforge/plantuml/bpm/GridArray.java | 8 +- .../sourceforge/plantuml/bpm/Placeable.java | 2 +- .../plantuml/braille/BrailleDrawer.java | 8 +- .../plantuml/braille/BrailleGrid.java | 2 +- .../DriverCenteredCharacterBraille.java | 4 +- .../braille/DriverDotPathBraille.java | 6 +- .../plantuml/braille/DriverLineBraille.java | 8 +- .../braille/DriverPolygonBraille.java | 10 +- .../braille/DriverRectangleBraille.java | 8 +- .../plantuml/braille/DriverTextBraille.java | 6 +- .../plantuml/braille/UGraphicBraille.java | 20 +-- .../classdiagram/ClassDiagramFactory.java | 2 +- .../plantuml/classdiagram/FullLayout.java | 2 +- .../plantuml/classdiagram/RowLayout.java | 4 +- .../command/CommandAddMethod.java | 10 +- .../command/CommandAllowMixing.java | 8 +- .../command/CommandCreateClass.java | 28 ++-- .../command/CommandCreateClassMultilines.java | 30 ++-- .../command/CommandCreateElementFull2.java | 24 +-- .../command/CommandDiamondAssociation.java | 8 +- .../command/CommandHideShow2.java | 8 +- .../command/CommandHideShowByGender.java | 10 +- .../command/CommandHideShowByVisibility.java | 8 +- .../command/CommandHideShowSpecificClass.java | 8 +- .../command/CommandLayoutNewLine.java | 8 +- .../command/CommandLinkClass.java | 22 +-- .../command/CommandLinkLollipop.java | 16 +- .../command/CommandNamespaceSeparator.java | 10 +- .../command/CommandRemoveRestore.java | 8 +- .../command/CommandStereotype.java | 12 +- .../classdiagram/command/CommandUrl.java | 16 +- .../code/ArobaseStringCompressor.java | 8 +- .../sourceforge/plantuml/command/Command.java | 2 +- .../command/CommandAffineTransform.java | 8 +- .../command/CommandAssumeTransparent.java | 8 +- .../plantuml/command/CommandCaption.java | 12 +- .../plantuml/command/CommandEndPackage.java | 8 +- .../command/CommandFactorySprite.java | 10 +- .../command/CommandFootboxIgnored.java | 8 +- .../plantuml/command/CommandFooter.java | 16 +- .../plantuml/command/CommandHeader.java | 16 +- .../plantuml/command/CommandLegend.java | 12 +- .../plantuml/command/CommandMainframe.java | 10 +- .../plantuml/command/CommandMinwidth.java | 8 +- .../plantuml/command/CommandMultilines.java | 6 +- .../plantuml/command/CommandMultilines2.java | 10 +- .../plantuml/command/CommandMultilines3.java | 8 +- .../command/CommandMultilinesBracket.java | 8 +- .../command/CommandMultilinesCaption.java | 4 +- .../command/CommandMultilinesFooter.java | 8 +- .../command/CommandMultilinesHeader.java | 8 +- .../command/CommandMultilinesLegend.java | 14 +- .../command/CommandMultilinesTitle.java | 4 +- .../plantuml/command/CommandNamespace.java | 20 +-- .../plantuml/command/CommandNamespace2.java | 20 +-- .../command/CommandNamespaceEmpty.java | 20 +-- .../plantuml/command/CommandNope.java | 8 +- .../plantuml/command/CommandPackage.java | 22 +-- .../plantuml/command/CommandPackageEmpty.java | 14 +- .../plantuml/command/CommandPage.java | 8 +- .../plantuml/command/CommandPragma.java | 10 +- .../plantuml/command/CommandRankDir.java | 10 +- .../plantuml/command/CommandRotate.java | 8 +- .../plantuml/command/CommandScale.java | 10 +- .../command/CommandScaleMaxHeight.java | 8 +- .../command/CommandScaleMaxWidth.java | 8 +- .../CommandScaleMaxWidthAndHeight.java | 8 +- .../command/CommandScaleWidthAndHeight.java | 8 +- .../command/CommandScaleWidthOrHeight.java | 8 +- .../plantuml/command/CommandSkinParam.java | 8 +- .../command/CommandSkinParamMultilines.java | 4 +- .../plantuml/command/CommandSpriteFile.java | 8 +- .../plantuml/command/CommandSpriteSvg.java | 8 +- .../command/CommandSpriteSvgMultiline.java | 12 +- .../plantuml/command/CommandTitle.java | 12 +- .../plantuml/command/MultilinesStrategy.java | 2 +- .../command/PSystemAbstractFactory.java | 2 +- .../plantuml/command/PSystemBasicFactory.java | 6 +- .../command/PSystemCommandFactory.java | 6 +- .../command/PSystemSingleLineFactory.java | 2 +- .../plantuml/command/Position.java | 2 +- .../plantuml/command/SingleLineCommand2.java | 11 +- .../plantuml/command/SkinLoader.java | 8 +- .../sourceforge/plantuml/command/Trim.java | 2 +- .../note/CommandConstraintOnLinks.java | 14 +- .../command/note/CommandFactoryNote.java | 14 +- .../note/CommandFactoryNoteActivity.java | 20 +-- .../note/CommandFactoryNoteOnEntity.java | 22 +-- .../note/CommandFactoryNoteOnLink.java | 20 +-- .../note/CommandFactoryTipOnEntity.java | 20 +-- .../FactorySequenceNoteAcrossCommand.java | 20 +-- .../sequence/FactorySequenceNoteCommand.java | 20 +-- .../FactorySequenceNoteOnArrowCommand.java | 22 +-- ...FactorySequenceNoteOverSeveralCommand.java | 20 +-- .../CompositeDiagramFactory.java | 2 +- .../command/CommandCreateBlock.java | 10 +- .../command/CommandCreatePackageBlock.java | 10 +- .../command/CommandEndPackageBlock.java | 8 +- .../command/CommandLinkBlock.java | 10 +- .../sourceforge/plantuml/core/UmlSource.java | 10 +- .../plantuml/creole/CreoleHorizontalLine.java | 10 +- .../sourceforge/plantuml/creole/Fission.java | 2 +- .../sourceforge/plantuml/creole/Neutron.java | 2 +- .../sourceforge/plantuml/creole/Position.java | 8 +- src/net/sourceforge/plantuml/creole/Sea.java | 4 +- .../sourceforge/plantuml/creole/Sheet.java | 2 +- .../plantuml/creole/SheetBlock1.java | 12 +- .../plantuml/creole/SheetBlock2.java | 8 +- .../sourceforge/plantuml/creole/Stencil.java | 2 +- .../plantuml/creole/StripeStyle.java | 2 +- .../sourceforge/plantuml/creole/UCreole.java | 2 +- .../plantuml/creole/atom/Atom.java | 4 +- .../plantuml/creole/atom/AtomEmoji.java | 4 +- .../creole/atom/AtomHorizontalTexts.java | 4 +- .../plantuml/creole/atom/AtomImg.java | 10 +- .../plantuml/creole/atom/AtomImgSvg.java | 2 +- .../plantuml/creole/atom/AtomMath.java | 10 +- .../plantuml/creole/atom/AtomOpenIcon.java | 8 +- .../plantuml/creole/atom/AtomSpace.java | 2 +- .../plantuml/creole/atom/AtomSprite.java | 8 +- .../plantuml/creole/atom/AtomTable.java | 14 +- .../plantuml/creole/atom/AtomTree.java | 6 +- .../creole/atom/AtomVerticalTexts.java | 4 +- .../plantuml/creole/atom/AtomWithMargin.java | 4 +- .../plantuml/creole/atom/Bullet.java | 12 +- .../creole/command/CommandCreoleCache.java | 4 +- .../CommandCreoleColorAndSizeChange.java | 16 +- .../command/CommandCreoleColorChange.java | 16 +- .../creole/command/CommandCreoleEmoji.java | 6 +- .../command/CommandCreoleExposantChange.java | 4 +- .../CommandCreoleFontFamilyChange.java | 8 +- .../creole/command/CommandCreoleImg.java | 6 +- .../creole/command/CommandCreoleLatex.java | 6 +- .../creole/command/CommandCreoleMath.java | 6 +- .../command/CommandCreoleMonospaced.java | 8 +- .../creole/command/CommandCreoleOpenIcon.java | 10 +- .../creole/command/CommandCreoleQrcode.java | 6 +- .../command/CommandCreoleSizeChange.java | 8 +- .../creole/command/CommandCreoleSpace.java | 6 +- .../creole/command/CommandCreoleSprite.java | 10 +- .../creole/command/CommandCreoleStyle.java | 6 +- .../CommandCreoleSvgAttributeChange.java | 8 +- .../creole/command/CommandCreoleUrl.java | 12 +- .../plantuml/creole/legacy/AtomText.java | 14 +- .../plantuml/creole/legacy/AtomTextUtils.java | 8 +- .../plantuml/creole/legacy/CreoleParser.java | 12 +- .../legacy/CreoleStripeSimpleParser.java | 12 +- .../plantuml/creole/legacy/PSystemCreole.java | 7 +- .../creole/legacy/PSystemCreoleFactory.java | 1 + .../plantuml/creole/legacy/StripeCode.java | 8 +- .../plantuml/creole/legacy/StripeLatex.java | 4 +- .../plantuml/creole/legacy/StripeSimple.java | 16 +- .../plantuml/creole/legacy/StripeTable.java | 10 +- .../plantuml/creole/legacy/StripeTree.java | 4 +- .../plantuml/cucadiagram/Bodier.java | 4 +- .../plantuml/cucadiagram/BodierJSon.java | 4 +- .../cucadiagram/BodierLikeClassOrObject.java | 6 +- .../plantuml/cucadiagram/BodierMap.java | 2 +- .../plantuml/cucadiagram/BodierSimple.java | 6 +- .../plantuml/cucadiagram/Body3.java | 6 +- .../plantuml/cucadiagram/BodyEnhanced1.java | 8 +- .../plantuml/cucadiagram/BodyEnhanced2.java | 8 +- .../cucadiagram/BodyEnhancedAbstract.java | 8 +- .../plantuml/cucadiagram/BodyFactory.java | 6 +- .../plantuml/cucadiagram/Display.java | 32 ++-- .../cucadiagram/DisplayPositioned.java | 2 +- .../plantuml/cucadiagram/DisplaySection.java | 6 +- .../cucadiagram/EntityGenderUtils.java | 2 +- .../plantuml/cucadiagram/EntityPosition.java | 9 +- .../plantuml/cucadiagram/Link.java | 14 +- .../plantuml/cucadiagram/LinkConstraint.java | 14 +- .../plantuml/cucadiagram/LinkDecor.java | 2 +- .../plantuml/cucadiagram/LinkMiddleDecor.java | 2 +- .../plantuml/cucadiagram/LinkStyle.java | 2 +- .../plantuml/cucadiagram/LinkType.java | 2 +- .../plantuml/cucadiagram/Member.java | 14 +- .../cucadiagram/MethodsOrFieldsArea.java | 12 +- .../plantuml/cucadiagram/Stereostyles.java | 6 +- .../plantuml/cucadiagram/Stereotype.java | 12 +- .../cucadiagram/StereotypeDecoration.java | 26 +-- .../cucadiagram/TextBlockCucaJSon.java | 10 +- .../plantuml/cucadiagram/TextBlockMap.java | 14 +- .../plantuml/cucadiagram/WithLinkType.java | 8 +- .../dot/CucaDiagramSimplifierActivity.java | 2 +- .../dot/CucaDiagramSimplifierState.java | 2 +- .../cucadiagram/dot/CucaDiagramTxtMaker.java | 20 ++- .../cucadiagram/dot/Neighborhood.java | 6 +- .../plantuml/dedication/BlumBlumShub.java | 1 + .../dedication/PSystemDedication.java | 2 +- .../definition/PSystemDefinition.java | 8 +- .../plantuml/descdiagram/BoxedCharacter.java | 12 +- .../descdiagram/CommandCreateDomain.java | 20 +-- .../DescriptionDiagramFactory.java | 4 +- .../EntityImageDesignedDomain.java | 22 +-- .../descdiagram/EntityImageDomain.java | 24 +-- .../descdiagram/EntityImageMachine.java | 22 +-- .../descdiagram/EntityImageRequirement.java | 20 +-- .../descdiagram/command/CommandArchimate.java | 20 +-- .../command/CommandArchimateMultilines.java | 20 +-- .../command/CommandCreateElementFull.java | 28 ++-- .../CommandCreateElementMultilines.java | 22 +-- .../CommandCreateElementParenthesis.java | 28 ++-- .../command/CommandLinkElement.java | 16 +- .../descdiagram/command/CommandNewpage.java | 8 +- .../command/CommandPackageWithUSymbol.java | 24 +-- .../descdiagram/command/CommandTogether.java | 10 +- .../plantuml/descdiagram/command/Labels.java | 8 +- .../descdiagram/command/StringWithArrow.java | 4 +- .../plantuml/ditaa/PSystemDitaa.java | 2 +- .../plantuml/ditaa/PSystemDitaaFactory.java | 46 +++-- .../plantuml/donors/PSystemDonors.java | 8 +- .../donors/PSystemSkinparameterList.java | 5 +- .../PSystemSkinparameterListFactory.java | 1 + src/net/sourceforge/plantuml/ebnf/Brace.java | 6 +- .../plantuml/ebnf/CommandComment.java | 8 +- .../ebnf/CommandCommentMultilines.java | 8 +- .../ebnf/CommandCommentMultilines2.java | 8 +- .../plantuml/ebnf/CommandEBnfSingleLine.java | 14 +- .../plantuml/ebnf/CommandEbnfMultilines.java | 8 +- .../plantuml/ebnf/CommandNoteMultilines.java | 14 +- .../plantuml/ebnf/CornerCurved.java | 4 +- src/net/sourceforge/plantuml/ebnf/ETile.java | 8 +- .../plantuml/ebnf/ETileAlternation.java | 4 +- .../sourceforge/plantuml/ebnf/ETileBox.java | 16 +- .../plantuml/ebnf/ETileConcatenation.java | 4 +- .../sourceforge/plantuml/ebnf/ETileEmpty.java | 2 +- .../plantuml/ebnf/ETileOneOrMore.java | 12 +- .../plantuml/ebnf/ETileOptional.java | 8 +- .../plantuml/ebnf/ETileWithCircles.java | 8 +- .../plantuml/ebnf/ETileZeroOrMore.java | 8 +- .../sourceforge/plantuml/ebnf/EbnfEngine.java | 10 +- .../plantuml/ebnf/EbnfExpression.java | 6 +- .../plantuml/ebnf/PSystemEbnf.java | 4 +- .../sourceforge/plantuml/ebnf/TitleBox.java | 8 +- .../sourceforge/plantuml/eggs/EggUtils.java | 1 + .../plantuml/eggs/GraphicsPath.java | 11 +- .../plantuml/eggs/PSystemAppleTwo.java | 1 + .../plantuml/eggs/PSystemAppleTwoFactory.java | 6 +- .../plantuml/eggs/PSystemCharlie.java | 2 +- .../plantuml/eggs/PSystemColors.java | 26 +-- .../sourceforge/plantuml/eggs/PSystemEgg.java | 1 + .../plantuml/eggs/PSystemEggFactory.java | 1 + .../plantuml/eggs/PSystemPath.java | 2 +- .../plantuml/eggs/PSystemPathFactory.java | 6 +- .../sourceforge/plantuml/eggs/PSystemRIP.java | 1 + .../plantuml/eggs/PSystemRIPFactory.java | 1 + .../plantuml/eggs/SentenceDecoder.java | 1 + .../plantuml/eggs/SentenceProducer.java | 1 + .../plantuml/elk/CucaDiagramFileMakerElk.java | 22 +-- src/net/sourceforge/plantuml/elk/ElkPath.java | 12 +- src/net/sourceforge/plantuml/emoji/Emoji.java | 13 +- .../plantuml/emoji/PSystemListEmoji.java | 5 +- .../emoji/PSystemListEmojiFactory.java | 1 + .../plantuml/emoji/SpriteSvgNanoParser.java | 8 +- .../plantuml/emoji/SvgNanoParser.java | 26 +-- .../plantuml/emoji/UGraphicWithScale.java | 4 +- .../sourceforge/plantuml/eps/EpsGraphics.java | 40 ++++- .../plantuml/eps/EpsGraphicsMacroAndText.java | 6 +- .../plantuml/error/PSystemError.java | 30 ++-- .../plantuml/error/PSystemErrorEmpty.java | 2 +- .../error/PSystemErrorPreprocessor.java | 2 +- .../plantuml/error/PSystemErrorUtils.java | 2 +- .../plantuml/error/PSystemErrorV2.java | 2 +- .../plantuml/flowdiagram/ActivityBox.java | 18 +- .../flowdiagram/CommandLineSimple.java | 10 +- .../plantuml/flowdiagram/CommandLink.java | 10 +- .../plantuml/flowdiagram/FlowDiagram.java | 12 +- .../sourceforge/plantuml/gitlog/GitCurve.java | 6 +- .../plantuml/gitlog/GitDiagram.java | 6 +- .../plantuml/gitlog/GitDiagramFactory.java | 2 +- .../sourceforge/plantuml/gitlog/MagicBox.java | 16 +- .../plantuml/gitlog/SmetanaForGit.java | 6 +- src/net/sourceforge/plantuml/golem/Tile.java | 14 +- .../plantuml/golem/TilesField.java | 8 +- .../plantuml/graphic/AbstractTextBlock.java | 3 +- .../plantuml/graphic/AddStyle.java | 3 +- .../plantuml/graphic/BigFrame.java | 12 +- .../plantuml/graphic/CircledCharacter.java | 7 +- .../plantuml/graphic/ColorAndSizeChange.java | 11 +- .../plantuml/graphic/ColorChange.java | 11 +- .../plantuml/graphic/DisplayUtils.java | 3 +- .../plantuml/graphic/ExposantChange.java | 2 + .../plantuml/graphic/FontChange.java | 2 + .../plantuml/graphic/FontFamilyChange.java | 7 +- .../plantuml/graphic/FontPosition.java | 2 +- .../plantuml/graphic/FontStyle.java | 10 +- .../plantuml/graphic/GraphicStrings.java | 15 +- .../plantuml/graphic/HtmlColorAndStyle.java | 6 +- .../plantuml/graphic/HtmlCommandFactory.java | 10 +- src/net/sourceforge/plantuml/graphic/Img.java | 6 +- .../sourceforge/plantuml/graphic/Line.java | 2 + .../sourceforge/plantuml/graphic/Rainbow.java | 8 +- .../plantuml/graphic/RemoveStyle.java | 2 + .../plantuml/graphic/ResetFont.java | 2 + .../graphic/SimpleTextBlockBordered.java | 7 +- .../plantuml/graphic/SingleLine.java | 9 +- .../plantuml/graphic/SizeChange.java | 7 +- .../plantuml/graphic/Splitter.java | 6 +- .../plantuml/graphic/SvgAttributes.java | 6 +- .../plantuml/graphic/SvgAttributesChange.java | 7 +- .../plantuml/graphic/SymbolContext.java | 6 +- .../sourceforge/plantuml/graphic/Text.java | 2 +- .../plantuml/graphic/TextBlock.java | 5 +- .../plantuml/graphic/TextBlockArrow.java | 8 +- .../plantuml/graphic/TextBlockArrow2.java | 8 +- .../plantuml/graphic/TextBlockBordered.java | 13 +- .../plantuml/graphic/TextBlockEmpty.java | 1 + .../plantuml/graphic/TextBlockGeneric.java | 7 +- .../plantuml/graphic/TextBlockHorizontal.java | 3 +- .../plantuml/graphic/TextBlockLineBefore.java | 5 +- .../plantuml/graphic/TextBlockMarged.java | 3 +- .../plantuml/graphic/TextBlockMinWidth.java | 4 +- .../plantuml/graphic/TextBlockRaw.java | 4 +- .../plantuml/graphic/TextBlockRecentred.java | 7 +- .../plantuml/graphic/TextBlockSimple.java | 9 +- .../plantuml/graphic/TextBlockSprited.java | 3 +- .../plantuml/graphic/TextBlockTitle.java | 9 +- .../plantuml/graphic/TextBlockUtils.java | 18 +- .../plantuml/graphic/TextBlockVertical2.java | 10 +- .../plantuml/graphic/TextBlockWithUrl.java | 5 +- .../plantuml/graphic/TextLink.java | 2 +- .../plantuml/graphic/TileImage.java | 5 +- .../plantuml/graphic/TileImageSvg.java | 1 + .../plantuml/graphic/TileText.java | 8 +- .../plantuml/graphic/UDrawableUtils.java | 2 +- .../plantuml/graphic/UGraphicDelegator.java | 13 +- .../graphic/UGraphicInterceptorUDrawable.java | 4 +- .../sourceforge/plantuml/graphic/USymbol.java | 1 + .../plantuml/graphic/USymbolArtifact.java | 10 +- .../plantuml/graphic/USymbolCard.java | 8 +- .../plantuml/graphic/USymbolCloud.java | 10 +- .../plantuml/graphic/USymbolCollections.java | 6 +- .../plantuml/graphic/USymbolComponent1.java | 8 +- .../plantuml/graphic/USymbolComponent2.java | 8 +- .../plantuml/graphic/USymbolDatabase.java | 8 +- .../plantuml/graphic/USymbolFile.java | 10 +- .../plantuml/graphic/USymbolFolder.java | 12 +- .../plantuml/graphic/USymbolFrame.java | 13 +- .../plantuml/graphic/USymbolHexagon.java | 6 +- .../plantuml/graphic/USymbolLabel.java | 4 +- .../plantuml/graphic/USymbolNode.java | 10 +- .../plantuml/graphic/USymbolPerson.java | 6 +- .../plantuml/graphic/USymbolQueue.java | 8 +- .../plantuml/graphic/USymbolRectangle.java | 8 +- .../graphic/USymbolSimpleAbstract.java | 4 +- .../plantuml/graphic/USymbolStack.java | 10 +- .../plantuml/graphic/USymbolStorage.java | 6 +- .../plantuml/graphic/UnusedSpace.java | 2 +- .../plantuml/graphic/color/Colors.java | 9 +- .../plantuml/help/CommandHelp.java | 9 +- .../plantuml/help/CommandHelpColor.java | 10 +- .../plantuml/help/CommandHelpFont.java | 8 +- .../plantuml/help/CommandHelpKeyword.java | 8 +- .../plantuml/help/CommandHelpSkinparam.java | 8 +- .../plantuml/help/CommandHelpTheme.java | 8 +- .../plantuml/help/CommandHelpType.java | 8 +- src/net/sourceforge/plantuml/help/Help.java | 6 +- .../plantuml/jcckit/PSystemJcckitFactory.java | 24 +-- .../plantuml/jsondiagram/Arrow.java | 6 +- .../plantuml/jsondiagram/JsonCurve.java | 8 +- .../plantuml/jsondiagram/JsonDiagram.java | 12 +- .../jsondiagram/JsonDiagramFactory.java | 2 +- .../plantuml/jsondiagram/SmetanaForJson.java | 6 +- .../plantuml/jsondiagram/StyleExtractor.java | 2 +- .../plantuml/jsondiagram/TextBlockJson.java | 14 +- .../AbstractShadowable.java | 4 +- .../ftile => klimt}/Arrows.java | 3 +- .../plantuml/{posimo => klimt}/DotPath.java | 157 ++++-------------- .../{ugraphic => klimt}/MutableImage.java | 2 +- .../{ugraphic => klimt}/Shadowable.java | 2 +- .../{ugraphic => klimt}/UAntiAliasing.java | 2 +- .../{ugraphic => klimt}/UBackground.java | 4 +- .../plantuml/{ugraphic => klimt}/UChange.java | 4 +- .../plantuml/{ugraphic => klimt}/UClip.java | 2 +- .../{ugraphic => klimt}/UComment.java | 2 +- .../{ugraphic => klimt}/UGroupType.java | 2 +- .../plantuml/{ugraphic => klimt}/UHidden.java | 2 +- .../plantuml/{ugraphic => klimt}/UImage.java | 2 +- .../plantuml/{ugraphic => klimt}/ULine.java | 2 +- .../plantuml/{ugraphic => klimt}/UMotif.java | 10 +- .../plantuml/{ugraphic => klimt}/UParam.java | 4 +- .../{ugraphic => klimt}/UParamNull.java | 6 +- .../plantuml/{ugraphic => klimt}/UPath.java | 8 +- .../{ugraphic => klimt}/UPattern.java | 2 +- .../plantuml/{ugraphic => klimt}/UPixel.java | 2 +- .../{ugraphic => klimt}/UPolygon.java | 5 +- .../{ugraphic => klimt}/URectangle.java | 7 +- .../plantuml/{ugraphic => klimt}/UShape.java | 2 +- .../UShapeIgnorableForCompression.java | 5 +- .../{ugraphic => klimt}/UShapeSized.java | 2 +- .../plantuml/{ugraphic => klimt}/UStroke.java | 2 +- .../plantuml/{ugraphic => klimt}/UText.java | 6 +- .../{ugraphic => klimt}/UTranslate.java | 2 +- .../{graphic => klimt}/color/ColorHSB.java | 2 +- .../color/ColorMapper.java | 2 +- .../{ugraphic => klimt}/color/ColorOrder.java | 2 +- .../{graphic => klimt}/color/ColorParser.java | 9 +- .../{graphic => klimt}/color/ColorType.java | 2 +- .../{ugraphic => klimt}/color/ColorUtils.java | 2 +- .../{ugraphic => klimt}/color/HColor.java | 6 +- .../color/HColorAutomagic.java | 2 +- .../color/HColorGradient.java | 2 +- .../color/HColorMiddle.java | 2 +- .../color/HColorScheme.java | 2 +- .../{ugraphic => klimt}/color/HColorSet.java | 6 +- .../color/HColorSimple.java | 2 +- .../{ugraphic => klimt}/color/HColors.java | 4 +- .../{ugraphic => klimt}/color/HSLColor.java | 2 +- .../color/HUSLColorConverter.java | 2 +- .../color/NoSuchColorException.java | 2 +- .../color/NoSuchColorRuntimeException.java | 2 +- .../comp/CompressionMode.java | 2 +- .../font}/FontConfiguration.java | 17 +- .../plantuml/{ => klimt/font}/FontParam.java | 9 +- .../font}/StringBounder.java | 6 +- .../font}/StringBounderRaw.java | 3 +- .../{ugraphic => klimt/font}/UFont.java | 2 +- .../font}/UFontContext.java | 2 +- .../{ => klimt/geom}/BasicEnsureVisible.java | 2 +- .../{posimo => klimt/geom}/BezierUtils.java | 4 +- .../{svek => klimt/geom}/ClusterPosition.java | 5 +- .../{ => klimt/geom}/EnsureVisible.java | 2 +- .../geom}/HorizontalAlignment.java | 5 +- .../{svek => klimt/geom}/MinFinder.java | 2 +- .../{ugraphic => klimt/geom}/MinMax.java | 9 +- .../geom}/MinMaxMutable.java | 2 +- .../{posimo => klimt/geom}/Moveable.java | 2 +- .../{svek => klimt/geom}/PointAndAngle.java | 2 +- .../{svek => klimt/geom}/PointDirected.java | 2 +- .../{posimo => klimt/geom}/Positionable.java | 2 +- .../geom}/PositionableImpl.java | 2 +- .../geom}/PositionableUtils.java | 2 +- .../{cucadiagram => klimt/geom}/Rankdir.java | 2 +- .../plantuml/{svek => klimt/geom}/Side.java | 2 +- .../{ugraphic => klimt/geom}/USegment.java | 2 +- .../geom}/USegmentType.java | 2 +- .../plantuml/logo/PSystemLogo.java | 6 +- .../plantuml/logo/TinyJavaLogo.java | 4 +- .../plantuml/logo/TurtleGraphicsPane.java | 18 +- .../sourceforge/plantuml/math/AsciiMath.java | 2 +- .../plantuml/math/LatexBuilder.java | 2 +- .../plantuml/math/PSystemLatex.java | 6 +- .../plantuml/math/PSystemMath.java | 6 +- .../plantuml/math/ScientificEquation.java | 2 +- .../plantuml/math/ScientificEquationSafe.java | 2 +- .../plantuml/mda/MDADiagramImpl.java | 2 +- .../sourceforge/plantuml/mindmap/Branch.java | 4 +- .../mindmap/CommandMindMapDirection.java | 8 +- .../mindmap/CommandMindMapOrgmode.java | 14 +- .../CommandMindMapOrgmodeMultiline.java | 16 +- .../plantuml/mindmap/CommandMindMapPlus.java | 14 +- .../plantuml/mindmap/CommandMindMapRoot.java | 8 +- .../sourceforge/plantuml/mindmap/Finger.java | 2 +- .../plantuml/mindmap/FingerImpl.java | 14 +- .../sourceforge/plantuml/mindmap/Idea.java | 2 +- .../sourceforge/plantuml/mindmap/MindMap.java | 8 +- .../plantuml/mindmap/MindMapDiagram.java | 10 +- .../mindmap/SymetricalTeePositioned.java | 4 +- .../plantuml/nwdiag/CommandComment.java | 8 +- .../plantuml/nwdiag/CommandElement.java | 8 +- .../plantuml/nwdiag/CommandEndSomething.java | 8 +- .../plantuml/nwdiag/CommandGroup.java | 8 +- .../plantuml/nwdiag/CommandLink.java | 8 +- .../plantuml/nwdiag/CommandNetwork.java | 8 +- .../plantuml/nwdiag/CommandNwDiagInit.java | 8 +- .../plantuml/nwdiag/CommandProperty.java | 8 +- .../plantuml/nwdiag/NwDiagram.java | 12 +- .../plantuml/nwdiag/VerticalLine.java | 4 +- .../plantuml/nwdiag/core/NServer.java | 8 +- .../plantuml/nwdiag/core/NStackable.java | 2 +- .../plantuml/nwdiag/core/Network.java | 2 +- .../plantuml/nwdiag/core/NwGroup.java | 10 +- .../nwdiag/next/GridTextBlockDecorated.java | 10 +- .../nwdiag/next/GridTextBlockSimple.java | 6 +- .../plantuml/nwdiag/next/NServerDraw.java | 6 +- .../objectdiagram/command/CommandAddData.java | 10 +- .../command/CommandCreateEntityObject.java | 22 +-- .../CommandCreateEntityObjectMultilines.java | 20 +-- .../command/CommandCreateJson.java | 20 +-- .../command/CommandCreateJsonSingleLine.java | 18 +- .../command/CommandCreateMap.java | 24 +-- .../plantuml/openiconic/OpenIcon.java | 4 +- .../openiconic/PSystemOpenIconic.java | 2 +- .../plantuml/openiconic/SvgPath.java | 2 +- .../plantuml/oregon/BasicGame.java | 1 + .../plantuml/picoweb/PicoWebServer.java | 2 +- .../plantuml/png/PngFlashcoder.java | 2 +- src/net/sourceforge/plantuml/png/PngIO.java | 2 +- .../sourceforge/plantuml/png/PngSplitter.java | 2 +- .../sourceforge/plantuml/png/PngTitler.java | 6 +- .../plantuml/posimo/Clusterable.java | 2 + .../plantuml/posimo/GraphvizSolverB.java | 5 +- .../plantuml/posimo/IEntityImageBlock.java | 2 +- .../sourceforge/plantuml/posimo/Label.java | 1 + .../plantuml/posimo/LabelImage.java | 4 +- .../plantuml/posimo/MargedBlock.java | 3 +- src/net/sourceforge/plantuml/posimo/Path.java | 2 + .../plantuml/posimo/PathDrawer.java | 1 + .../sourceforge/plantuml/posimo/Racorder.java | 1 + .../plantuml/posimo/RacorderAbstract.java | 1 + .../posimo/RacorderFollowTangeante.java | 1 + .../posimo/RacorderFollowTangeanteOld.java | 2 + .../plantuml/posimo/RacorderInToCenter.java | 2 + .../plantuml/posimo/RacorderOrthogonal.java | 1 + .../sourceforge/plantuml/preproc/Define.java | 2 +- .../plantuml/preproc/ImportedFiles.java | 10 ++ .../plantuml/preproc/ReadLine.java | 2 +- .../plantuml/preproc/ReadLineList.java | 2 +- .../plantuml/preproc/ReadLineReader.java | 2 +- .../plantuml/preproc/ReadLineSimple.java | 2 +- .../preproc/StartDiagramExtractReader.java | 2 +- .../sourceforge/plantuml/preproc/Stdlib.java | 2 +- src/net/sourceforge/plantuml/preproc/Sub.java | 4 +- .../plantuml/preproc/UncommentReadLine.java | 8 +- .../plantuml/preproc2/Preprocessor.java | 2 +- .../plantuml/preproc2/PreprocessorUtils.java | 2 +- .../preproc2/ReadFilterAddConfig.java | 2 +- .../preproc2/ReadFilterMergeLines.java | 2 +- .../preproc2/ReadFilterQuoteComment.java | 2 +- .../sourceforge/plantuml/project/GArrows.java | 4 +- .../plantuml/project/GanttArrow.java | 10 +- .../plantuml/project/GanttConstraint.java | 4 +- .../plantuml/project/GanttDiagram.java | 16 +- .../plantuml/project/LabelStrategy.java | 2 +- .../project/TimeHeaderParameters.java | 4 +- .../plantuml/project/ToTaskDraw.java | 2 +- .../project/command/CommandColorTask.java | 12 +- .../project/command/CommandFootbox.java | 8 +- .../project/command/CommandGanttArrow.java | 8 +- .../project/command/CommandGanttArrow2.java | 8 +- .../project/command/CommandGroupEnd.java | 8 +- .../project/command/CommandGroupStart.java | 8 +- .../command/CommandHideResourceFootbox.java | 8 +- .../command/CommandHideResourceName.java | 8 +- .../project/command/CommandLabelOnColumn.java | 12 +- .../project/command/CommandLanguage.java | 8 +- .../project/command/CommandNoteBottom.java | 2 +- .../project/command/CommandPrintBetween.java | 8 +- .../project/command/CommandPrintScale.java | 12 +- .../project/command/CommandSeparator.java | 8 +- .../command/CommandWeekNumberStrategy.java | 8 +- .../project/command/NaturalCommand.java | 2 +- .../plantuml/project/core/Task.java | 2 +- .../plantuml/project/core/TaskGroup.java | 2 +- .../plantuml/project/core/TaskImpl.java | 2 +- .../plantuml/project/core/TaskSeparator.java | 2 +- .../project/draw/AbstractTaskDraw.java | 12 +- .../plantuml/project/draw/PathUtils.java | 2 +- .../plantuml/project/draw/RectangleTask.java | 12 +- .../plantuml/project/draw/ResourceDraw.java | 14 +- .../plantuml/project/draw/TaskDraw.java | 4 +- .../project/draw/TaskDrawDiamond.java | 10 +- .../plantuml/project/draw/TaskDrawGroup.java | 10 +- .../project/draw/TaskDrawRegular.java | 10 +- .../project/draw/TaskDrawSeparator.java | 18 +- .../plantuml/project/draw/TimeHeader.java | 20 +-- .../project/draw/TimeHeaderCalendar.java | 2 +- .../project/draw/TimeHeaderDaily.java | 4 +- .../project/draw/TimeHeaderMonthly.java | 2 +- .../project/draw/TimeHeaderQuarterly.java | 2 +- .../project/draw/TimeHeaderSimple.java | 8 +- .../project/draw/TimeHeaderWeekly.java | 2 +- .../project/draw/TimeHeaderYearly.java | 2 +- .../project/lang/CenterBorderColor.java | 4 +- ...lementBeforeOrAfterOrAtTaskStartOrEnd.java | 6 +- .../project/lang/ComplementClose.java | 6 +- .../project/lang/ComplementCompleted.java | 6 +- .../plantuml/project/lang/ComplementDate.java | 10 +- .../project/lang/ComplementDates.java | 10 +- .../project/lang/ComplementDayOfWeek.java | 8 +- .../project/lang/ComplementEmpty.java | 6 +- .../project/lang/ComplementFromTo.java | 6 +- .../project/lang/ComplementInColors.java | 8 +- .../project/lang/ComplementInColors2.java | 8 +- .../lang/ComplementInColorsFromTo.java | 8 +- .../project/lang/ComplementNamed.java | 6 +- .../plantuml/project/lang/ComplementOpen.java | 6 +- .../project/lang/ComplementSeveralDays.java | 8 +- .../plantuml/project/lang/ComplementUrl.java | 14 +- .../project/lang/ComplementWithColorLink.java | 8 +- .../project/lang/PairOfSomething.java | 8 +- .../plantuml/project/lang/Sentence.java | 4 +- .../plantuml/project/lang/SentenceAnd.java | 8 +- .../plantuml/project/lang/SentenceAndAnd.java | 8 +- .../project/lang/SentenceLinksTo.java | 2 +- .../plantuml/project/lang/SentenceSimple.java | 8 +- .../project/lang/SentenceTaskStarts.java | 2 +- .../lang/SentenceTaskStartsWithColor.java | 2 +- .../plantuml/project/lang/Something.java | 4 +- .../plantuml/project/lang/Subject.java | 4 +- .../project/lang/SubjectDayAsDate.java | 12 +- .../project/lang/SubjectDayOfWeek.java | 8 +- .../project/lang/SubjectDaysAsDates.java | 12 +- .../plantuml/project/lang/SubjectLinks.java | 6 +- .../plantuml/project/lang/SubjectProject.java | 6 +- .../project/lang/SubjectResource.java | 8 +- .../project/lang/SubjectSeparator.java | 6 +- .../plantuml/project/lang/SubjectTask.java | 10 +- .../plantuml/project/lang/SubjectToday.java | 8 +- .../plantuml/project/lang/Verb.java | 2 +- .../plantuml/project/lang/Verbs.java | 10 +- .../plantuml/quantization/QColor.java | 2 +- .../plantuml/quantization/QImage.java | 2 +- .../plantuml/quantization/Quantizer.java | 2 +- .../plantuml/{command => }/regex/IRegex.java | 4 +- .../{command => }/regex/Matcher2.java | 2 +- .../{command => }/regex/MatcherIterator.java | 2 +- .../{command => }/regex/MyPattern.java | 2 +- .../{command => }/regex/Pattern2.java | 2 +- .../{command => }/regex/RegexComposed.java | 4 +- .../{command => }/regex/RegexConcat.java | 4 +- .../{command => }/regex/RegexLeaf.java | 8 +- .../{command => }/regex/RegexOptional.java | 4 +- .../plantuml/{command => }/regex/RegexOr.java | 7 +- .../regex/RegexPartialMatch.java | 2 +- .../{command => }/regex/RegexResult.java | 2 +- .../CommandRegexfSingleLine.java | 14 +- .../{regex => regexdiagram}/PSystemRegex.java | 12 +- .../PSystemRegexFactory.java | 2 +- .../{regex => regexdiagram}/ReToken.java | 2 +- .../{regex => regexdiagram}/ReTokenType.java | 2 +- .../RegexExpression.java | 2 +- .../{regex => regexdiagram}/ShuntingYard.java | 2 +- .../plantuml/salt/CommandAnything.java | 8 +- .../plantuml/salt/CommandSalt.java | 8 +- .../plantuml/salt/DataSourceImpl.java | 6 +- .../plantuml/salt/PSystemSalt.java | 14 +- .../plantuml/salt/PSystemSaltFactory.java | 43 +++-- .../plantuml/salt/PSystemSaltFactory2.java | 72 -------- .../{Dictionary.java => SaltDictionary.java} | 14 +- .../salt/element/AbstractElement.java | 10 +- .../salt/element/AbstractElementText.java | 12 +- .../plantuml/salt/element/Element.java | 2 +- .../plantuml/salt/element/ElementBorder.java | 4 +- .../plantuml/salt/element/ElementButton.java | 12 +- .../salt/element/ElementDroplist.java | 18 +- .../plantuml/salt/element/ElementEmpty.java | 2 +- .../plantuml/salt/element/ElementImage.java | 6 +- .../plantuml/salt/element/ElementLine.java | 8 +- .../plantuml/salt/element/ElementMenuBar.java | 10 +- .../salt/element/ElementMenuEntry.java | 14 +- .../salt/element/ElementMenuPopup.java | 12 +- .../plantuml/salt/element/ElementPyramid.java | 12 +- .../salt/element/ElementPyramidScrolled.java | 12 +- .../salt/element/ElementRadioCheckbox.java | 20 +-- .../plantuml/salt/element/ElementTabBar.java | 10 +- .../plantuml/salt/element/ElementText.java | 10 +- .../salt/element/ElementTextField.java | 10 +- .../plantuml/salt/element/ElementTree.java | 6 +- .../salt/element/ElementTreeEntry.java | 4 +- .../plantuml/salt/element/Grid.java | 8 +- .../plantuml/salt/element/Grid2.java | 4 +- .../plantuml/salt/element/Skeleton.java | 6 +- .../plantuml/salt/element/Skeleton2.java | 6 +- .../plantuml/salt/element/WrappedElement.java | 2 +- .../AbstractElementFactoryComplex.java | 8 +- .../salt/factory/ElementFactoryBorder.java | 4 +- .../salt/factory/ElementFactoryButton.java | 4 +- .../factory/ElementFactoryCheckboxOff.java | 4 +- .../factory/ElementFactoryCheckboxOn.java | 4 +- .../salt/factory/ElementFactoryDroplist.java | 4 +- .../salt/factory/ElementFactoryImage.java | 6 +- .../salt/factory/ElementFactoryMenu.java | 6 +- .../salt/factory/ElementFactoryPyramid.java | 4 +- .../salt/factory/ElementFactoryRadioOff.java | 4 +- .../salt/factory/ElementFactoryRadioOn.java | 4 +- .../ElementFactoryRetrieveFromDictonnary.java | 6 +- .../salt/factory/ElementFactoryScroll.java | 4 +- .../salt/factory/ElementFactoryTab.java | 6 +- .../salt/factory/ElementFactoryText.java | 4 +- .../salt/factory/ElementFactoryTextField.java | 4 +- .../salt/factory/ElementFactoryTree.java | 6 +- .../sdot/CucaDiagramFileMakerSmetana.java | 12 +- .../plantuml/sdot/SmetanaPath.java | 16 +- .../sourceforge/plantuml/sdot/YMirror.java | 4 +- .../sourceforge/plantuml/security/SFile.java | 8 + .../sourceforge/plantuml/security/SURL.java | 152 ++++++++++------- .../plantuml/security/SecurityProfile.java | 4 + .../plantuml/security/SecurityUtils.java | 48 +++--- .../SecurityAccessInterceptor.java | 9 +- .../sequencediagram/AbstractEvent.java | 2 +- .../sequencediagram/AbstractMessage.java | 2 +- .../plantuml/sequencediagram/Doll.java | 6 +- .../plantuml/sequencediagram/Event.java | 2 +- .../plantuml/sequencediagram/Grouping.java | 2 +- .../sequencediagram/GroupingLeaf.java | 4 +- .../sequencediagram/GroupingStart.java | 4 +- .../plantuml/sequencediagram/InGroupable.java | 2 +- .../sequencediagram/InGroupableList.java | 2 +- .../plantuml/sequencediagram/LinkAnchor.java | 6 +- .../plantuml/sequencediagram/Note.java | 2 +- .../plantuml/sequencediagram/Participant.java | 6 +- .../sequencediagram/ParticipantEnglober.java | 2 +- .../plantuml/sequencediagram/Reference.java | 4 +- .../sequencediagram/SequenceDiagram.java | 2 +- .../command/CommandActivate.java | 14 +- .../command/CommandActivate2.java | 10 +- .../sequencediagram/command/CommandArrow.java | 24 +-- .../command/CommandAutoNewpage.java | 8 +- .../command/CommandAutoactivate.java | 8 +- .../command/CommandAutonumber.java | 8 +- .../command/CommandAutonumberIncrement.java | 8 +- .../command/CommandAutonumberResume.java | 8 +- .../command/CommandAutonumberStop.java | 8 +- .../command/CommandBoxEnd.java | 8 +- .../command/CommandBoxStart.java | 18 +- .../command/CommandDeactivateShort.java | 8 +- .../sequencediagram/command/CommandDelay.java | 10 +- .../command/CommandDivider.java | 8 +- .../command/CommandExoArrowAny.java | 14 +- .../command/CommandExoArrowLeft.java | 14 +- .../command/CommandExoArrowRight.java | 14 +- .../command/CommandFootbox.java | 8 +- .../command/CommandFootboxOld.java | 8 +- .../command/CommandGrouping.java | 16 +- .../command/CommandHSpace.java | 8 +- .../command/CommandHideUnlinked.java | 8 +- .../command/CommandIgnoreNewpage.java | 8 +- .../command/CommandLinkAnchor.java | 8 +- .../command/CommandNewpage.java | 10 +- .../command/CommandParticipant.java | 26 +-- .../command/CommandParticipantA.java | 12 +- .../command/CommandParticipantA2.java | 10 +- .../command/CommandParticipantA3.java | 10 +- .../command/CommandParticipantA4.java | 10 +- .../command/CommandParticipantMultilines.java | 22 +-- ...CommandReferenceMultilinesOverSeveral.java | 18 +- .../command/CommandReferenceOverSeveral.java | 18 +- .../command/CommandReturn.java | 14 +- .../sequencediagram/command/CommandSkin.java | 8 +- .../sequencediagram/command/CommandUrl.java | 16 +- .../sequencediagram/graphic/Arrow.java | 4 +- .../graphic/ArrowAndNoteBox.java | 2 +- .../graphic/ArrowAndParticipant.java | 4 +- .../graphic/ConstraintSet.java | 2 +- .../sequencediagram/graphic/DrawableSet.java | 12 +- .../graphic/DrawableSetInitializer.java | 2 +- .../graphic/GraphicalDelayText.java | 4 +- .../graphic/GraphicalDivider.java | 4 +- .../graphic/GraphicalElement.java | 2 +- .../graphic/GraphicalElementLiveEvent.java | 2 +- .../graphic/GraphicalHSpace.java | 2 +- .../graphic/GraphicalNewpage.java | 4 +- .../graphic/GraphicalReference.java | 6 +- .../graphic/GroupingGraphicalElement.java | 2 +- .../graphic/GroupingGraphicalElementElse.java | 4 +- .../GroupingGraphicalElementHeader.java | 4 +- .../graphic/GroupingGraphicalElementTail.java | 2 +- .../sequencediagram/graphic/LifeDestroy.java | 4 +- .../sequencediagram/graphic/LifeLine.java | 6 +- .../graphic/LivingParticipantBox.java | 2 +- .../sequencediagram/graphic/MessageArrow.java | 6 +- .../graphic/MessageExoArrow.java | 6 +- .../graphic/MessageSelfArrow.java | 6 +- .../sequencediagram/graphic/NoteBox.java | 6 +- .../sequencediagram/graphic/NotesBoxes.java | 2 +- .../graphic/ParticipantBox.java | 4 +- .../graphic/ParticipantBoxSimple.java | 5 +- .../sequencediagram/graphic/Pushable.java | 2 +- .../graphic/SegmentColored.java | 6 +- .../graphic/SequenceDiagramArea.java | 4 +- .../SequenceDiagramFileMakerPuma2.java | 8 +- .../graphic/SequenceDiagramTxtMaker.java | 4 +- .../graphic/Step1Abstract.java | 2 +- .../sequencediagram/graphic/Step1Message.java | 2 +- .../graphic/Step1MessageExo.java | 2 +- .../sequencediagram/teoz/AbstractTile.java | 2 +- .../sequencediagram/teoz/Blotter.java | 12 +- .../sequencediagram/teoz/CommonTile.java | 2 +- .../teoz/CommunicationExoTile.java | 4 +- .../teoz/CommunicationTile.java | 8 +- .../teoz/CommunicationTileNoteBottom.java | 4 +- ...ommunicationTileNoteBottomTopAbstract.java | 10 +- .../teoz/CommunicationTileNoteLeft.java | 4 +- .../teoz/CommunicationTileNoteRight.java | 4 +- .../teoz/CommunicationTileNoteTop.java | 4 +- .../teoz/CommunicationTileSelf.java | 4 +- .../teoz/CommunicationTileSelfNoteRight.java | 4 +- .../teoz/ComponentAdapter.java | 2 +- .../sequencediagram/teoz/DelayTile.java | 4 +- .../sequencediagram/teoz/DividerTile.java | 4 +- .../plantuml/sequencediagram/teoz/Dolls.java | 2 +- .../sequencediagram/teoz/ElseTile.java | 6 +- .../sequencediagram/teoz/GroupingTile.java | 6 +- .../sequencediagram/teoz/LifeEventTile.java | 2 +- .../sequencediagram/teoz/LiveBoxes.java | 4 +- .../sequencediagram/teoz/LiveBoxesDrawer.java | 4 +- .../sequencediagram/teoz/LivingSpace.java | 8 +- .../sequencediagram/teoz/LivingSpaces.java | 6 +- .../sequencediagram/teoz/MutingLine.java | 2 +- .../sequencediagram/teoz/NoteTile.java | 4 +- .../sequencediagram/teoz/NotesTile.java | 4 +- .../sequencediagram/teoz/PlayingSpace.java | 4 +- .../teoz/PlayingSpaceWithParticipants.java | 10 +- .../sequencediagram/teoz/ReferenceTile.java | 4 +- .../teoz/SequenceDiagramFileMakerTeoz.java | 8 +- .../sequencediagram/teoz/TeozLayer.java | 4 +- .../sequencediagram/teoz/TileArguments.java | 4 +- .../sequencediagram/teoz/TileBuilder.java | 2 +- .../sequencediagram/teoz/TileMarged.java | 2 +- .../sequencediagram/teoz/TileParallel.java | 4 +- .../teoz/UGraphicInterceptorTile.java | 4 +- .../teoz/UGraphicNewpages.java | 6 +- .../plantuml/skin/AbstractComponent.java | 4 +- .../skin/AbstractTextualComponent.java | 14 +- .../plantuml/skin/ActorAwesome.java | 8 +- .../plantuml/skin/ActorHollow.java | 6 +- .../plantuml/skin/ActorStickMan.java | 10 +- .../sourceforge/plantuml/skin/ActorStyle.java | 18 +- .../plantuml/skin/ArrowComponent.java | 2 +- .../plantuml/skin/ArrowConfiguration.java | 4 +- .../plantuml/skin/CircleInterface.java | 8 +- .../sourceforge/plantuml/skin/Component.java | 2 +- src/net/sourceforge/plantuml/skin/Padder.java | 10 +- .../plantuml/skin/VisibilityModifier.java | 12 +- .../skin/rose/AbstractComponentRoseArrow.java | 8 +- .../skin/rose/ComponentRoseActiveLine.java | 10 +- .../skin/rose/ComponentRoseActor.java | 6 +- .../skin/rose/ComponentRoseArrow.java | 14 +- .../skin/rose/ComponentRoseBoundary.java | 6 +- .../skin/rose/ComponentRoseControl.java | 6 +- .../skin/rose/ComponentRoseDatabase.java | 10 +- .../skin/rose/ComponentRoseDelayLine.java | 10 +- .../skin/rose/ComponentRoseDelayText.java | 6 +- .../skin/rose/ComponentRoseDestroy.java | 12 +- .../skin/rose/ComponentRoseDivider.java | 14 +- .../skin/rose/ComponentRoseEnglober.java | 8 +- .../skin/rose/ComponentRoseEntity.java | 6 +- .../skin/rose/ComponentRoseGroupingElse.java | 20 +-- .../rose/ComponentRoseGroupingHeader.java | 20 +-- .../skin/rose/ComponentRoseGroupingSpace.java | 2 +- .../plantuml/skin/rose/ComponentRoseLine.java | 12 +- .../skin/rose/ComponentRoseNewpage.java | 6 +- .../plantuml/skin/rose/ComponentRoseNote.java | 12 +- .../skin/rose/ComponentRoseNoteBox.java | 10 +- .../skin/rose/ComponentRoseNoteHexagonal.java | 10 +- .../skin/rose/ComponentRoseParticipant.java | 14 +- .../skin/rose/ComponentRoseQueue.java | 8 +- .../skin/rose/ComponentRoseReference.java | 18 +- .../skin/rose/ComponentRoseSelfArrow.java | 12 +- .../sourceforge/plantuml/skin/rose/Rose.java | 6 +- .../plantuml/sprite/ColorPalette.java | 6 +- .../plantuml/sprite/ColorPalette4096.java | 6 +- .../plantuml/sprite/CommandListSprite.java | 8 +- .../plantuml/sprite/CommandStdlib.java | 8 +- .../plantuml/sprite/ListSpriteDiagram.java | 13 +- .../sprite/ListSpriteDiagramFactory.java | 1 + .../sourceforge/plantuml/sprite/Sprite.java | 2 +- .../plantuml/sprite/SpriteColor.java | 12 +- .../{ => sprite}/SpriteContainer.java | 5 +- .../plantuml/sprite/SpriteGrayLevel.java | 2 +- .../plantuml/sprite/SpriteImage.java | 8 +- .../plantuml/sprite/SpriteMonochrome.java | 12 +- .../plantuml/sprite/SpriteSvg.java | 4 +- .../plantuml/sprite/SpriteUtils.java | 2 +- .../plantuml/sprite/StdlibDiagram.java | 16 +- .../statediagram/StateDiagramFactory.java | 4 +- .../statediagram/command/CommandAddField.java | 12 +- .../command/CommandConcurrentState.java | 8 +- .../command/CommandCreatePackage2.java | 26 +-- .../command/CommandCreatePackageState.java | 26 +-- .../command/CommandCreateState.java | 26 +-- .../statediagram/command/CommandEndState.java | 8 +- .../command/CommandHideEmptyDescription.java | 8 +- .../command/CommandLinkState.java | 6 +- .../command/CommandLinkStateCommon.java | 10 +- .../command/CommandLinkStateReverse.java | 6 +- .../plantuml/stats/HtmlConverter.java | 2 +- .../sourceforge/plantuml/stats/TextTable.java | 2 +- .../plantuml/stats/XmlConverter.java | 2 +- .../style/ClockwiseTopRightBottomLeft.java | 2 +- .../plantuml/style/CommandStyleImport.java | 8 +- .../style/CommandStyleMultilinesCSS.java | 6 +- src/net/sourceforge/plantuml/style/Style.java | 18 +- .../plantuml/style/StyleLoader.java | 8 + .../plantuml/style/StyleSignatureBasic.java | 2 +- src/net/sourceforge/plantuml/style/Value.java | 6 +- .../plantuml/style/ValueAbstract.java | 6 +- .../plantuml/style/ValueColor.java | 4 +- .../sourceforge/plantuml/style/ValueImpl.java | 8 +- .../sourceforge/plantuml/style/ValueNull.java | 8 +- .../style/parser/StyleParserLegacy.java | 8 +- .../plantuml/sudoku/GraphicsSudoku.java | 16 +- .../plantuml/sudoku/PSystemSudokuFactory.java | 6 +- .../plantuml/svek/AbstractEntityImage.java | 4 +- .../svek/AbstractExtremityFactory.java | 1 + .../plantuml/svek/Bibliotekon.java | 2 +- .../sourceforge/plantuml/svek/Boundary.java | 8 +- .../plantuml/svek/CircleAndArrow.java | 4 +- .../plantuml/svek/CircleInterface2.java | 6 +- .../sourceforge/plantuml/svek/Cluster.java | 25 +-- .../plantuml/svek/ClusterDecoration.java | 7 +- .../plantuml/svek/ClusterDotString.java | 4 +- .../plantuml/svek/ClusterDotStringKermor.java | 4 +- .../plantuml/svek/ClusterHeader.java | 6 +- .../sourceforge/plantuml/svek/Control.java | 8 +- .../svek/CucaDiagramFileMakerSvek.java | 2 +- ...ucaDiagramFileMakerSvek2InternalImage.java | 10 +- .../plantuml/svek/DecorateEntityImage.java | 10 +- .../plantuml/svek/DecorateEntityImage3.java | 4 +- .../plantuml/svek/DirectionalTextBlock.java | 2 +- .../plantuml/svek/DotStringFactory.java | 6 +- .../plantuml/svek/EntityDomain.java | 6 +- .../plantuml/svek/EntityImageDegenerated.java | 8 +- .../plantuml/svek/EntityImageProtected.java | 6 +- .../plantuml/svek/FrontierCalculator.java | 1 + .../plantuml/svek/GeneralImageBuilder.java | 12 +- .../plantuml/svek/GraphvizCrash.java | 12 +- .../plantuml/svek/GroupPngMakerActivity.java | 6 +- .../plantuml/svek/GroupPngMakerState.java | 12 +- .../plantuml/svek/HeaderLayout.java | 4 +- .../plantuml/svek/IEntityImage.java | 2 +- .../plantuml/svek/InnerActivity.java | 8 +- .../plantuml/svek/InnerStateAutonom.java | 10 +- src/net/sourceforge/plantuml/svek/Kal.java | 14 +- .../plantuml/svek/PackageStyle.java | 12 +- .../plantuml/svek/RoundedContainer.java | 12 +- .../plantuml/svek/RoundedNorth.java | 10 +- .../plantuml/svek/RoundedSouth.java | 10 +- .../sourceforge/plantuml/svek/SvekLine.java | 43 ++--- .../sourceforge/plantuml/svek/SvekNode.java | 9 +- .../sourceforge/plantuml/svek/SvekResult.java | 12 +- .../sourceforge/plantuml/svek/SvgResult.java | 42 +++++ .../plantuml/svek/TextBlockBackcolored.java | 2 +- .../plantuml/svek/UGraphicForSnake.java | 6 +- .../sourceforge/plantuml/svek/WithPorts.java | 2 +- .../plantuml/svek/extremity/Extremity.java | 2 +- .../svek/extremity/ExtremityArrow.java | 10 +- .../extremity/ExtremityArrowAndCircle.java | 10 +- .../svek/extremity/ExtremityCircle.java | 8 +- .../extremity/ExtremityCircleConnect.java | 6 +- .../svek/extremity/ExtremityCircleCross.java | 8 +- .../extremity/ExtremityCircleCrowfoot.java | 4 +- .../svek/extremity/ExtremityCircleLine.java | 6 +- .../svek/extremity/ExtremityCrowfoot.java | 6 +- .../svek/extremity/ExtremityDiamond.java | 6 +- .../svek/extremity/ExtremityDoubleLine.java | 4 +- .../svek/extremity/ExtremityExtends.java | 4 +- .../svek/extremity/ExtremityExtendsLike.java | 12 +- .../svek/extremity/ExtremityFactory.java | 2 +- .../svek/extremity/ExtremityFactoryArrow.java | 2 +- .../ExtremityFactoryArrowAndCircle.java | 4 +- .../extremity/ExtremityFactoryCircle.java | 4 +- .../ExtremityFactoryCircleConnect.java | 4 +- .../ExtremityFactoryCircleCross.java | 4 +- .../ExtremityFactoryCircleCrowfoot.java | 2 +- .../extremity/ExtremityFactoryCircleLine.java | 2 +- .../extremity/ExtremityFactoryCrowfoot.java | 2 +- .../extremity/ExtremityFactoryDiamond.java | 2 +- .../extremity/ExtremityFactoryDoubleLine.java | 2 +- .../extremity/ExtremityFactoryExtends.java | 4 +- .../ExtremityFactoryExtendsLike.java | 4 +- .../extremity/ExtremityFactoryHalfArrow.java | 2 +- .../ExtremityFactoryLineCrowfoot.java | 2 +- .../ExtremityFactoryNotNavigable.java | 2 +- .../ExtremityFactoryParenthesis.java | 2 +- .../svek/extremity/ExtremityFactoryPlus.java | 4 +- .../extremity/ExtremityFactorySquare.java | 4 +- .../extremity/ExtremityFactoryTriangle.java | 4 +- .../svek/extremity/ExtremityHalfArrow.java | 6 +- .../svek/extremity/ExtremityLineCrowfoot.java | 4 +- .../svek/extremity/ExtremityNotNavigable.java | 2 +- .../svek/extremity/ExtremityOther.java | 2 +- .../svek/extremity/ExtremityParenthesis.java | 4 +- .../svek/extremity/ExtremityParenthesis2.java | 2 +- .../svek/extremity/ExtremityPlus.java | 6 +- .../svek/extremity/ExtremitySquare.java | 8 +- .../svek/extremity/ExtremityStateLine1.java | 10 +- .../svek/extremity/ExtremityStateLine2.java | 8 +- .../svek/extremity/ExtremityTriangle.java | 6 +- .../plantuml/svek/extremity/MiddleCircle.java | 6 +- .../svek/extremity/MiddleCircleCircled.java | 8 +- .../svek/extremity/MiddleFactoryCircle.java | 2 +- .../extremity/MiddleFactoryCircleCircled.java | 2 +- .../svek/image/AbstractEntityImageBorder.java | 10 +- .../plantuml/svek/image/ConnectedCircle.java | 4 +- .../svek/image/EntityImageActivity.java | 20 +-- .../svek/image/EntityImageArcCircle.java | 12 +- .../svek/image/EntityImageAssociation.java | 8 +- .../image/EntityImageAssociationPoint.java | 6 +- .../svek/image/EntityImageBranch.java | 10 +- .../svek/image/EntityImageCircleEnd.java | 12 +- .../svek/image/EntityImageCircleStart.java | 8 +- .../plantuml/svek/image/EntityImageClass.java | 22 +-- .../svek/image/EntityImageClassHeader.java | 14 +- .../svek/image/EntityImageDescription.java | 24 +-- .../svek/image/EntityImageEmptyPackage.java | 20 +-- .../plantuml/svek/image/EntityImageGroup.java | 2 +- .../plantuml/svek/image/EntityImageJson.java | 24 +-- .../image/EntityImageLollipopInterface.java | 16 +- .../EntityImageLollipopInterfaceEye1.java | 16 +- .../EntityImageLollipopInterfaceEye2.java | 20 +-- .../plantuml/svek/image/EntityImageMap.java | 26 +-- .../plantuml/svek/image/EntityImageNote.java | 22 +-- .../svek/image/EntityImageNoteLink.java | 4 +- .../svek/image/EntityImageObject.java | 26 +-- .../plantuml/svek/image/EntityImagePort.java | 16 +- .../svek/image/EntityImagePseudoState.java | 14 +- .../plantuml/svek/image/EntityImageState.java | 14 +- .../svek/image/EntityImageState2.java | 6 +- .../svek/image/EntityImageStateBorder.java | 12 +- .../svek/image/EntityImageStateCommon.java | 12 +- .../EntityImageStateEmptyDescription.java | 6 +- .../svek/image/EntityImageSynchroBar.java | 12 +- .../plantuml/svek/image/EntityImageTips.java | 14 +- .../svek/image/EntityImageUseCase.java | 24 +-- .../plantuml/svek/image/Footprint.java | 26 +-- .../plantuml/svek/image/Opale.java | 10 +- .../sourceforge/plantuml/svg/SvgGraphics.java | 14 +- .../plantuml/swing/AboutWindow.java | 2 +- .../plantuml/syntax/LanguageDescriptor.java | 2 +- .../plantuml/syntax/SyntaxChecker.java | 2 +- .../plantuml/{ => text}/BackSlash.java | 4 +- .../{command/regex => text}/FoxSignature.java | 2 +- .../plantuml/{ => text}/Guillemet.java | 2 +- .../sourceforge/plantuml/text/RichText.java | 8 +- .../{utils => text}/StringLocated.java | 8 +- .../plantuml/{ => text}/SvgCharSizeHack.java | 2 +- .../plantuml/{tim => text}/TLineType.java | 2 +- .../plantuml/theme/ThemeUtils.java | 43 +++-- .../plantuml/tikz/TikzGraphics.java | 14 +- src/net/sourceforge/plantuml/tim/Eater.java | 3 +- .../plantuml/tim/EaterAffectation.java | 2 +- .../plantuml/tim/EaterAffectationDefine.java | 2 +- .../sourceforge/plantuml/tim/EaterAssert.java | 2 +- .../plantuml/tim/EaterDeclareProcedure.java | 2 +- .../tim/EaterDeclareReturnFunction.java | 2 +- .../plantuml/tim/EaterDumpMemory.java | 2 +- .../sourceforge/plantuml/tim/EaterElseIf.java | 2 +- .../plantuml/tim/EaterException.java | 2 +- .../plantuml/tim/EaterExceptionLocated.java | 2 +- .../plantuml/tim/EaterForeach.java | 2 +- .../plantuml/tim/EaterFunctionCall.java | 2 +- src/net/sourceforge/plantuml/tim/EaterIf.java | 2 +- .../sourceforge/plantuml/tim/EaterIfdef.java | 2 +- .../sourceforge/plantuml/tim/EaterIfndef.java | 2 +- .../sourceforge/plantuml/tim/EaterImport.java | 2 +- .../plantuml/tim/EaterInclude.java | 2 +- .../plantuml/tim/EaterIncludeDef.java | 2 +- .../plantuml/tim/EaterIncludesub.java | 2 +- .../plantuml/tim/EaterLegacyDefine.java | 2 +- .../plantuml/tim/EaterLegacyDefineLong.java | 2 +- .../sourceforge/plantuml/tim/EaterLog.java | 2 +- .../sourceforge/plantuml/tim/EaterReturn.java | 2 +- .../plantuml/tim/EaterStartsub.java | 2 +- .../sourceforge/plantuml/tim/EaterTheme.java | 10 +- .../sourceforge/plantuml/tim/EaterUndef.java | 2 +- .../sourceforge/plantuml/tim/EaterWhile.java | 2 +- .../plantuml/tim/FunctionsSet.java | 2 +- .../sourceforge/plantuml/tim/TContext.java | 3 +- .../plantuml/tim/TFunctionImpl.java | 3 +- .../sourceforge/plantuml/tim/TimLoader.java | 2 +- .../plantuml/tim/VariableManager.java | 1 + .../plantuml/tim/expression/TokenType.java | 2 +- .../plantuml/tim/iterator/CodeIterator.java | 2 +- .../tim/iterator/CodeIteratorAffectation.java | 4 +- .../tim/iterator/CodeIteratorForeach.java | 4 +- .../plantuml/tim/iterator/CodeIteratorIf.java | 4 +- .../tim/iterator/CodeIteratorImpl.java | 2 +- .../iterator/CodeIteratorInnerComment.java | 2 +- .../iterator/CodeIteratorLegacyDefine.java | 4 +- .../tim/iterator/CodeIteratorLongComment.java | 4 +- .../tim/iterator/CodeIteratorProcedure.java | 4 +- .../iterator/CodeIteratorReturnFunction.java | 4 +- .../iterator/CodeIteratorShortComment.java | 4 +- .../tim/iterator/CodeIteratorSub.java | 4 +- .../tim/iterator/CodeIteratorWhile.java | 4 +- .../plantuml/tim/stdlib/Darken.java | 6 +- .../plantuml/tim/stdlib/Getenv.java | 10 +- .../plantuml/tim/stdlib/HslColor.java | 4 +- .../plantuml/tim/stdlib/IsDark.java | 6 +- .../plantuml/tim/stdlib/IsLight.java | 6 +- .../plantuml/tim/stdlib/Lighten.java | 6 +- .../plantuml/tim/stdlib/ReverseColor.java | 6 +- .../tim/stdlib/ReverseHsluvColor.java | 6 +- .../plantuml/timingdiagram/ChangeState.java | 6 +- .../plantuml/timingdiagram/Highlight.java | 20 +-- .../plantuml/timingdiagram/Player.java | 10 +- .../plantuml/timingdiagram/PlayerAnalog.java | 8 +- .../plantuml/timingdiagram/PlayerBinary.java | 10 +- .../plantuml/timingdiagram/PlayerClock.java | 6 +- .../timingdiagram/PlayerRobustConcise.java | 4 +- .../timingdiagram/TimeConstraint.java | 16 +- .../plantuml/timingdiagram/TimeMessage.java | 6 +- .../plantuml/timingdiagram/TimeProjected.java | 2 +- .../plantuml/timingdiagram/TimingDiagram.java | 12 +- .../plantuml/timingdiagram/TimingNote.java | 12 +- .../plantuml/timingdiagram/TimingRuler.java | 14 +- .../timingdiagram/command/CommandAnalog.java | 10 +- .../command/CommandAtPlayer.java | 8 +- .../timingdiagram/command/CommandAtTime.java | 10 +- .../timingdiagram/command/CommandBinary.java | 10 +- .../command/CommandChangeState.java | 14 +- .../CommandChangeStateByPlayerCode.java | 12 +- .../command/CommandChangeStateByTime.java | 12 +- .../timingdiagram/command/CommandClock.java | 10 +- .../command/CommandConstraint.java | 12 +- .../command/CommandDefineStateLong.java | 8 +- .../command/CommandDefineStateShort.java | 8 +- .../command/CommandHideTimeAxis.java | 8 +- .../command/CommandHighlight.java | 16 +- .../command/CommandModeCompact.java | 8 +- .../timingdiagram/command/CommandNote.java | 8 +- .../command/CommandNoteLong.java | 10 +- .../command/CommandPixelHeight.java | 8 +- .../command/CommandRobustConcise.java | 10 +- .../command/CommandScalePixel.java | 8 +- .../timingdiagram/command/CommandTicks.java | 8 +- .../command/CommandTimeMessage.java | 10 +- .../command/CommandUseDateFormat.java | 8 +- .../command/TimeTickBuilder.java | 12 +- .../timingdiagram/graphic/HexaShape.java | 2 +- .../timingdiagram/graphic/Histogram.java | 16 +- .../graphic/IntricatedPoint.java | 2 +- .../timingdiagram/graphic/PDrawing.java | 2 +- .../timingdiagram/graphic/PentaAShape.java | 4 +- .../timingdiagram/graphic/PentaBShape.java | 4 +- .../timingdiagram/graphic/PlayerFrame.java | 8 +- .../timingdiagram/graphic/Ribbon.java | 16 +- .../timingdiagram/graphic/TimeArrow.java | 16 +- .../ugraphic/AbstractCommonUGraphic.java | 19 ++- .../ugraphic/AbstractPlacementStrategy.java | 2 +- .../plantuml/ugraphic/AbstractUGraphic.java | 11 +- .../AbstractUGraphicHorizontalLine.java | 4 + .../plantuml/ugraphic/ClipContainer.java | 2 + .../CopyForegroundColorToBackgroundColor.java | 2 + .../plantuml/ugraphic/FontChecker.java | 8 +- .../plantuml/ugraphic/ImageBuilder.java | 22 ++- .../plantuml/ugraphic/InflaterSet.java | 69 -------- .../plantuml/ugraphic/LimitFinder.java | 31 +++- .../plantuml/ugraphic/PixelImage.java | 3 +- .../ugraphic/PlacementStrategyVisibility.java | 2 +- .../ugraphic/PlacementStrategyX1X2.java | 2 +- .../ugraphic/PlacementStrategyX1Y2Y3.java | 2 +- .../ugraphic/PlacementStrategyY1Y2.java | 2 +- .../ugraphic/PlacementStrategyY1Y2Center.java | 2 +- .../ugraphic/PlacementStrategyY1Y2Left.java | 2 +- .../ugraphic/PlacementStrategyY1Y2Right.java | 2 +- .../plantuml/ugraphic/TextBlockInEllipse.java | 3 +- .../plantuml/ugraphic/TextLimitFinder.java | 11 +- .../plantuml/ugraphic/UCenteredCharacter.java | 3 + .../plantuml/ugraphic/UDriver.java | 4 +- .../plantuml/ugraphic/UEllipse.java | 2 + .../sourceforge/plantuml/ugraphic/UEmpty.java | 1 + .../plantuml/ugraphic/UFontUser.java | 40 ----- .../plantuml/ugraphic/UGraphic.java | 12 +- .../plantuml/ugraphic/UGraphicFilter.java | 2 + .../plantuml/ugraphic/UGraphicNo.java | 14 +- .../plantuml/ugraphic/UGraphicNull.java | 6 +- .../plantuml/ugraphic/UGraphicStencil.java | 4 +- .../plantuml/ugraphic/UHorizontalLine.java | 7 +- .../plantuml/ugraphic/UImageSvg.java | 1 + .../plantuml/ugraphic/ULayoutGroup.java | 3 +- .../ugraphic/comp/CompressionXorYBuilder.java | 3 +- .../comp/PiecewiseAffineOnXorYBuilder.java | 7 +- .../plantuml/ugraphic/comp/SlotFinder.java | 27 +-- .../plantuml/ugraphic/comp/SlotSet.java | 4 +- .../ugraphic/comp/UGraphicCompressOnXorY.java | 17 +- .../ugraphic/debug/StringBounderDebug.java | 9 +- .../ugraphic/debug/UGraphicDebug.java | 30 ++-- .../eps/DriverCenteredCharacterEps.java | 6 +- .../ugraphic/eps/DriverDotPathEps.java | 8 +- .../ugraphic/eps/DriverEllipseEps.java | 6 +- .../plantuml/ugraphic/eps/DriverImageEps.java | 8 +- .../plantuml/ugraphic/eps/DriverLineEps.java | 8 +- .../plantuml/ugraphic/eps/DriverPathEps.java | 6 +- .../ugraphic/eps/DriverPolygonEps.java | 12 +- .../ugraphic/eps/DriverRectangleEps.java | 12 +- .../plantuml/ugraphic/eps/DriverTextEps.java | 14 +- .../plantuml/ugraphic/eps/UGraphicEps.java | 22 +-- .../g2d/DriverCenteredCharacterG2d.java | 6 +- .../ugraphic/g2d/DriverDotPathG2d.java | 8 +- .../ugraphic/g2d/DriverEllipseG2d.java | 10 +- .../plantuml/ugraphic/g2d/DriverImageG2d.java | 8 +- .../plantuml/ugraphic/g2d/DriverLineG2d.java | 10 +- .../plantuml/ugraphic/g2d/DriverPathG2d.java | 16 +- .../plantuml/ugraphic/g2d/DriverPixelG2d.java | 6 +- .../ugraphic/g2d/DriverPolygonG2d.java | 12 +- .../ugraphic/g2d/DriverRectangleG2d.java | 18 +- .../ugraphic/g2d/DriverTextAsPathG2d.java | 16 +- .../plantuml/ugraphic/g2d/DriverTextG2d.java | 20 +-- .../ugraphic/g2d/ExtendedPathIterator.java | 2 +- .../plantuml/ugraphic/g2d/UGraphicG2d.java | 32 ++-- .../plantuml/ugraphic/hand/HandJiggle.java | 4 +- .../plantuml/ugraphic/hand/UDotPathHand.java | 4 +- .../plantuml/ugraphic/hand/UEllipseHand.java | 4 +- .../ugraphic/hand/UGraphicHandwritten.java | 14 +- .../plantuml/ugraphic/hand/ULineHand.java | 4 +- .../plantuml/ugraphic/hand/UPathHand.java | 6 +- .../plantuml/ugraphic/hand/UPolygonHand.java | 4 +- .../ugraphic/hand/URectangleHand.java | 6 +- .../ugraphic/html5/DriverLineHtml5.java | 8 +- .../ugraphic/html5/DriverRectangleHtml5.java | 12 +- .../ugraphic/html5/UGraphicHtml5.java | 14 +- .../svg/DriverCenteredCharacterSvg.java | 8 +- .../ugraphic/svg/DriverDotPathSvg.java | 6 +- .../ugraphic/svg/DriverEllipseSvg.java | 6 +- .../plantuml/ugraphic/svg/DriverImagePng.java | 8 +- .../ugraphic/svg/DriverImageSvgSvg.java | 4 +- .../plantuml/ugraphic/svg/DriverLineSvg.java | 12 +- .../plantuml/ugraphic/svg/DriverPathSvg.java | 10 +- .../plantuml/ugraphic/svg/DriverPixelSvg.java | 10 +- .../ugraphic/svg/DriverPolygonSvg.java | 8 +- .../ugraphic/svg/DriverRectangleSvg.java | 12 +- .../ugraphic/svg/DriverTextAsPathSvg.java | 8 +- .../plantuml/ugraphic/svg/DriverTextSvg.java | 20 +-- .../plantuml/ugraphic/svg/UGraphicSvg.java | 28 ++-- .../ugraphic/tikz/DriverAtomTextTikz.java | 10 +- .../tikz/DriverCenteredCharacterTikz.java | 6 +- .../tikz/DriverCenteredCharacterTikz2.java | 4 +- .../ugraphic/tikz/DriverDotPathTikz.java | 6 +- .../ugraphic/tikz/DriverEllipseTikz.java | 4 +- .../ugraphic/tikz/DriverImageTikz.java | 6 +- .../ugraphic/tikz/DriverLineTikz.java | 6 +- .../ugraphic/tikz/DriverPathTikz.java | 10 +- .../ugraphic/tikz/DriverPolygonTikz.java | 10 +- .../ugraphic/tikz/DriverRectangleTikz.java | 10 +- .../ugraphic/tikz/DriverTextTikz.java | 12 +- .../plantuml/ugraphic/tikz/UGraphicTikz.java | 22 +-- .../plantuml/ugraphic/txt/UGraphicTxt.java | 10 +- .../ugraphic/visio/DriverDotPathVdx.java | 6 +- .../ugraphic/visio/DriverLineVdx.java | 6 +- .../ugraphic/visio/DriverPathVdx.java | 6 +- .../ugraphic/visio/DriverPolygonVdx.java | 6 +- .../ugraphic/visio/DriverRectangleVdx.java | 6 +- .../ugraphic/visio/DriverTextVdx.java | 14 +- .../plantuml/ugraphic/visio/UGraphicVdx.java | 20 +-- .../ugraphic/visio/VisioGraphics.java | 8 +- .../plantuml/{ => url}/CMapData.java | 4 +- .../dot/DotMaker2.java => url/Check.java} | 4 +- .../sourceforge/plantuml/{ => url}/Url.java | 12 +- .../plantuml/{ => url}/UrlBuilder.java | 14 +- .../plantuml/{ => url}/UrlMode.java | 2 +- .../sourceforge/plantuml/utils/BlocLines.java | 5 +- .../plantuml/utils/LineLocationImpl.java | 4 +- .../sourceforge/plantuml/utils/MTRandom.java | 4 +- .../plantuml/utils/StartUtils.java | 7 +- .../plantuml/version/IteratorCounter2.java | 2 +- .../version/IteratorCounter2Impl.java | 2 +- .../plantuml/version/PSystemKeycheck.java | 4 +- .../plantuml/version/PSystemKeygen.java | 4 +- .../plantuml/version/PSystemLicense.java | 4 +- .../plantuml/version/PSystemVersion.java | 4 + .../sourceforge/plantuml/version/Version.java | 2 + .../plantuml/wbs/CommandWBSItem.java | 14 +- .../plantuml/wbs/CommandWBSItemMultiline.java | 16 +- .../plantuml/wbs/CommandWBSLink.java | 14 +- src/net/sourceforge/plantuml/wbs/Fork.java | 4 +- src/net/sourceforge/plantuml/wbs/ITF.java | 2 +- .../sourceforge/plantuml/wbs/ITFComposed.java | 4 +- src/net/sourceforge/plantuml/wbs/ITFLeaf.java | 4 +- .../sourceforge/plantuml/wbs/WBSDiagram.java | 16 +- src/net/sourceforge/plantuml/wbs/WBSLink.java | 4 +- .../plantuml/wbs/WBSTextBlock.java | 4 +- .../sourceforge/plantuml/wbs/WElement.java | 6 +- src/net/sourceforge/plantuml/wire/Block.java | 19 ++- .../plantuml/wire/CommandComponent.java | 16 +- .../plantuml/wire/CommandGoto.java | 8 +- .../plantuml/wire/CommandMove.java | 8 +- .../plantuml/wire/CommandNewColumn.java | 8 +- .../plantuml/wire/CommandPrint.java | 8 +- .../plantuml/wire/CommandSpot.java | 16 +- .../plantuml/wire/CommandWLink.java | 16 +- src/net/sourceforge/plantuml/wire/Spot.java | 8 +- src/net/sourceforge/plantuml/wire/WBlock.java | 16 +- .../sourceforge/plantuml/wire/WCursor.java | 2 +- .../plantuml/wire/WLinkHorizontal.java | 18 +- .../plantuml/wire/WLinkVertical.java | 16 +- src/net/sourceforge/plantuml/wire/WPrint.java | 16 +- .../plantuml/wire/WireDiagram.java | 8 +- .../xmlsc/ScxmlStateDiagramStandard.java | 2 +- .../plantuml/yaml/YamlDiagramFactory.java | 2 +- .../sourceforge/plantuml/SkinParamTest.java | 9 +- .../sourceforge/plantuml/UrlBuilderTest.java | 4 +- .../plantuml/graphic/color/ColorHSBTest.java | 2 + .../plantuml/test/ImageTestUtils.java | 2 +- .../plantuml/ugraphic/ImageBuilderTest.java | 2 +- 1575 files changed, 6409 insertions(+), 6132 deletions(-) rename src/net/{sourceforge/plantuml => atmp}/ISkinSimple.java (88%) rename src/net/{sourceforge/plantuml/graphic => atmp}/SpecialText.java (88%) rename src/net/sourceforge/plantuml/annotation/{HaxeIgnored.java => Foo.java} (90%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/AbstractShadowable.java (93%) rename src/net/sourceforge/plantuml/{activitydiagram3/ftile => klimt}/Arrows.java (94%) rename src/net/sourceforge/plantuml/{posimo => klimt}/DotPath.java (72%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/MutableImage.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/Shadowable.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UAntiAliasing.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UBackground.java (93%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UChange.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UClip.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UComment.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UGroupType.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UHidden.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UImage.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/ULine.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UMotif.java (95%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UParam.java (93%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UParamNull.java (91%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UPath.java (95%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UPattern.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UPixel.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UPolygon.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/URectangle.java (95%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UShape.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UShapeIgnorableForCompression.java (90%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UShapeSized.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UStroke.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UText.java (93%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/UTranslate.java (98%) rename src/net/sourceforge/plantuml/{graphic => klimt}/color/ColorHSB.java (94%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/ColorMapper.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/ColorOrder.java (97%) rename src/net/sourceforge/plantuml/{graphic => klimt}/color/ColorParser.java (92%) rename src/net/sourceforge/plantuml/{graphic => klimt}/color/ColorType.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/ColorUtils.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColor.java (94%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorAutomagic.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorGradient.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorMiddle.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorScheme.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorSet.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColorSimple.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HColors.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HSLColor.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/HUSLColorConverter.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/NoSuchColorException.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/color/NoSuchColorRuntimeException.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt}/comp/CompressionMode.java (96%) rename src/net/sourceforge/plantuml/{graphic => klimt/font}/FontConfiguration.java (95%) rename src/net/sourceforge/plantuml/{ => klimt/font}/FontParam.java (97%) rename src/net/sourceforge/plantuml/{graphic => klimt/font}/StringBounder.java (89%) rename src/net/sourceforge/plantuml/{graphic => klimt/font}/StringBounderRaw.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/font}/UFont.java (99%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/font}/UFontContext.java (96%) rename src/net/sourceforge/plantuml/{ => klimt/geom}/BasicEnsureVisible.java (97%) rename src/net/sourceforge/plantuml/{posimo => klimt/geom}/BezierUtils.java (98%) rename src/net/sourceforge/plantuml/{svek => klimt/geom}/ClusterPosition.java (97%) rename src/net/sourceforge/plantuml/{ => klimt/geom}/EnsureVisible.java (96%) rename src/net/sourceforge/plantuml/{graphic => klimt/geom}/HorizontalAlignment.java (94%) rename src/net/sourceforge/plantuml/{svek => klimt/geom}/MinFinder.java (97%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/geom}/MinMax.java (93%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/geom}/MinMaxMutable.java (98%) rename src/net/sourceforge/plantuml/{posimo => klimt/geom}/Moveable.java (96%) rename src/net/sourceforge/plantuml/{svek => klimt/geom}/PointAndAngle.java (97%) rename src/net/sourceforge/plantuml/{svek => klimt/geom}/PointDirected.java (97%) rename src/net/sourceforge/plantuml/{posimo => klimt/geom}/Positionable.java (97%) rename src/net/sourceforge/plantuml/{posimo => klimt/geom}/PositionableImpl.java (97%) rename src/net/sourceforge/plantuml/{posimo => klimt/geom}/PositionableUtils.java (98%) rename src/net/sourceforge/plantuml/{cucadiagram => klimt/geom}/Rankdir.java (96%) rename src/net/sourceforge/plantuml/{svek => klimt/geom}/Side.java (96%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/geom}/USegment.java (98%) rename src/net/sourceforge/plantuml/{ugraphic => klimt/geom}/USegmentType.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/IRegex.java (93%) rename src/net/sourceforge/plantuml/{command => }/regex/Matcher2.java (98%) rename src/net/sourceforge/plantuml/{command => }/regex/MatcherIterator.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/MyPattern.java (98%) rename src/net/sourceforge/plantuml/{command => }/regex/Pattern2.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexComposed.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexConcat.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexLeaf.java (96%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexOptional.java (94%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexOr.java (93%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexPartialMatch.java (97%) rename src/net/sourceforge/plantuml/{command => }/regex/RegexResult.java (97%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/CommandRegexfSingleLine.java (85%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/PSystemRegex.java (96%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/PSystemRegexFactory.java (97%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/ReToken.java (97%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/ReTokenType.java (97%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/RegexExpression.java (99%) rename src/net/sourceforge/plantuml/{regex => regexdiagram}/ShuntingYard.java (98%) delete mode 100644 src/net/sourceforge/plantuml/salt/PSystemSaltFactory2.java rename src/net/sourceforge/plantuml/salt/{Dictionary.java => SaltDictionary.java} (90%) rename src/net/sourceforge/plantuml/{ => sprite}/SpriteContainer.java (90%) rename src/net/sourceforge/plantuml/{ => text}/BackSlash.java (97%) rename src/net/sourceforge/plantuml/{command/regex => text}/FoxSignature.java (98%) rename src/net/sourceforge/plantuml/{ => text}/Guillemet.java (98%) rename src/net/sourceforge/plantuml/{utils => text}/StringLocated.java (95%) rename src/net/sourceforge/plantuml/{ => text}/SvgCharSizeHack.java (97%) rename src/net/sourceforge/plantuml/{tim => text}/TLineType.java (99%) delete mode 100644 src/net/sourceforge/plantuml/ugraphic/InflaterSet.java delete mode 100644 src/net/sourceforge/plantuml/ugraphic/UFontUser.java rename src/net/sourceforge/plantuml/{ => url}/CMapData.java (96%) rename src/net/sourceforge/plantuml/{cucadiagram/dot/DotMaker2.java => url/Check.java} (94%) rename src/net/sourceforge/plantuml/{ => url}/Url.java (90%) rename src/net/sourceforge/plantuml/{ => url}/UrlBuilder.java (92%) rename src/net/sourceforge/plantuml/{ => url}/UrlMode.java (97%) diff --git a/src/com/plantuml/wasm/RunInit.java b/src/com/plantuml/wasm/RunInit.java index 0d5dbe7d2..ef0ff618d 100644 --- a/src/com/plantuml/wasm/RunInit.java +++ b/src/com/plantuml/wasm/RunInit.java @@ -41,12 +41,12 @@ import net.sourceforge.plantuml.version.Version; public class RunInit { - public static String pathStdlib; + public static String cheerpjPath; public static void main(String[] argsArray) throws IOException { - pathStdlib = argsArray[0]; + cheerpjPath = argsArray[0]; System.err.println("RunInit: " + Version.versionString()); - System.err.println("Internal path for stblib: " + pathStdlib); + System.err.println("cheerpjPath is " + cheerpjPath); } } diff --git a/src/jcckit/util/ConfigParameters.java b/src/jcckit/util/ConfigParameters.java index a1c6b2593..280dbc6ac 100644 --- a/src/jcckit/util/ConfigParameters.java +++ b/src/jcckit/util/ConfigParameters.java @@ -21,9 +21,9 @@ package jcckit.util; import java.awt.Color; import java.util.StringTokenizer; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; /** diff --git a/src/net/sourceforge/plantuml/ISkinSimple.java b/src/net/atmp/ISkinSimple.java similarity index 88% rename from src/net/sourceforge/plantuml/ISkinSimple.java rename to src/net/atmp/ISkinSimple.java index acdbef138..cc993b226 100644 --- a/src/net/sourceforge/plantuml/ISkinSimple.java +++ b/src/net/atmp/ISkinSimple.java @@ -33,15 +33,16 @@ * * */ -package net.sourceforge.plantuml; +package net.atmp; import java.util.Map; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.SheetBuilder; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.sprite.SpriteContainer; public interface ISkinSimple extends SpriteContainer { diff --git a/src/net/sourceforge/plantuml/graphic/SpecialText.java b/src/net/atmp/SpecialText.java similarity index 88% rename from src/net/sourceforge/plantuml/graphic/SpecialText.java rename to src/net/atmp/SpecialText.java index 12836b809..fdec75a23 100644 --- a/src/net/sourceforge/plantuml/graphic/SpecialText.java +++ b/src/net/atmp/SpecialText.java @@ -33,14 +33,15 @@ * * */ -package net.sourceforge.plantuml.graphic; +package net.atmp; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UShapeIgnorableForCompression; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShapeIgnorableForCompression; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; public class SpecialText implements UShapeIgnorableForCompression { diff --git a/src/net/sourceforge/plantuml/AbstractPSystem.java b/src/net/sourceforge/plantuml/AbstractPSystem.java index 0de274cab..a3d004b1b 100644 --- a/src/net/sourceforge/plantuml/AbstractPSystem.java +++ b/src/net/sourceforge/plantuml/AbstractPSystem.java @@ -50,13 +50,14 @@ import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.cucadiagram.DisplayPositionned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.stats.StatsUtilsIncrement; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.version.License; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/AlignmentParam.java b/src/net/sourceforge/plantuml/AlignmentParam.java index 729e90670..9792c5d2a 100644 --- a/src/net/sourceforge/plantuml/AlignmentParam.java +++ b/src/net/sourceforge/plantuml/AlignmentParam.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public enum AlignmentParam { diff --git a/src/net/sourceforge/plantuml/AnnotatedBuilder.java b/src/net/sourceforge/plantuml/AnnotatedBuilder.java index 300df872c..81500e10d 100644 --- a/src/net/sourceforge/plantuml/AnnotatedBuilder.java +++ b/src/net/sourceforge/plantuml/AnnotatedBuilder.java @@ -42,23 +42,24 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.cucadiagram.DisplaySection; import net.sourceforge.plantuml.graphic.BigFrame; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -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.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.DecorateEntityImage; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class AnnotatedBuilder { diff --git a/src/net/sourceforge/plantuml/AnnotatedWorker.java b/src/net/sourceforge/plantuml/AnnotatedWorker.java index 8a4be381f..5885c11de 100644 --- a/src/net/sourceforge/plantuml/AnnotatedWorker.java +++ b/src/net/sourceforge/plantuml/AnnotatedWorker.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.DecorateEntityImage; import net.sourceforge.plantuml.svek.TextBlockBackcolored; diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java index f07de7c42..c9ee8a8de 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -48,20 +48,22 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.code.AsciiEncoder; import net.sourceforge.plantuml.code.Transcoder; import net.sourceforge.plantuml.code.TranscoderUtil; -import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemErrorPreprocessor; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.preproc.FileWithSuffix; import net.sourceforge.plantuml.preproc2.PreprocessorModeSet; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.TimLoader; import net.sourceforge.plantuml.utils.LineLocationImpl; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.Version; public class BlockUml { diff --git a/src/net/sourceforge/plantuml/BlockUmlBuilder.java b/src/net/sourceforge/plantuml/BlockUmlBuilder.java index c3ca181d2..5ec85908a 100644 --- a/src/net/sourceforge/plantuml/BlockUmlBuilder.java +++ b/src/net/sourceforge/plantuml/BlockUmlBuilder.java @@ -55,8 +55,8 @@ import net.sourceforge.plantuml.preproc.ReadLineReader; import net.sourceforge.plantuml.preproc.UncommentReadLine; import net.sourceforge.plantuml.preproc2.Preprocessor; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; public final class BlockUmlBuilder implements DefinitionsContainer { diff --git a/src/net/sourceforge/plantuml/ColorParam.java b/src/net/sourceforge/plantuml/ColorParam.java index 772a5b630..89931faab 100644 --- a/src/net/sourceforge/plantuml/ColorParam.java +++ b/src/net/sourceforge/plantuml/ColorParam.java @@ -35,12 +35,12 @@ */ 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.HColors; -@HaxeIgnored +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; + + public enum ColorParam { background(HColors.WHITE, true, ColorType.BACK), hyperlink(HColors.BLUE), diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index 7b9a17c98..c1870ffad 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -43,24 +43,25 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.creole.Neutron; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Line; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SImageIO; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.utils.StringLocated; public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { @@ -154,7 +155,7 @@ public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { public XDimension2D calculateDimension(StringBounder stringBounder) { try { - if (stringBounder.getNativeFormat() == FileFormat.SVG) { + if (stringBounder.matchesProperty("SVG")) { final String imageSvg = getImageSvg(); final UImageSvg svg = new UImageSvg(imageSvg, 1); return new XDimension2D(svg.getWidth(), svg.getHeight()); diff --git a/src/net/sourceforge/plantuml/EmptyImageBuilder.java b/src/net/sourceforge/plantuml/EmptyImageBuilder.java index dc1ae5f6f..b007ecb75 100644 --- a/src/net/sourceforge/plantuml/EmptyImageBuilder.java +++ b/src/net/sourceforge/plantuml/EmptyImageBuilder.java @@ -46,11 +46,11 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UAntiAliasing; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.UAntiAliasing; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; import net.sourceforge.plantuml.utils.Log; diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index 762c24264..fca1876d1 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -46,13 +46,14 @@ import java.io.IOException; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.braille.BrailleCharFactory; import net.sourceforge.plantuml.braille.UGraphicBraille; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderRaw; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounderRaw; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.png.MetadataTag; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.svg.SvgGraphics; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.text.SvgCharSizeHack; import net.sourceforge.plantuml.ugraphic.debug.StringBounderDebug; /** @@ -168,8 +169,8 @@ public enum FileFormat { return getJavaDimension(font, text); } - public FileFormat getNativeFormat() { - return FileFormat.this; + public boolean matchesProperty(String propertyName) { + return "SVG".equalsIgnoreCase(propertyName); } }; @@ -185,8 +186,8 @@ public enum FileFormat { return getJavaDimension(font, text); } - public FileFormat getNativeFormat() { - return FileFormat.this; + public boolean matchesProperty(String propertyName) { + return false; } }; @@ -219,8 +220,8 @@ public enum FileFormat { return UGraphicBraille.QUANTA; } - public FileFormat getNativeFormat() { - return FileFormat.this; + public boolean matchesProperty(String propertyName) { + return false; } }; @@ -244,8 +245,8 @@ public enum FileFormat { return w2.withWidth(Math.max(w1.getWidth(), magnify * w2.getWidth() - delta)); } - public FileFormat getNativeFormat() { - return FileFormat.this; + public boolean matchesProperty(String propertyName) { + return false; } }; } @@ -273,13 +274,13 @@ public enum FileFormat { OptionFlags.getInstance().getFileSeparator() + String.format("%03d", cpt) + getFileSuffix()); } - private SFile computeFilename(SFile pngFile, int i) { - if (i == 0) - return pngFile; - - final SFile dir = pngFile.getParentFile(); - return dir.file(computeFilenameInternal(pngFile.getName(), i)); - } +// private SFile computeFilename(SFile pngFile, int i) { +// if (i == 0) +// return pngFile; +// +// final SFile dir = pngFile.getParentFile(); +// return dir.file(computeFilenameInternal(pngFile.getName(), i)); +// } private String changeName(String fileName, String replacement) { String result = fileName.replaceAll("\\.\\w+$", replacement); @@ -289,13 +290,13 @@ public enum FileFormat { return result; } - private String computeFilenameInternal(String name, int i) { - if (i == 0) - return name; - - return name.replaceAll("\\" + getFileSuffix() + "$", - OptionFlags.getInstance().getFileSeparator() + String.format("%03d", i) + getFileSuffix()); - } +// private String computeFilenameInternal(String name, int i) { +// if (i == 0) +// return name; +// +// return name.replaceAll("\\" + getFileSuffix() + "$", +// OptionFlags.getInstance().getFileSeparator() + String.format("%03d", i) + getFileSuffix()); +// } public boolean doesSupportMetadata() { return this == PNG || this == SVG; diff --git a/src/net/sourceforge/plantuml/FileFormatOption.java b/src/net/sourceforge/plantuml/FileFormatOption.java index 0092c1e08..a9e630a21 100644 --- a/src/net/sourceforge/plantuml/FileFormatOption.java +++ b/src/net/sourceforge/plantuml/FileFormatOption.java @@ -39,9 +39,9 @@ import java.awt.geom.AffineTransform; import java.io.Serializable; import java.util.Objects; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.text.SvgCharSizeHack; /** * A FileFormat with some parameters. @@ -67,13 +67,13 @@ public final class FileFormatOption implements Serializable { return scale; } - @HaxeIgnored + public FileFormatOption(FileFormat fileFormat) { this(fileFormat, true, false, null, false, null, TikzFontDistortion.getDefault(), 1.0, null, null, ColorMapper.IDENTITY); } - @HaxeIgnored + public FileFormatOption(FileFormat fileFormat, boolean withMetadata) { this(fileFormat, withMetadata, false, null, false, null, TikzFontDistortion.getDefault(), 1.0, null, null, ColorMapper.IDENTITY); diff --git a/src/net/sourceforge/plantuml/FileGroup.java b/src/net/sourceforge/plantuml/FileGroup.java index 2fb42593f..361c33972 100644 --- a/src/net/sourceforge/plantuml/FileGroup.java +++ b/src/net/sourceforge/plantuml/FileGroup.java @@ -40,9 +40,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class FileGroup { diff --git a/src/net/sourceforge/plantuml/FileSystem.java b/src/net/sourceforge/plantuml/FileSystem.java index cba4edd25..725c4fbd7 100644 --- a/src/net/sourceforge/plantuml/FileSystem.java +++ b/src/net/sourceforge/plantuml/FileSystem.java @@ -65,14 +65,21 @@ public class FileSystem { } public SFile getCurrentDir() { + // ::comment when WASM final String path = this.currentDir.get(); - if (path != null) { + if (path != null) return new SFile(path); - } + // ::done + return null; } public SFile getFile(String nameOrPath) throws IOException { + // ::uncomment when WASM + // return null; + // ::done + + // ::comment when WASM if (isAbsolute(nameOrPath)) { final SFile result = new SFile(nameOrPath); Log.info("Trying " + result.getAbsolutePath()); @@ -107,12 +114,15 @@ public class FileSystem { } assert filecurrent != null; return filecurrent; + // ::done } + // ::comment when WASM private boolean isAbsolute(String nameOrPath) { final SFile f = new SFile(nameOrPath); return f.isAbsolute(); } + // ::done public void reset() { setCurrentDir(new SFile(".")); diff --git a/src/net/sourceforge/plantuml/ISkinParam.java b/src/net/sourceforge/plantuml/ISkinParam.java index ed7bd915e..0166baa8b 100644 --- a/src/net/sourceforge/plantuml/ISkinParam.java +++ b/src/net/sourceforge/plantuml/ISkinParam.java @@ -37,12 +37,18 @@ package net.sourceforge.plantuml; import java.util.Collection; -import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; -import net.sourceforge.plantuml.cucadiagram.Rankdir; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.skin.ArrowDirection; import net.sourceforge.plantuml.skin.Padder; @@ -52,10 +58,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svg.LengthAdjust; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.Guillemet; public interface ISkinParam extends ISkinSimple { diff --git a/src/net/sourceforge/plantuml/LineConfigurable.java b/src/net/sourceforge/plantuml/LineConfigurable.java index 55295effd..25e8a3f58 100644 --- a/src/net/sourceforge/plantuml/LineConfigurable.java +++ b/src/net/sourceforge/plantuml/LineConfigurable.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; public interface LineConfigurable { diff --git a/src/net/sourceforge/plantuml/NewpagedDiagram.java b/src/net/sourceforge/plantuml/NewpagedDiagram.java index c4f9825bb..fb6f578b9 100644 --- a/src/net/sourceforge/plantuml/NewpagedDiagram.java +++ b/src/net/sourceforge/plantuml/NewpagedDiagram.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class NewpagedDiagram extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index b89ad3e06..28abb71a9 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -46,19 +46,19 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.api.ApiWarning; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.preproc.Defines; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.stats.StatsUtils; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class Option { private final List excludes = new ArrayList<>(); @@ -407,6 +407,7 @@ public class Option { // ::done public Stdrpt getStdrpt() { + // ::comment when WASM if (stdrpt == 1) return new StdrptV1(); @@ -416,6 +417,7 @@ public class Option { // Legacy case if (isPipe() || isPipeMap() || isSyntax()) return new StdrptPipe0(); + // ::done return new StdrptNull(); } diff --git a/src/net/sourceforge/plantuml/OptionFlags.java b/src/net/sourceforge/plantuml/OptionFlags.java index a6fba2570..4437ba00e 100644 --- a/src/net/sourceforge/plantuml/OptionFlags.java +++ b/src/net/sourceforge/plantuml/OptionFlags.java @@ -228,6 +228,7 @@ public class OptionFlags { // ::done } + // ::comment when WASM public final void setLogData(SFile logData) { this.logData = logData; logData.delete(); @@ -258,6 +259,7 @@ public class OptionFlags { public final void setEncodesprite(boolean encodesprite) { this.encodesprite = encodesprite; } + // ::done public final boolean isOverwrite() { return overwrite; diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index 1ea4ba3fb..3e69465cd 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -47,7 +47,6 @@ import net.sourceforge.plantuml.api.PSystemFactory; import net.sourceforge.plantuml.board.BoardDiagramFactory; import net.sourceforge.plantuml.bpm.BpmDiagramFactory; import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory; -import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; @@ -85,8 +84,9 @@ import net.sourceforge.plantuml.openiconic.PSystemListOpenIconicFactory; import net.sourceforge.plantuml.openiconic.PSystemOpenIconicFactory; import net.sourceforge.plantuml.oregon.PSystemOregonFactory; import net.sourceforge.plantuml.project.GanttDiagramFactory; -import net.sourceforge.plantuml.regex.PSystemRegexFactory; -import net.sourceforge.plantuml.salt.PSystemSaltFactory2; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regexdiagram.PSystemRegexFactory; +import net.sourceforge.plantuml.salt.PSystemSaltFactory; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory; @@ -96,9 +96,9 @@ import net.sourceforge.plantuml.sprite.StdlibDiagramFactory; import net.sourceforge.plantuml.statediagram.StateDiagramFactory; import net.sourceforge.plantuml.stats.StatsUtilsIncrement; import net.sourceforge.plantuml.sudoku.PSystemSudokuFactory; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.timingdiagram.TimingDiagramFactory; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.License; import net.sourceforge.plantuml.version.PSystemLicenseFactory; import net.sourceforge.plantuml.version.PSystemVersionFactory; @@ -169,64 +169,59 @@ public class PSystemBuilder { factories.add(new DescriptionDiagramFactory()); factories.add(new StateDiagramFactory()); factories.add(new ActivityDiagramFactory3()); - // factories.add(new CompositeDiagramFactory(skinParam)); + + // ::comment when WASM factories.add(new BpmDiagramFactory(DiagramType.BPM)); + // ::done + // factories.add(new PostIdDiagramFactory()); factories.add(new PSystemLicenseFactory()); factories.add(new PSystemVersionFactory()); factories.add(new PSystemDonorsFactory()); + // ::comment when WASM factories.add(new PSystemSkinparameterListFactory()); - // ::comment when WASM factories.add(new PSystemListFontsFactory()); - // ::done factories.add(new PSystemListEmojiFactory()); - // ::comment when WASM factories.add(new PSystemOpenIconicFactory()); factories.add(new PSystemListOpenIconicFactory()); factories.add(new PSystemListInternalSpritesFactory()); // ::done - factories.add(new PSystemSaltFactory2(DiagramType.SALT)); - factories.add(new PSystemSaltFactory2(DiagramType.UML)); + factories.add(new PSystemSaltFactory(DiagramType.UML)); + factories.add(new PSystemSaltFactory(DiagramType.SALT)); // ::comment when WASM factories.add(new PSystemDotFactory(DiagramType.DOT)); factories.add(new PSystemDotFactory(DiagramType.UML)); // ::done - factories.add(new NwDiagramFactory(DiagramType.NW)); factories.add(new NwDiagramFactory(DiagramType.UML)); + factories.add(new NwDiagramFactory(DiagramType.NW)); factories.add(new MindMapDiagramFactory()); factories.add(new WBSDiagramFactory()); // ::comment when WASM - factories.add(new PSystemDitaaFactory(DiagramType.DITAA)); - factories.add(new PSystemDitaaFactory(DiagramType.UML)); + factories.add(new PSystemDitaaFactory()); // ::done if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) { // ::comment when WASM - factories.add(new PSystemJcckitFactory(DiagramType.JCCKIT)); - factories.add(new PSystemJcckitFactory(DiagramType.UML)); + factories.add(new PSystemJcckitFactory()); // ::done // factories.add(new PSystemLogoFactory()); factories.add(new PSystemSudokuFactory()); } // ::comment when WASM factories.add(new PSystemDefinitionFactory()); - // ::done factories.add(new ListSpriteDiagramFactory()); - // ::comment when WASM factories.add(new StdlibDiagramFactory()); factories.add(new PSystemMathFactory(DiagramType.MATH)); factories.add(new PSystemLatexFactory(DiagramType.LATEX)); - // ::done // factories.add(new PSystemStatsFactory()); factories.add(new PSystemCreoleFactory()); factories.add(new PSystemEggFactory()); factories.add(new PSystemAppleTwoFactory()); factories.add(new PSystemRIPFactory()); // factories.add(new PSystemLostFactory()); - // ::comment when WASM if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) factories.add(new PSystemPathFactory()); - // ::done factories.add(new PSystemOregonFactory()); + // ::done factories.add(new PSystemCharlieFactory()); // ::comment when WASM if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) { @@ -237,13 +232,19 @@ public class PSystemBuilder { factories.add(new FlowDiagramFactory()); // factories.add(new PSystemTreeFactory(DiagramType.JUNGLE)); // factories.add(new PSystemCuteFactory(DiagramType.CUTE)); + // ::comment when WASM factories.add(new PSystemDedicationFactory()); + // ::done factories.add(new TimingDiagramFactory()); + // ::comment when WASM factories.add(new HelpFactory()); factories.add(new WireDiagramFactory()); + // ::done factories.add(new JsonDiagramFactory()); factories.add(new GitDiagramFactory()); + // ::comment when WASM factories.add(new BoardDiagramFactory()); + // ::done factories.add(new YamlDiagramFactory()); factories.add(new HclDiagramFactory()); factories.add(new PSystemEbnfFactory()); diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java index 1d3941860..0e20fb43e 100644 --- a/src/net/sourceforge/plantuml/PSystemUtils.java +++ b/src/net/sourceforge/plantuml/PSystemUtils.java @@ -48,11 +48,11 @@ import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.html.CucaDiagramHtmlMaker; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColors; import net.sourceforge.plantuml.utils.Log; public class PSystemUtils { diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java index 817680ef5..836cbba89 100644 --- a/src/net/sourceforge/plantuml/SkinParam.java +++ b/src/net/sourceforge/plantuml/SkinParam.java @@ -53,24 +53,31 @@ import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; -import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsRegular; import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsTriangle; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.SheetBuilder; import net.sourceforge.plantuml.creole.legacy.CreoleParser; import net.sourceforge.plantuml.cucadiagram.LinkStyle; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.skin.ArrowDirection; import net.sourceforge.plantuml.skin.Padder; @@ -86,12 +93,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svg.LengthAdjust; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.utils.BlocLines; public class SkinParam implements ISkinParam { diff --git a/src/net/sourceforge/plantuml/SkinParamBackcolored.java b/src/net/sourceforge/plantuml/SkinParamBackcolored.java index 3eec4a269..8af7d1e2b 100644 --- a/src/net/sourceforge/plantuml/SkinParamBackcolored.java +++ b/src/net/sourceforge/plantuml/SkinParamBackcolored.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml; import java.util.EnumMap; import java.util.Map; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.HColor; -@HaxeIgnored +import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.klimt.color.HColor; + + public class SkinParamBackcolored extends SkinParamDelegator { final private HColor backColorElement; diff --git a/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java b/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java index e22c21f44..29f7ddb25 100644 --- a/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java +++ b/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class SkinParamBackcoloredReference extends SkinParamDelegator { diff --git a/src/net/sourceforge/plantuml/SkinParamColors.java b/src/net/sourceforge/plantuml/SkinParamColors.java index 2f5878e25..73b7d58ff 100644 --- a/src/net/sourceforge/plantuml/SkinParamColors.java +++ b/src/net/sourceforge/plantuml/SkinParamColors.java @@ -36,9 +36,10 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; public class SkinParamColors extends SkinParamDelegator { diff --git a/src/net/sourceforge/plantuml/SkinParamDelegator.java b/src/net/sourceforge/plantuml/SkinParamDelegator.java index 8dc9c281e..0a3e9f315 100644 --- a/src/net/sourceforge/plantuml/SkinParamDelegator.java +++ b/src/net/sourceforge/plantuml/SkinParamDelegator.java @@ -38,15 +38,21 @@ package net.sourceforge.plantuml; import java.util.Collection; import java.util.Map; -import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.SheetBuilder; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.skin.ArrowDirection; import net.sourceforge.plantuml.skin.Padder; @@ -57,11 +63,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svg.LengthAdjust; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.Guillemet; public class SkinParamDelegator implements ISkinParam { diff --git a/src/net/sourceforge/plantuml/SkinParamForceColor.java b/src/net/sourceforge/plantuml/SkinParamForceColor.java index 879e1b561..269f2a0a6 100644 --- a/src/net/sourceforge/plantuml/SkinParamForceColor.java +++ b/src/net/sourceforge/plantuml/SkinParamForceColor.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class SkinParamForceColor extends SkinParamDelegator { diff --git a/src/net/sourceforge/plantuml/SkinParamForecolored.java b/src/net/sourceforge/plantuml/SkinParamForecolored.java index b36b9963c..25bec771f 100644 --- a/src/net/sourceforge/plantuml/SkinParamForecolored.java +++ b/src/net/sourceforge/plantuml/SkinParamForecolored.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class SkinParamForecolored extends SkinParamDelegator { diff --git a/src/net/sourceforge/plantuml/SkinParamUtils.java b/src/net/sourceforge/plantuml/SkinParamUtils.java index bb790c5d6..49b5f38f1 100644 --- a/src/net/sourceforge/plantuml/SkinParamUtils.java +++ b/src/net/sourceforge/plantuml/SkinParamUtils.java @@ -36,9 +36,10 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SkinParamUtils { diff --git a/src/net/sourceforge/plantuml/SourceFileReader.java b/src/net/sourceforge/plantuml/SourceFileReader.java index 08718acd2..6b404567c 100644 --- a/src/net/sourceforge/plantuml/SourceFileReader.java +++ b/src/net/sourceforge/plantuml/SourceFileReader.java @@ -41,12 +41,12 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class SourceFileReader extends SourceFileReaderAbstract implements ISourceFileReader { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index 60d03f851..5f5a6934f 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -47,7 +47,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; @@ -57,7 +57,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class SourceStringReader { final private List blocks; diff --git a/src/net/sourceforge/plantuml/SplitParam.java b/src/net/sourceforge/plantuml/SplitParam.java index 623eeb199..0c9141094 100644 --- a/src/net/sourceforge/plantuml/SplitParam.java +++ b/src/net/sourceforge/plantuml/SplitParam.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml; import java.awt.Color; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSimple; public class SplitParam { diff --git a/src/net/sourceforge/plantuml/SpriteContainerEmpty.java b/src/net/sourceforge/plantuml/SpriteContainerEmpty.java index 644e494ec..5a52289eb 100644 --- a/src/net/sourceforge/plantuml/SpriteContainerEmpty.java +++ b/src/net/sourceforge/plantuml/SpriteContainerEmpty.java @@ -37,16 +37,19 @@ package net.sourceforge.plantuml; import java.util.Map; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.SheetBuilder; import net.sourceforge.plantuml.creole.legacy.CreoleParser; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.sprite.SpriteImage; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.text.Guillemet; public class SpriteContainerEmpty implements SpriteContainer, ISkinSimple { diff --git a/src/net/sourceforge/plantuml/StdrptV1.java b/src/net/sourceforge/plantuml/StdrptV1.java index f067e01f0..83b257aa1 100644 --- a/src/net/sourceforge/plantuml/StdrptV1.java +++ b/src/net/sourceforge/plantuml/StdrptV1.java @@ -45,6 +45,7 @@ import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.utils.Log; public class StdrptV1 implements Stdrpt { + // ::remove file when WASM public void printInfo(final PrintStream output, Diagram sys) { if (sys instanceof PSystemWelcome) { diff --git a/src/net/sourceforge/plantuml/StdrptV2.java b/src/net/sourceforge/plantuml/StdrptV2.java index e10168074..cd62d7607 100644 --- a/src/net/sourceforge/plantuml/StdrptV2.java +++ b/src/net/sourceforge/plantuml/StdrptV2.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.eggs.PSystemWelcome; import net.sourceforge.plantuml.error.PSystemError; public class StdrptV2 implements Stdrpt { + // ::remove file when WASM public void finalMessage() { } diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java index 598b2ce04..365d96a1b 100644 --- a/src/net/sourceforge/plantuml/StringUtils.java +++ b/src/net/sourceforge/plantuml/StringUtils.java @@ -43,10 +43,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.asciiart.Wcwidth; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.Log; diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index 038e0d6b0..39a037be2 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -49,8 +49,12 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.cucadiagram.DisplayPositionned; import net.sourceforge.plantuml.cucadiagram.DisplaySection; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorOrder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; @@ -60,10 +64,6 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleLoader; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.ColorOrder; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class TitledDiagram extends AbstractPSystem implements Diagram, Annotated { diff --git a/src/net/sourceforge/plantuml/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java index dd7eb0b94..9c2ab02bb 100644 --- a/src/net/sourceforge/plantuml/UmlDiagram.java +++ b/src/net/sourceforge/plantuml/UmlDiagram.java @@ -65,6 +65,9 @@ import net.sourceforge.plantuml.fun.IconLoader; import net.sourceforge.plantuml.graphic.GraphicPosition; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontParam; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.mjpeg.MJPEGGenerator; import net.sourceforge.plantuml.pdf.PdfConverter; @@ -78,8 +81,6 @@ import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; @@ -200,6 +201,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot plainImageBuilder(drawable, fileFormat).metadata(metadata).seed(seed).write(os); } + // ::comment when WASM private static void exportDiagramErrorText(OutputStream os, Throwable exception, List strings) { final PrintWriter pw = SecurityUtils.createPrintWriter(os); exception.printStackTrace(pw); @@ -211,6 +213,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot } pw.flush(); } + // ::done public String getFlashData() { final UmlSource source = getSource(); diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java index 6e25e5bf9..5ad4241b1 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java @@ -42,11 +42,11 @@ import java.util.Map; import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker; import net.sourceforge.plantuml.command.PSystemBasicFactory; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class PSystemXearthFactory extends PSystemBasicFactory { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java index 0eee8df0d..8c9133cf0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java @@ -39,10 +39,10 @@ import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElse extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java index c0c0be637..d303b201f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram.command; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPartition extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java index f5db660e6..c5e4760a8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram.command; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndif extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java index d014901d0..9fabc3a23 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java @@ -41,18 +41,18 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java index 3201acba5..2f75c3d6b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java @@ -39,10 +39,10 @@ import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandInnerConcurrent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java index 2afba240c..4888dc8f4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java @@ -36,22 +36,12 @@ package net.sourceforge.plantuml.activitydiagram.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexPartialMatch; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.LeafType; @@ -61,9 +51,19 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexPartialMatch; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java index bc8cf5e5d..b0167e70e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java @@ -37,11 +37,7 @@ package net.sourceforge.plantuml.activitydiagram.command; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; @@ -50,13 +46,6 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.LeafType; @@ -66,11 +55,22 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.Direction; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandLinkLongActivity extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java index d6dfedce7..239a17695 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java @@ -40,18 +40,18 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPartition extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java b/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java index 971abae39..37acd04a2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java @@ -37,12 +37,13 @@ package net.sourceforge.plantuml.activitydiagram3; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; abstract class AbstractInstruction { + // ::comment when WASM public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { throw new UnsupportedOperationException("" + getClass()); } - + // ::done } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java index f5696df51..dac4e99c8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java @@ -43,7 +43,6 @@ import java.util.Objects; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.UmlDiagramType; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlanes; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -53,17 +52,18 @@ import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockRecentred; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; import net.sourceforge.plantuml.ugraphic.comp.CompressionXorYBuilder; +import net.sourceforge.plantuml.url.Url; public class ActivityDiagram3 extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java index f232bebe9..4d8d1cf5e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java @@ -48,13 +48,14 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.PName; @@ -62,7 +63,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Branch { @@ -78,7 +78,9 @@ public class Branch { private final HColor color; private Ftile ftile; + // ::comment when WASM private Gtile gtile; + // ::done public StyleSignatureBasic getDefaultStyleDefinitionArrow() { return StyleSignatureBasic.of(SName.root, SName.element, SName.activityDiagram, SName.arrow); @@ -130,9 +132,11 @@ public class Branch { this.ftile = factory.decorateOut(list.createFtile(factory), inlinkRendering); } + // ::comment when WASM public void updateGtile(ISkinParam skinParam, StringBounder stringBounder) { this.gtile = list.createGtile(skinParam, stringBounder); } + // ::done public Collection getSwimlanes() { return list.getSwimlanes(); @@ -186,13 +190,17 @@ public class Branch { return ftile; } + // ::comment when WASM public Gtile getGtile() { return gtile; } - + // ::done + public ISkinParam skinParam() { + // ::comment when WASM if (gtile != null) return gtile.skinParam(); + // ::done return ftile.skinParam(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java index db0ea6908..0e659fcd6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java @@ -43,8 +43,8 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; @@ -52,8 +52,10 @@ public interface Instruction extends Swimable { public Ftile createFtile(FtileFactory factory); + // ::comment when WASM public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder); - + // ::done + public CommandExecutionResult add(Instruction other); public boolean kill(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java index 7b29c5b7c..336ffb4ea 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileBreak; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionBreak extends MonoSwimable implements Instruction { @@ -61,10 +61,12 @@ public class InstructionBreak extends MonoSwimable implements Instruction { return new FtileBreak(factory.skinParam(), getSwimlaneIn()); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileBreak(stringBounder, skinParam, getSwimlaneIn()); } + // ::done @Override public CommandExecutionResult add(Instruction other) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java index f8c049b0f..cfe60134a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java @@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; 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.HColors; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionEnd extends MonoSwimable implements Instruction { @@ -57,10 +57,12 @@ public class InstructionEnd extends MonoSwimable implements Instruction { this.inlinkRendering = Objects.requireNonNull(inlinkRendering); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java index 1ca81b92f..358e4f4a9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java @@ -52,9 +52,9 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtiles; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; @@ -98,6 +98,7 @@ public class InstructionFork extends WithNote implements Instruction { return getLastList().add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final List all = new ArrayList<>(); @@ -110,6 +111,7 @@ public class InstructionFork extends WithNote implements Instruction { return new GtileSplit(all, swimlaneIn, getInLinkRenderingColor(skinParam).getColor()); } + // ::done private Rainbow getInLinkRenderingColor(ISkinParam skinParam) { Rainbow color; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java index f110ff7fe..aed6a98df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionGoto extends MonoSwimable implements Instruction { @@ -59,10 +59,12 @@ public class InstructionGoto extends MonoSwimable implements Instruction { return new FtileGoto(factory.skinParam(), getSwimlaneIn(), name); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileEmpty(stringBounder, skinParam); } + // ::done @Override public CommandExecutionResult add(Instruction other) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java index dd10f85af..bfc55a822 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java @@ -47,15 +47,15 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileGroup; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class InstructionGroup extends AbstractInstruction implements Instruction, InstructionCollection { @@ -90,11 +90,13 @@ public class InstructionGroup extends AbstractInstruction implements Instruction return list.add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { Gtile tmp = list.createGtile(skinParam, stringBounder); return new GtileGroup(tmp, title, null, HColors.BLUE, backColor, tmp.skinParam(), type, style); } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java index 0545ce89f..1d3351870 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java @@ -43,7 +43,6 @@ import java.util.Objects; import java.util.Set; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileDecorateWelding; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; @@ -55,12 +54,13 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfAlone; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfHexagon; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class InstructionIf extends WithNote implements Instruction, InstructionCollection { @@ -108,6 +108,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC return current.add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { for (Branch branch : thens) @@ -129,6 +130,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC return new GtileIfAlone(swimlane, gtiles.get(0), branches.get(0)); return GtileIfHexagon.build(swimlane, gtiles, branches); } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java index eba57945b..3cb205750 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionLabel extends MonoSwimable implements Instruction { @@ -59,10 +59,12 @@ public class InstructionLabel extends MonoSwimable implements Instruction { return new FtileLabel(factory.skinParam(), getSwimlaneIn(), name); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileEmpty(stringBounder, skinParam); } + // ::done @Override public CommandExecutionResult add(Instruction other) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java index 30a521a3c..a701a7631 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java @@ -53,9 +53,9 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileAssembly; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; @@ -101,6 +101,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio return CommandExecutionResult.ok(); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { if (all.size() == 0) @@ -118,6 +119,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio } return result; } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java index dbcd310a5..a3453de83 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java @@ -52,12 +52,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileBox; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileRepeat; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class InstructionRepeat extends AbstractInstruction implements Instruction { @@ -127,6 +127,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio return repeatList.add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { @@ -146,6 +147,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio // } return result; } + // ::done public Ftile createFtile(FtileFactory factory) { final Ftile back = getFtileBackward(factory); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java index 7d9fc58c9..42f4c4176 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java @@ -39,7 +39,6 @@ import java.util.Collection; import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; @@ -52,9 +51,10 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileWithNotes; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.url.Url; public class InstructionSimple extends MonoSwimable implements Instruction { @@ -82,6 +82,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { this.colors = Objects.requireNonNull(colors); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { GtileBox result = GtileBox.create(stringBounder, colors.mute(skinParam), label, getSwimlaneIn(), style, @@ -98,6 +99,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { } return result; } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java index 10d18b713..29acd56e3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java @@ -50,8 +50,8 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtiles; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; @@ -89,6 +89,7 @@ public class InstructionSplit extends AbstractInstruction implements Instruction return getLast().add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final List all = new ArrayList<>(); @@ -101,6 +102,7 @@ public class InstructionSplit extends AbstractInstruction implements Instruction return new GtileSplit(all, swimlaneIn, getInLinkRenderingColor(skinParam).getColor()); } + // ::done private Rainbow getInLinkRenderingColor(ISkinParam skinParam) { Rainbow color; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java index be7b6aef7..e20bd114f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.activitydiagram3; import java.util.Objects; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; @@ -46,10 +45,11 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleSpot; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; public class InstructionSpot extends MonoSwimable implements Instruction { @@ -80,13 +80,15 @@ public class InstructionSpot extends MonoSwimable implements Instruction { return result; } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final UFont font = skinParam.getFont(null, false, FontParam.ACTIVITY); return new GtileCircleSpot(stringBounder, skinParam, color, getSwimlaneIn(), spot, font); } - + // ::done + @Override public CommandExecutionResult add(Instruction other) { throw new UnsupportedOperationException(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java index 6dc483af1..6ef867a86 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java @@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; 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.HColors; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionStart extends MonoSwimable implements Instruction { @@ -62,10 +62,12 @@ public class InstructionStart extends MonoSwimable implements Instruction { return false; } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java index 122c01885..83d7f97f6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java @@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; 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.HColors; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class InstructionStop extends MonoSwimable implements Instruction { @@ -62,10 +62,12 @@ public class InstructionStop extends MonoSwimable implements Instruction { return false; } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn()); } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java index 0a4748f74..4dad7d58e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java @@ -50,12 +50,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfHexagon; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class InstructionSwitch extends WithNote implements Instruction, InstructionCollection { @@ -97,6 +97,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct return current.add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { for (Branch branch : switches) @@ -111,6 +112,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct return GtileIfHexagon.build(swimlane, gtiles, switches); } + // ::done public Ftile createFtile(FtileFactory factory) { for (Branch branch : switches) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java index 763e410b4..c86185d18 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java @@ -50,12 +50,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileWhile; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class InstructionWhile extends WithNote implements Instruction, InstructionCollection { @@ -103,6 +103,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi return repeatList.add(ins); } + // ::comment when WASM @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { final Gtile back = null; @@ -110,6 +111,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi tmp = GtileWhile.createWhile(swimlane, tmp, test, yes, specialOut, back); return tmp; } + // ::done @Override public Ftile createFtile(FtileFactory factory) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java b/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java index 1fabb8344..b10469ca2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.activitydiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.sequencediagram.NotePosition; @@ -58,7 +58,7 @@ public class PositionedNote { this.swimlaneNote = swimlaneNote; } - @HaxeIgnored + public PositionedNote(Display note, NotePosition position, NoteType type, Swimlane swimlaneNote) { this(note, position, type, swimlaneNote, null); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java index ae1f421ed..94397fac5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java @@ -38,23 +38,23 @@ package net.sourceforge.plantuml.activitydiagram3.command; import java.util.regex.Matcher; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivity3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java index 5bde329ef..5fbd75e5a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java @@ -39,12 +39,12 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivityLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java index bae1a6d4c..7270d27cc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java @@ -41,14 +41,14 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines3; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandActivityLong3 extends CommandMultilines3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java index ff6790364..2d7893724 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandArrow3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java index f9d9685be..bc3323b93 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java @@ -42,14 +42,14 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandArrowLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java index 87993196b..d0bbbae10 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java @@ -40,16 +40,16 @@ import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandBackward3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java index e7cf488b2..95e31e680 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java @@ -42,11 +42,11 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines3; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandBackwardLong3 extends CommandMultilines3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java index 4cb892b51..5e3ee23c6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandBreak extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java index ad83e054b..89d6efec7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCase extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java index 4410dc6c0..0b27fbb34 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCircleSpot3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java index 1e43c0d44..95d29a78b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java @@ -39,14 +39,14 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElse3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java index b7008375a..96f4d14a5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java @@ -39,17 +39,17 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseIf2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf3.java index 359b9c9a6..e37565474 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf3.java @@ -39,17 +39,17 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseIf3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java index b662aeaea..9944c519d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java @@ -39,11 +39,11 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java index d3fda295e..917bfb3c2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java index 8c14a49fd..c9e9fe855 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPartition3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java index 22ccd5fda..dca82464c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndSwitch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java index b692ad9c0..09e1164dc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndif3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java index 9186c1a9a..d1cb63ed8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandFork3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java index fdf442a34..77cdd036b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandForkAgain3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java index 18344d731..fbf197358 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java @@ -39,11 +39,11 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ForkStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandForkEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java index 8ddf0f09e..997ce77d1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGoto extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java index 6741cb8a0..5eda4cbfb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java index 7fb3bc344..e7ba6fb1d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java @@ -35,21 +35,21 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandIf2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java index 4bdb0a7d8..66e9b69f2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandIf4 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java index 6ddc64c71..769f59db7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandIfLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java index e7cb5c78f..d7fc8d90c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandKill3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java index c13b2eb20..b5e601849 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLabel extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java index 7b6359bea..0159f21aa 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java index 51128eb09..662130053 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNolink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java index a5d06b8d5..6bf0301c1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java @@ -38,17 +38,17 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNote3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java index 77f2b90c2..0960bd834 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java @@ -40,17 +40,17 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index 7ca4d2110..98af08b4d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -40,22 +40,22 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileGroup; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPartition3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java index 33832bb3f..7983e2cb7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java @@ -40,18 +40,18 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRepeat3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java index dc8068d13..59951d979 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java @@ -38,16 +38,16 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRepeatWhile3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java index 173c2ac55..56f9b2d73 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java @@ -43,15 +43,15 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines3; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandRepeatWhile3Multilines extends CommandMultilines3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java index 01212fab9..1071b27f8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplit3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java index 8041a9681..408fa6549 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplitAgain3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java index d8f2c0561..2ba507789 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplitEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java index 05bd6fe23..696345c4e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStart3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java index 73ce6e618..cc4c9f6ab 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStop3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java index 450c8ee99..9145b0f9e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwimlane extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java index 44e127e6b..097ea8824 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwimlane2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java index aa16101cd..e2c4e3cc4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwitch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java index 983cce447..9b9d5822d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWhile3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java index d2412be85..e4fa3b274 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWhileEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java index 214c63b37..02435ce51 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public abstract class AbstractConnection implements Connection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java index 44d00a390..18b3d2fef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java @@ -43,13 +43,13 @@ import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public abstract class AbstractFtile extends AbstractTextBlock implements Ftile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsRegular.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsRegular.java index 401ee9de5..0fac091c8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsRegular.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsRegular.java @@ -35,7 +35,8 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UPolygon; public class ArrowsRegular extends Arrows { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsTriangle.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsTriangle.java index 3306aa5db..d5dc6619d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsTriangle.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ArrowsTriangle.java @@ -35,7 +35,8 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UPolygon; public class ArrowsTriangle extends Arrows { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java index 30c5e1e47..138519764 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.Shadowable; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.USegmentType; -import net.sourceforge.plantuml.ugraphic.UTranslate; // Created from Luc Trudeau original work public enum BoxStyle { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CenteredText.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CenteredText.java index f13181beb..ef10a2b02 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CenteredText.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CenteredText.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.klimt.UShape; public class CenteredText implements UShape { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java index fccd21e7d..795dfb945 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java @@ -40,24 +40,24 @@ import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.awt.geom.XLine2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicNo; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -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.HColors; -@HaxeIgnored + public class CollisionDetector extends UGraphicNo { @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java index 128756568..d39405066 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.klimt.UShape; public interface Connection extends UDrawable, UShape { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java index 2ff9a02ee..d6d5c4452 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public interface ConnectionTranslatable extends Connection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java index 066e5b01e..afd8e90b2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java @@ -40,12 +40,12 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public interface Ftile extends Swimable, TextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java index 61d43232c..3f9530ab8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java @@ -49,12 +49,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileAssemblySimple extends AbstractTextBlock implements Ftile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java index d630c8024..129a000a4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class FtileBreak extends FtileEmpty implements WeldingPoint { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java index 7e3fac1a9..70f0dc3ad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java @@ -41,7 +41,7 @@ import java.util.HashSet; import java.util.Set; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class FtileEmpty extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index df53fc6de..38f9ab536 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -39,7 +39,6 @@ import java.util.Collection; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ForkStyle; import net.sourceforge.plantuml.activitydiagram3.Instruction; @@ -47,12 +46,13 @@ import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.PositionedNote; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public interface FtileFactory { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index 96d706aac..1f785968c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ForkStyle; import net.sourceforge.plantuml.activitydiagram3.Instruction; @@ -49,19 +48,20 @@ import net.sourceforge.plantuml.activitydiagram3.PositionedNote; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.rose.Rose; 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.url.Url; public class FtileFactoryDelegator implements FtileFactory { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java index 011e5de41..107485219 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class FtileGeometry extends XDimension2D { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java index 509e2eaea..41299c0a3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class FtileGoto extends FtileEmpty { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java index 4edfe2a98..ef08228ff 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java @@ -41,9 +41,9 @@ import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileHeightFixedCentered extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedMarged.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedMarged.java index b34a5cb3d..c9625d44a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedMarged.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedMarged.java @@ -40,9 +40,9 @@ import java.util.Collections; import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileHeightFixedMarged extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java index 4a18e9786..8d131904c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import java.util.Collection; import java.util.Set; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class FtileKilled extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java index 4148d6db2..3c6d4bcaf 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java @@ -40,9 +40,9 @@ import java.util.Collections; import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileMarged extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java index 366403361..69d7d3cdd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class FtileMargedRight extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java index 0e57e38b2..75ef78756 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorate; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileMargedVertically extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedWest.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedWest.java index 378835406..b3423495f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedWest.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedWest.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorate; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileMargedWest extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java index ea9d49958..267f85ad8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorate; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileMinWidthCentered extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java index 9d3b5dae9..daefcec74 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import java.util.Objects; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorate; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.url.Url; public class FtileWithUrl extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Genealogy.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Genealogy.java index dd274b8e5..c824e04bf 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Genealogy.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Genealogy.java @@ -39,8 +39,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class Genealogy { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java index 5c539c7f0..826b31d75 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.UGraphicInterceptorGoto; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class GotoInterceptor extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java index 60f0c5143..c07922eef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class Hexagon { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java index a17c8d202..57463c367 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java @@ -38,18 +38,18 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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; public class LaneDivider extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java index 157e3fbb5..578c9bbe2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java @@ -44,20 +44,20 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HtmlColorAndStyle; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.comp.PiecewiseAffineTransform; import net.sourceforge.plantuml.utils.Direction; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java index b877f9606..f875b12d6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java @@ -39,11 +39,11 @@ import java.util.Set; import net.sourceforge.plantuml.SpecificBackcolorable; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.MinMax; public class Swimlane implements SpecificBackcolorable, Comparable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index d52ca3621..a3f2a8dec 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -62,13 +62,20 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -76,14 +83,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; import net.sourceforge.plantuml.svek.UGraphicForSnake; import net.sourceforge.plantuml.ugraphic.LimitFinder; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; import net.sourceforge.plantuml.ugraphic.comp.SlotFinder; import net.sourceforge.plantuml.utils.MathUtils; @@ -192,6 +192,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable final ConnectionCross connectionCross = new ConnectionCross(connection); connectionCross.drawU(getUg()); } + // ::comment when WASM } else if (shape instanceof Gtile) { final Gtile tile = (Gtile) shape; tile.drawU(this); @@ -201,6 +202,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable connection.drawTranslatable(getUg()); // connection.drawU(this); // throw new UnsupportedOperationException(); + // ::done } } @@ -220,10 +222,12 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } public final void drawU(UGraphic ug) { + // ::comment when WASM if (Gtile.USE_GTILE) { drawGtile(ug); return; } + // ::done TextBlock full = root.createFtile(getFtileFactory(ug.getStringBounder())); @@ -238,6 +242,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } } + // ::comment when WASM private void drawGtile(UGraphic ug) { TextBlock full = root.createGtile(skinParam, ug.getStringBounder()); @@ -251,6 +256,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } } + // ::done private TextBlock getTitle(Swimlane swimlane) { final HorizontalAlignment horizontalAlignment = HorizontalAlignment.LEFT; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java index fe898fb30..57c0f9607 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java @@ -39,10 +39,10 @@ import java.util.HashMap; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockInterceptorUDrawable extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java index 6893f966b..59382a293 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java @@ -41,15 +41,15 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.UGraphicDelegator; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.svek.UGraphicForSnake; -import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator { @@ -61,11 +61,14 @@ public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator { } public void draw(UShape shape) { + // :: comment when WASM if (shape instanceof Gtile) { final Gtile gtile = (Gtile) shape; // System.err.println("gtile=" + gtile); gtile.drawU(this); - } else if (shape instanceof Ftile) { + } else + // :: done + if (shape instanceof Ftile) { final Ftile ftile = (Ftile) shape; // System.err.println("ftile=" + ftile); ftile.drawU(this); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java index 4f8c5bec2..83ca6651c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java @@ -46,15 +46,16 @@ import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.LinkStyle; import net.sourceforge.plantuml.graphic.HtmlColorAndStyle; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColor; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; import net.sourceforge.plantuml.utils.Direction; public class Worm implements Iterable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java index b34c06f96..2476172ee 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class WormMutation { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java index 950f3447e..480696b93 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java @@ -40,13 +40,14 @@ import java.util.Iterator; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.HtmlColorAndStyle; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class WormTexted implements Iterable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java index 0aeddfdae..4533b7f18 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class Zad { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java index ec904356a..c545b32da 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java @@ -37,20 +37,19 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicNo; -import net.sourceforge.plantuml.ugraphic.URectangle; -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; -@HaxeIgnored + public class ZadBuilder extends UGraphicNo { @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java index efbf54904..c592f7718 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java @@ -46,10 +46,10 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java index 102ad34a3..b5ad3cab9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java @@ -42,10 +42,10 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ConnectionVerticalDown extends AbstractConnection implements ConnectionTranslatable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java index 0770cb6d6..f5382a1a3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java @@ -46,18 +46,18 @@ import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; public class FloatingNote extends AbstractTextBlock implements Stencil, TextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java index 87d80f2f4..62bde6a44 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileWithUrl; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileBox; +import net.sourceforge.plantuml.url.Url; public class FtileFactoryDelegatorAddUrl extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java index ec26185fb..ea881b69a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java @@ -43,9 +43,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileMargedRight; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class FtileFactoryDelegatorAssembly extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java index 97f96413d..4294a67df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java @@ -44,8 +44,8 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileFactoryDelegatorCreateGroup extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java index 36d3bdb4c..54f1af6d0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; import java.util.List; import net.sourceforge.plantuml.Pragma; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; @@ -46,13 +45,14 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.ConditionalBuilder; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class FtileFactoryDelegatorIf extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java index fe68cbb0f..69eae4634 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java @@ -52,15 +52,15 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileFactoryDelegatorRepeat extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java index cd164f35e..92fbd5e14 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java @@ -56,14 +56,14 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInsi import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileFactoryDelegatorSwitch extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java index 2a72576ea..8f7f78320 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java @@ -51,14 +51,14 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileFactoryDelegatorWhile extends FtileFactoryDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java index 4f928cf71..98cf7f648 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java @@ -47,9 +47,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class FtileForkInner extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java index d31d6c5aa..c06e33760 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java @@ -46,9 +46,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class FtileForkInnerOverlapped extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java index 86698bec6..5dc843e8c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java @@ -48,25 +48,25 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.UGraphicInterceptorUDrawable; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.UGraphicForSnake; import net.sourceforge.plantuml.ugraphic.LimitFinder; -import net.sourceforge.plantuml.ugraphic.MinMax; 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.utils.MathUtils; public class FtileGroup extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java index 91a0be805..e136d6246 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java @@ -63,18 +63,18 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.ConditionStyle; 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; class FtileIfAndStop extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java index f4bed2ee2..9fd6a1299 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java @@ -60,11 +60,11 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInsi import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class FtileIfDown extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java index d0a53cb2a..8269ffd42 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java @@ -62,15 +62,15 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInsi import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; class FtileIfLongHorizontal extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java index 138310650..6c25fb71a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java @@ -60,16 +60,16 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInsi import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; class FtileIfLongVertical extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java index 72d329c3f..f25aef97d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java @@ -39,7 +39,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; @@ -53,10 +52,13 @@ import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -64,8 +66,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileNoteAlone extends AbstractFtile implements Stencil, Styleable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java index 6f9a7cb0f..09797ddb4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java @@ -43,7 +43,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; @@ -63,16 +63,16 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; class FtileRepeat extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java index 9f74e25e6..679b18a98 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java @@ -54,15 +54,15 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInside2; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; class FtileSwitch extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java index 0806510b3..533fb9ad6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java @@ -62,17 +62,17 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondSqua import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; class FtileWhile extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java index 0f66f8637..4486a2f10 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java @@ -56,11 +56,14 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.PName; @@ -70,9 +73,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; import net.sourceforge.plantuml.svek.image.Opale; 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.utils.Direction; public class FtileWithNoteOpale extends AbstractFtile implements Stencil, Styleable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java index 24c2eac1f..43d406376 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java @@ -52,12 +52,15 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -65,9 +68,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.Opale; 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.utils.MathUtils; public class FtileWithNotes extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java index bd6c38cee..918fc3e9f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java @@ -55,11 +55,11 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ParallelBuilderFork extends AbstractParallelFtilesBuilder { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java index 499991712..9ddfa656d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java @@ -53,13 +53,13 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ParallelBuilderMerge extends AbstractParallelFtilesBuilder { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit.java index aacab4dcd..49e8e5536 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit.java @@ -53,13 +53,13 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileThinSplit; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ParallelBuilderSplit extends AbstractParallelFtilesBuilder { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java index 9f07dc148..99d9febd8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public class UGraphicInterceptorGoto extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java index 4d0234d9a..2722ab9be 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java @@ -46,11 +46,11 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GConnection; import net.sourceforge.plantuml.activitydiagram3.gtile.GPoint; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { @@ -73,6 +73,7 @@ public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { tile.drawU(this); // drawGoto(); } + // ::comment when WASM } else if (shape instanceof Gtile) { final Gtile tile = (Gtile) shape; final Set swinlanes = tile.getSwimlanes(); @@ -88,7 +89,7 @@ public class UGraphicInterceptorOneSwimlane extends UGraphicDelegator { if (point0.match(swimlane) && point1.match(swimlane)) connection.drawU(this); - + // ::done } else if (shape instanceof Connection) { final Connection connection = (Connection) shape; final Ftile tile1 = connection.getFtile1(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index 8ac39429c..0fe1b7b6d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -39,9 +39,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ForkStyle; import net.sourceforge.plantuml.activitydiagram3.Instruction; @@ -61,17 +59,19 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorateIn; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorateOut; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; 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.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class VCompactFactory implements FtileFactory { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java index 869f6474b..6e18b358f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileEmpty; @@ -57,18 +56,19 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class ConditionalBuilder { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java index 14ab9e3e3..876e5902f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public abstract class FtileDimensionMemoize extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java index 9d9ad19e9..2e81b5769 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java @@ -45,9 +45,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileIfNude extends FtileDimensionMemoize { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java index ea1bcff79..f9202b425 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java @@ -42,9 +42,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileIfWithDiamonds extends FtileIfNude { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java index 7c1d4f560..2c9f49dbf 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java @@ -53,12 +53,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.UGraphicIntercep import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class FtileIfWithLinks extends FtileIfWithDiamonds { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java index 0917730e5..ac3351973 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java @@ -45,9 +45,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileSwitchNude extends FtileDimensionMemoize { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithDiamonds.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithDiamonds.java index 19f62970e..fedfb2dcd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithDiamonds.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithDiamonds.java @@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileSwitchWithDiamonds extends FtileSwitchNude { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java index 8b89cc8ef..a5666a8e1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java @@ -49,12 +49,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class FtileSwitchWithManyLinks extends FtileSwitchWithDiamonds { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithOneLink.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithOneLink.java index 738c9519c..5af0cddbe 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithOneLink.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithOneLink.java @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class FtileSwitchWithOneLink extends FtileSwitchWithDiamonds { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java index 0544faa89..f5fa1adac 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java @@ -46,17 +46,17 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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; public class FtileBlackBlock extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index 6a840a956..cda59c708 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -56,23 +56,23 @@ import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -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.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColors; public class FtileBox extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java index 72022e838..dbde0f042 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java @@ -56,13 +56,17 @@ import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -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.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -70,10 +74,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UEmpty; 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.HColors; public class FtileBox2 extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java index 75f8d0c4e..045f2497b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java @@ -55,22 +55,22 @@ import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -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.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColors; public class FtileBoxOld extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java index 7876c7f67..69093b9f2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java @@ -44,15 +44,15 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; public class FtileCircleEnd extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java index 9d7643aa8..0bc598291 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java @@ -39,22 +39,22 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -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; public class FtileCircleSpot extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java index a292390b5..798649cfc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java @@ -44,13 +44,13 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; 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.HColors; public class FtileCircleStart extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java index 7926624c9..f24fadae7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java @@ -44,14 +44,14 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; 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.HColors; public class FtileCircleStop extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java index 35f44dc3a..bdc61a3ae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java @@ -48,12 +48,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public abstract class FtileDecorate extends AbstractTextBlock implements Ftile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java index ea799835c..805decd70 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FtileDecorateInLabel extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java index 4e64fe0ce..17d4e6e1c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class FtileDecorateOutLabel extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java index b9b5776c9..117f945d9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class FtileDecoratePointOut extends FtileDecorate { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java index 5a04cdc9a..bd7bea5d4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java @@ -41,12 +41,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileDiamond extends FtileDiamondWIP { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java index d427c1094..8b6371876 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java @@ -41,12 +41,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileDiamondInside extends FtileDiamondWIP { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java index 6de01304b..87a532fcc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java @@ -40,12 +40,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileDiamondInside2 extends FtileDiamondWIP { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java index 2d6a2db29..77d50a70e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java @@ -41,12 +41,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FtileDiamondSquare extends FtileDiamondWIP { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondWIP.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondWIP.java index 04301f61f..98a138fae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondWIP.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondWIP.java @@ -44,12 +44,12 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; -import net.sourceforge.plantuml.ugraphic.color.HColor; abstract class FtileDiamondWIP extends AbstractFtile implements Styleable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java index 07e4fa2ad..e1df792a2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java @@ -44,14 +44,14 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColors; public class FtileThinSplit extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java index b4f10aaa9..2b437622b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java @@ -43,10 +43,10 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public abstract class AbstractGtile extends AbstractGtileRoot implements Gtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtileRoot.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtileRoot.java index 5bee7dfc2..be5a0bd17 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtileRoot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtileRoot.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public abstract class AbstractGtileRoot extends AbstractTextBlock implements Gtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GAbstractConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GAbstractConnection.java index 0fcdde162..fcb1e891f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GAbstractConnection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GAbstractConnection.java @@ -41,11 +41,11 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public abstract class GAbstractConnection implements GConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnection.java index a614bb3a3..e536b445e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnection.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import java.util.List; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public interface GConnection extends UDrawable, UShape { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java index a8ff92f90..02aba7f74 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java @@ -40,11 +40,11 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class GConnectionHorizontalThenVerticalDown extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java index 49862482b..848973248 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class GConnectionSideThenVerticalThenSide extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDown.java index 1ee49c948..f86219acc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDown.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GConnectionVerticalDown extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java index 5fdce42d7..90a3dbb14 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class GConnectionVerticalDownThenBack extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java index c67284a7b..66c540a6a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java @@ -39,11 +39,11 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; public class GConnectionVerticalDownThenHorizontal extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GPoint.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GPoint.java index 987513b69..a3ba6c949 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GPoint.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GPoint.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class GPoint { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java index d0cd09467..2228b23e7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtile.java @@ -38,11 +38,12 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import java.util.Collection; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface Gtile extends Swimable2, TextBlock { + // ::remove folder when WASM public static final boolean USE_GTILE = false; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java index 74330a461..d62a91f85 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java @@ -42,15 +42,15 @@ import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GtileAssembly extends GtileTopDown { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java index 5c4a6679c..977db3799 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java @@ -50,23 +50,23 @@ import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -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.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColors; public class GtileBox extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBreak.java index c105b3435..0f8bab83c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBreak.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class GtileBreak extends GtileEmpty implements WeldingPoint { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java index 76e1bb16a..43de1d3b0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java @@ -36,23 +36,23 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -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; public class GtileCircleSpot extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java index df8fbf222..1e451a0c0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; 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.HColors; public class GtileCircleStart extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java index 5f911dbed..1c155161b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java @@ -42,9 +42,9 @@ import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class GtileColumns extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java index f6f57fb16..a0ec433b5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGoto.java index d7dd6144a..d74232c87 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGoto.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class GtileGoto extends GtileEmpty { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java index a9361da0a..372db71b7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java @@ -46,22 +46,22 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileGroup; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColors; import net.sourceforge.plantuml.utils.MathUtils; public class GtileGroup extends AbstractGtileRoot { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java index 978ae8e4c..a144b544b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java @@ -39,16 +39,16 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class GtileHexagonInside extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java index ae445ca2c..fc542a5b6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class GtileHexagonInsideLabelled extends GtileWithMargin { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java index 9b178b6f9..6bcfd2dfd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java @@ -42,12 +42,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class GtileIfAlone extends GtileTopDown3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java index 028c432f4..7cdddf377 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java @@ -42,13 +42,13 @@ import java.util.List; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GtileIfHexagon extends GtileColumns { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileLabel.java index 94ca57b94..2c7c0d525 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileLabel.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.gtile; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class GtileLabel extends GtileEmpty { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java index 4979afa83..c3e7589ae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java @@ -44,12 +44,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class GtileRepeat extends GtileTopDown3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java index f579cc798..6e88803df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java @@ -39,14 +39,14 @@ import java.util.List; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColor; public class GtileSplit extends GtileColumns { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java index 38452c315..3b4bf4dcc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java @@ -41,9 +41,9 @@ import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class GtileTopDown extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java index cb152b366..55bb02e6f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java @@ -41,9 +41,9 @@ import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class GtileTopDown3 extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java index d72b22cc2..5f9b978b8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWhile.java @@ -42,9 +42,9 @@ import net.sourceforge.plantuml.activitydiagram3.Instruction; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class GtileWhile extends GtileTopDown3 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithIncomingArrow.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithIncomingArrow.java index 8344301f9..ea869b846 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithIncomingArrow.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithIncomingArrow.java @@ -39,7 +39,7 @@ import java.util.Collection; import java.util.Collections; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class GtileWithIncomingArrow extends GtileWithMargin implements Gtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java index 46bdbc374..275d8ea6e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java @@ -41,9 +41,9 @@ import java.util.Set; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GtileWithMargin extends AbstractGtileRoot implements Gtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java index 9a982ed30..bdec3c1c6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java @@ -48,10 +48,13 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.PName; @@ -61,9 +64,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; import net.sourceforge.plantuml.svek.image.Opale; 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; public class GtileWithNoteOpale extends AbstractGtile implements Stencil, Styleable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java index 424cf68fc..d7ff5be85 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java @@ -48,11 +48,14 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -60,9 +63,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.Opale; 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.utils.MathUtils; public class GtileWithNotes extends AbstractGtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithOutgoingArrow.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithOutgoingArrow.java index ab0f52946..fef7fdd22 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithOutgoingArrow.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithOutgoingArrow.java @@ -39,7 +39,7 @@ import java.util.Collection; import java.util.Collections; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class GtileWithOutgoingArrow extends GtileWithMargin implements Gtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java index b20211cd8..de3c56a4f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java @@ -44,16 +44,16 @@ import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Gtiles { diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index 255813091..1d5f4a4b9 100644 --- a/src/net/sourceforge/plantuml/anim/AffineTransformation.java +++ b/src/net/sourceforge/plantuml/anim/AffineTransformation.java @@ -44,7 +44,7 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.geom.MinMax; public class AffineTransformation { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/anim/Animation.java b/src/net/sourceforge/plantuml/anim/Animation.java index cc759bcd0..3c3a31be3 100644 --- a/src/net/sourceforge/plantuml/anim/Animation.java +++ b/src/net/sourceforge/plantuml/anim/Animation.java @@ -41,7 +41,7 @@ import java.util.Collections; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.geom.MinMax; public class Animation { diff --git a/src/net/sourceforge/plantuml/annotation/HaxeIgnored.java b/src/net/sourceforge/plantuml/annotation/Foo.java similarity index 90% rename from src/net/sourceforge/plantuml/annotation/HaxeIgnored.java rename to src/net/sourceforge/plantuml/annotation/Foo.java index 628fc7274..5cea7a901 100644 --- a/src/net/sourceforge/plantuml/annotation/HaxeIgnored.java +++ b/src/net/sourceforge/plantuml/annotation/Foo.java @@ -7,5 +7,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.SOURCE) @Target({ ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.TYPE }) -public @interface HaxeIgnored { +public @interface Foo { } diff --git a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java index 6d24d0568..f67755cd2 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java +++ b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.api; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; @@ -50,7 +50,7 @@ public abstract class ImageDataAbstract implements ImageData { this.height = height; } - @HaxeIgnored + public ImageDataAbstract(XDimension2D dim) { this((int) dim.getWidth(), (int) dim.getHeight()); } diff --git a/src/net/sourceforge/plantuml/api/ImageDataComplex.java b/src/net/sourceforge/plantuml/api/ImageDataComplex.java index 4f78adb2e..618d6d2c9 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataComplex.java +++ b/src/net/sourceforge/plantuml/api/ImageDataComplex.java @@ -35,9 +35,8 @@ */ package net.sourceforge.plantuml.api; -import net.sourceforge.plantuml.CMapData; -import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.url.CMapData; public class ImageDataComplex extends ImageDataAbstract { @@ -45,7 +44,7 @@ public class ImageDataComplex extends ImageDataAbstract { private final String warningOrError; @SuppressWarnings("unused") // available publicly so retained for backwards compatibility - @HaxeIgnored + public ImageDataComplex(XDimension2D info, CMapData cmap, String warningOrError) { super(info); this.cmap = cmap; diff --git a/src/net/sourceforge/plantuml/api/ImageDataSimple.java b/src/net/sourceforge/plantuml/api/ImageDataSimple.java index 96d6b7e1d..dff4ff36d 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataSimple.java +++ b/src/net/sourceforge/plantuml/api/ImageDataSimple.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.api; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; public class ImageDataSimple extends ImageDataAbstract { - @HaxeIgnored + public ImageDataSimple(int width, int height) { super(width, height); } - @HaxeIgnored + public ImageDataSimple(XDimension2D dim) { super(dim); } @@ -56,7 +56,7 @@ public class ImageDataSimple extends ImageDataAbstract { setStatus(status); } - @HaxeIgnored + private ImageDataSimple() { this(0, 0); } diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java index d71358b9c..c3739cf19 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzed.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java @@ -33,10 +33,10 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class NumberAnalyzed implements INumberAnalyzed { private static final int SLIDING_WINDOW = 1024; diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java index ca0e69f47..15ec72f10 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java @@ -32,11 +32,11 @@ import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicLong; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class NumberAnalyzed2 implements INumberAnalyzed { private static final int SLIDING_WINDOW = 512; diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java index cce0ad801..76138aa84 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java @@ -32,11 +32,11 @@ import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicLong; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; -@HaxeIgnored + public class NumberAnalyzedDated extends NumberAnalyzed { private final AtomicLong created = new AtomicLong(); diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java index 7c0651207..69e0da56f 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java @@ -38,5 +38,6 @@ package net.sourceforge.plantuml.api.mda.option2; import java.util.Collection; public interface MDADiagram { + // ::remove folder when WASM public Collection getPackages(); } diff --git a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java index 307876f56..9d6035779 100644 --- a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java +++ b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java @@ -36,4 +36,5 @@ package net.sourceforge.plantuml.api.mda.option3; public interface MDAVisitor { + // ::remove folder when WASM } diff --git a/src/net/sourceforge/plantuml/argon2/Argon2.java b/src/net/sourceforge/plantuml/argon2/Argon2.java index b2b52961a..f77808861 100644 --- a/src/net/sourceforge/plantuml/argon2/Argon2.java +++ b/src/net/sourceforge/plantuml/argon2/Argon2.java @@ -25,6 +25,7 @@ import net.sourceforge.plantuml.argon2.model.Argon2Type; import net.sourceforge.plantuml.argon2.model.Instance; public class Argon2 { + // ::remove folder when WASM private byte[] output; private int outputLength; // -l N diff --git a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java index 8bf96d6e1..717b664ab 100644 --- a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java +++ b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java index 2df10edbe..a29877308 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java index 6bc30be22..510c7f370 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java index 6578cf3c7..7111f750a 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.MessageNumber; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowComponent; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java index bdda659f3..352c005ce 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDestroy.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDestroy.java index abd9a221e..41cb88ce1 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDestroy.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDestroy.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java index 3b0e40517..ab78a06ae 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java index 24f59b0b9..e00d0593d 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java @@ -39,7 +39,7 @@ import java.util.List; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java index cf8df579b..73e4f448d 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java index 466bf43d1..956ccbab9 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java index fe59ec276..18b6dcb9c 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java @@ -39,7 +39,7 @@ import java.util.List; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java index 8dad094c2..4f7c5d1ef 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java index 6dafaf728..28cf24be8 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java index 123efbc8f..7cc1ec916 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java index 8b9bddc16..4041f41c9 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java index 774cfcbd5..2df540b84 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java index 6a6aa8c06..b0b3a64e5 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.ArrowConfiguration; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java index 82d4bba01..898cbe5db 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java index 849184855..159d2ff79 100644 --- a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java +++ b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java @@ -35,10 +35,9 @@ */ package net.sourceforge.plantuml.asciiart; -import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounderRaw; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.StringBounderRaw; +import net.sourceforge.plantuml.klimt.font.UFont; public class TextStringBounder extends StringBounderRaw { @@ -50,8 +49,8 @@ public class TextStringBounder extends StringBounderRaw { } @Override - public FileFormat getNativeFormat() { - return FileFormat.ATXT; + public boolean matchesProperty(String propertyName) { + return false; } } diff --git a/src/net/sourceforge/plantuml/awt/geom/XLine2D.java b/src/net/sourceforge/plantuml/awt/geom/XLine2D.java index 2815a113e..4678d6f56 100644 --- a/src/net/sourceforge/plantuml/awt/geom/XLine2D.java +++ b/src/net/sourceforge/plantuml/awt/geom/XLine2D.java @@ -2,9 +2,9 @@ package net.sourceforge.plantuml.awt.geom; import net.sourceforge.plantuml.awt.XShape; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class XLine2D implements XShape, UDrawable { diff --git a/src/net/sourceforge/plantuml/baraye/CucaDiagram.java b/src/net/sourceforge/plantuml/baraye/CucaDiagram.java index c11b6a826..d00ee24a5 100644 --- a/src/net/sourceforge/plantuml/baraye/CucaDiagram.java +++ b/src/net/sourceforge/plantuml/baraye/CucaDiagram.java @@ -47,7 +47,6 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.StringUtils; @@ -83,6 +82,7 @@ import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; import net.sourceforge.plantuml.svek.CucaDiagramFileMakerSvek; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.xmi.CucaDiagramXmiMaker; import net.sourceforge.plantuml.xmlsc.StateDiagramScxmlMaker; diff --git a/src/net/sourceforge/plantuml/baraye/EntityImp.java b/src/net/sourceforge/plantuml/baraye/EntityImp.java index aa8e804c0..08c18f4b9 100644 --- a/src/net/sourceforge/plantuml/baraye/EntityImp.java +++ b/src/net/sourceforge/plantuml/baraye/EntityImp.java @@ -48,15 +48,12 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.Hideable; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; import net.sourceforge.plantuml.Removeable; import net.sourceforge.plantuml.SpecificBackcolorable; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Bodier; import net.sourceforge.plantuml.cucadiagram.CucaNote; @@ -72,14 +69,17 @@ import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.Together; import net.sourceforge.plantuml.cucadiagram.dot.Neighborhood; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.IEntityImage; @@ -88,8 +88,8 @@ import net.sourceforge.plantuml.svek.Margins; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svek.SingleStrategy; import net.sourceforge.plantuml.svek.image.EntityImageStateCommon; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.text.Guillemet; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; @@ -263,6 +263,9 @@ final public class EntityImp implements SpecificBackcolorable, Hideable, Removea if (Display.isNull(display) == false && display.hasUrl()) return true; + if (bodier == null) + return false; + if (bodier.hasUrl()) return true; diff --git a/src/net/sourceforge/plantuml/board/Activity.java b/src/net/sourceforge/plantuml/board/Activity.java index 7933e1a20..04bd4044f 100644 --- a/src/net/sourceforge/plantuml/board/Activity.java +++ b/src/net/sourceforge/plantuml/board/Activity.java @@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicInteger; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Activity { diff --git a/src/net/sourceforge/plantuml/board/BoardDiagram.java b/src/net/sourceforge/plantuml/board/BoardDiagram.java index d9ce8c4d3..44e548ce7 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagram.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagram.java @@ -50,15 +50,15 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class BoardDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java b/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java index f68b6dc0f..cb1bdc914 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagramFactory.java @@ -45,6 +45,7 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; public class BoardDiagramFactory extends PSystemCommandFactory { + // ::remove folder when WASM public BoardDiagramFactory() { super(DiagramType.BOARD); diff --git a/src/net/sourceforge/plantuml/board/CardBox.java b/src/net/sourceforge/plantuml/board/CardBox.java index 025c49676..2fcb386f5 100644 --- a/src/net/sourceforge/plantuml/board/CardBox.java +++ b/src/net/sourceforge/plantuml/board/CardBox.java @@ -39,14 +39,14 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class CardBox extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/board/CommandBoardPlus.java b/src/net/sourceforge/plantuml/board/CommandBoardPlus.java index d56d5728d..0569ff049 100644 --- a/src/net/sourceforge/plantuml/board/CommandBoardPlus.java +++ b/src/net/sourceforge/plantuml/board/CommandBoardPlus.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.board; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandBoardPlus extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java index 661eed5d6..5214cef0c 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java +++ b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.ImageBuilder; public class BpmDiagram extends UmlDiagram { + // ::remove folder when WASM private void cleanGrid(Grid grid) { while (true) { diff --git a/src/net/sourceforge/plantuml/bpm/BpmElement.java b/src/net/sourceforge/plantuml/bpm/BpmElement.java index 022b9a8a9..515bfdbde 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmElement.java +++ b/src/net/sourceforge/plantuml/bpm/BpmElement.java @@ -44,21 +44,21 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UFont; 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.HColors; public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzzle { diff --git a/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java b/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java index 67562df06..a82bff127 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java +++ b/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandDockedEvent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java b/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java index f866ed971..39a808c3b 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java b/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java index e80d988f1..c69b31df0 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandGoto.java b/src/net/sourceforge/plantuml/bpm/CommandGoto.java index 5b4957608..27594641a 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandGoto.java +++ b/src/net/sourceforge/plantuml/bpm/CommandGoto.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGoto extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandMerge.java b/src/net/sourceforge/plantuml/bpm/CommandMerge.java index 804c3c4a9..e2733be46 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandMerge.java +++ b/src/net/sourceforge/plantuml/bpm/CommandMerge.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMerge extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java b/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java index eeae54154..d95955fdf 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandResume.java b/src/net/sourceforge/plantuml/bpm/CommandResume.java index cd2f32a0a..2bb2d79e5 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandResume.java +++ b/src/net/sourceforge/plantuml/bpm/CommandResume.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandResume extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java index f44909f56..490743d75 100644 --- a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java +++ b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java @@ -39,13 +39,13 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.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.HColors; public class ConnectorPuzzleEmpty extends AbstractConnectorPuzzle implements Placeable, TextBlock, ConnectorPuzzle { diff --git a/src/net/sourceforge/plantuml/bpm/GridArray.java b/src/net/sourceforge/plantuml/bpm/GridArray.java index 368d9e902..f677391f9 100644 --- a/src/net/sourceforge/plantuml/bpm/GridArray.java +++ b/src/net/sourceforge/plantuml/bpm/GridArray.java @@ -38,12 +38,12 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class GridArray implements UDrawable { diff --git a/src/net/sourceforge/plantuml/bpm/Placeable.java b/src/net/sourceforge/plantuml/bpm/Placeable.java index 2cbd24ac5..ec4144ed3 100644 --- a/src/net/sourceforge/plantuml/bpm/Placeable.java +++ b/src/net/sourceforge/plantuml/bpm/Placeable.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.bpm; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface Placeable { diff --git a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java index 917e2ab68..a419973f2 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java +++ b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.braille; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; public class BrailleDrawer implements UDrawable { diff --git a/src/net/sourceforge/plantuml/braille/BrailleGrid.java b/src/net/sourceforge/plantuml/braille/BrailleGrid.java index 2e9dd3004..9425ba166 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleGrid.java +++ b/src/net/sourceforge/plantuml/braille/BrailleGrid.java @@ -41,7 +41,7 @@ import java.util.Set; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; public class BrailleGrid { diff --git a/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java b/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java index e9904ebe2..8dabb379d 100644 --- a/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.braille; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverCenteredCharacterBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java index 81420e219..9d322b993 100644 --- a/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.braille; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/DriverLineBraille.java b/src/net/sourceforge/plantuml/braille/DriverLineBraille.java index cd6c270ff..be7bd15a7 100644 --- a/src/net/sourceforge/plantuml/braille/DriverLineBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverLineBraille.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.braille; import java.awt.geom.Line2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverLineBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java b/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java index eefef686e..714361750 100644 --- a/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java @@ -38,13 +38,13 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPolygonBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java b/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java index 40c09aa73..d88ab936c 100644 --- a/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.braille; import java.awt.geom.Rectangle2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverRectangleBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/DriverTextBraille.java b/src/net/sourceforge/plantuml/braille/DriverTextBraille.java index 490190a14..d81482215 100644 --- a/src/net/sourceforge/plantuml/braille/DriverTextBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverTextBraille.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.braille; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverTextBraille implements UDriver { diff --git a/src/net/sourceforge/plantuml/braille/UGraphicBraille.java b/src/net/sourceforge/plantuml/braille/UGraphicBraille.java index e4f8f5d65..f1fe2796b 100644 --- a/src/net/sourceforge/plantuml/braille/UGraphicBraille.java +++ b/src/net/sourceforge/plantuml/braille/UGraphicBraille.java @@ -39,21 +39,21 @@ import static net.sourceforge.plantuml.ugraphic.ImageBuilder.plainPngBuilder; import java.io.IOException; import java.io.OutputStream; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; // https://www.branah.com/braille-translator public class UGraphicBraille extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java index c4672cedf..1bcf0be45 100644 --- a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java +++ b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java @@ -70,7 +70,6 @@ import net.sourceforge.plantuml.command.note.CommandFactoryNote; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnEntity; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnLink; import net.sourceforge.plantuml.command.note.CommandFactoryTipOnEntity; -import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.descdiagram.command.CommandCreateElementMultilines; import net.sourceforge.plantuml.descdiagram.command.CommandCreateElementParenthesis; @@ -82,6 +81,7 @@ import net.sourceforge.plantuml.objectdiagram.command.CommandCreateEntityObjectM import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJson; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJsonSingleLine; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateMap; +import net.sourceforge.plantuml.regex.RegexLeaf; public class ClassDiagramFactory extends PSystemCommandFactory { diff --git a/src/net/sourceforge/plantuml/classdiagram/FullLayout.java b/src/net/sourceforge/plantuml/classdiagram/FullLayout.java index 7d101ba6c..a2b6795f1 100644 --- a/src/net/sourceforge/plantuml/classdiagram/FullLayout.java +++ b/src/net/sourceforge/plantuml/classdiagram/FullLayout.java @@ -39,8 +39,8 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class FullLayout implements UDrawable { diff --git a/src/net/sourceforge/plantuml/classdiagram/RowLayout.java b/src/net/sourceforge/plantuml/classdiagram/RowLayout.java index b4468ca11..5550e9678 100644 --- a/src/net/sourceforge/plantuml/classdiagram/RowLayout.java +++ b/src/net/sourceforge/plantuml/classdiagram/RowLayout.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.classdiagram; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class RowLayout implements UDrawable { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java index bba96c61d..f3e406248 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java @@ -40,14 +40,14 @@ import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddMethod extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java index c4fe30a38..9db11c03c 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAllowMixing extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index cf2ec2a28..26976914d 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -35,32 +35,32 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateClass extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java index 859872ed9..16c073e6a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -35,11 +35,7 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; @@ -47,12 +43,6 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; @@ -62,14 +52,24 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateClassMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java index f60a339d6..77217a46c 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -36,21 +36,12 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotag; @@ -58,9 +49,18 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandCreateElementFull; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateElementFull2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java index a0e59a721..2e5d3ccb6 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java @@ -39,12 +39,12 @@ import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandDiamondAssociation extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java index 1f2e1d885..4307758b4 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideShow2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java index 276e16062..4f8fa4954 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java @@ -42,17 +42,17 @@ import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.EntityGender; import net.sourceforge.plantuml.cucadiagram.EntityGenderUtils; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java index b9e8aafdf..557451a88 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java @@ -44,11 +44,11 @@ import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.EntityPortion; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java index b6d31b7e3..9ef9773d5 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideShowSpecificClass extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java index 58f19119e..9e2ce75c8 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLayoutNewLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java index 7858d26f3..15c1034f8 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java @@ -38,18 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; @@ -58,10 +50,18 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.descdiagram.command.Labels; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java index f94687114..ff62fb30b 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java @@ -41,14 +41,6 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; @@ -56,6 +48,14 @@ import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; final public class CommandLinkLollipop extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java index 8d5de2d1f..32c6c2dbb 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespaceSeparator extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java index 5468f7591..969deb59f 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRemoveRestore extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java index 5c50a6f36..4d1677749 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStereotype extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java index 46b307b22..fa8ad5b88 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandUrl extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java index 9d037f64a..d03023525 100644 --- a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java +++ b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java @@ -39,13 +39,13 @@ import java.io.IOException; import java.io.StringReader; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineReader; import net.sourceforge.plantuml.preproc.UncommentReadLine; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.StringLocated; public class ArobaseStringCompressor implements StringCompressor { diff --git a/src/net/sourceforge/plantuml/command/Command.java b/src/net/sourceforge/plantuml/command/Command.java index 2b76f89aa..951c80fd0 100644 --- a/src/net/sourceforge/plantuml/command/Command.java +++ b/src/net/sourceforge/plantuml/command/Command.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.core.Diagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public interface Command { diff --git a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java index 3076543cd..8f7fa27a7 100644 --- a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java +++ b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.command; import java.util.Collections; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAffineTransform extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java b/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java index 4bca0bd2c..0ebefd67a 100644 --- a/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java +++ b/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAssumeTransparent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandCaption.java b/src/net/sourceforge/plantuml/command/CommandCaption.java index 345ee6576..e037e6617 100644 --- a/src/net/sourceforge/plantuml/command/CommandCaption.java +++ b/src/net/sourceforge/plantuml/command/CommandCaption.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCaption extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandEndPackage.java b/src/net/sourceforge/plantuml/command/CommandEndPackage.java index 3834008db..20f0260b0 100644 --- a/src/net/sourceforge/plantuml/command/CommandEndPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandEndPackage.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPackage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java index 530a7d35b..ca10b022e 100644 --- a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java +++ b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java @@ -41,11 +41,11 @@ import java.util.List; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.WithSprite; import net.sourceforge.plantuml.command.note.SingleMultiFactoryCommand; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.sprite.SpriteColorBuilder4096; import net.sourceforge.plantuml.sprite.SpriteGrayLevel; diff --git a/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java index d21e049cf..c5768c222 100644 --- a/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java +++ b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootboxIgnored extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandFooter.java b/src/net/sourceforge/plantuml/command/CommandFooter.java index cf9c9b0d2..e702376ed 100644 --- a/src/net/sourceforge/plantuml/command/CommandFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandFooter.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandFooter extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandHeader.java b/src/net/sourceforge/plantuml/command/CommandHeader.java index b88005097..3a7a0fc68 100644 --- a/src/net/sourceforge/plantuml/command/CommandHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandHeader.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHeader extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandLegend.java b/src/net/sourceforge/plantuml/command/CommandLegend.java index 824e7735b..c181287f1 100644 --- a/src/net/sourceforge/plantuml/command/CommandLegend.java +++ b/src/net/sourceforge/plantuml/command/CommandLegend.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLegend extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMainframe.java b/src/net/sourceforge/plantuml/command/CommandMainframe.java index 74975ebe3..e109212e7 100644 --- a/src/net/sourceforge/plantuml/command/CommandMainframe.java +++ b/src/net/sourceforge/plantuml/command/CommandMainframe.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMainframe extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMinwidth.java b/src/net/sourceforge/plantuml/command/CommandMinwidth.java index 19ad0c1fe..37b14c094 100644 --- a/src/net/sourceforge/plantuml/command/CommandMinwidth.java +++ b/src/net/sourceforge/plantuml/command/CommandMinwidth.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMinwidth extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines.java b/src/net/sourceforge/plantuml/command/CommandMultilines.java index 81a53b0b3..2ee961ca0 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.utils.BlocLines; public abstract class CommandMultilines implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines2.java b/src/net/sourceforge/plantuml/command/CommandMultilines2.java index 743e3c818..20c7bb5b2 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines2.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines2.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.core.Diagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilines2 implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines3.java b/src/net/sourceforge/plantuml/command/CommandMultilines3.java index 8d7392e33..c98ada535 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines3.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines3.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.core.Diagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilines3 implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java index 9ee8d742d..21e56b1c7 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilinesBracket implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java b/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java index d37083343..f5123962f 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesCaption extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java index e31a1ed5d..5bcd45411 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.Matcher2; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesFooter extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java index f039ec32d..701226bb7 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.Matcher2; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesHeader extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java index 8eb987a94..14fb7a59e 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java @@ -36,16 +36,16 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesLegend extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java index 24d4acb37..8b010292a 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesTitle extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace.java b/src/net/sourceforge/plantuml/command/CommandNamespace.java index 0182aed1b..767c0cc4c 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace.java @@ -35,24 +35,24 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespace extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace2.java b/src/net/sourceforge/plantuml/command/CommandNamespace2.java index bbb98e1ad..dbc5f9885 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace2.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace2.java @@ -35,22 +35,22 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespace2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java index 374d731a0..62102d42b 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java @@ -35,22 +35,22 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespaceEmpty extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandNope.java b/src/net/sourceforge/plantuml/command/CommandNope.java index 739051bdb..b06631e9f 100644 --- a/src/net/sourceforge/plantuml/command/CommandNope.java +++ b/src/net/sourceforge/plantuml/command/CommandNope.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNope extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index e7754f261..6602f3478 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -36,28 +36,28 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPackage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java index 0fa96b171..e5b863701 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java @@ -39,15 +39,15 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPackageEmpty extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPage.java b/src/net/sourceforge/plantuml/command/CommandPage.java index 43a71f1e5..0a4bd40a0 100644 --- a/src/net/sourceforge/plantuml/command/CommandPage.java +++ b/src/net/sourceforge/plantuml/command/CommandPage.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPragma.java b/src/net/sourceforge/plantuml/command/CommandPragma.java index 7ee34124e..f8ab53d28 100644 --- a/src/net/sourceforge/plantuml/command/CommandPragma.java +++ b/src/net/sourceforge/plantuml/command/CommandPragma.java @@ -39,12 +39,12 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPragma extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandRankDir.java b/src/net/sourceforge/plantuml/command/CommandRankDir.java index aa48a0275..a6ba56c72 100644 --- a/src/net/sourceforge/plantuml/command/CommandRankDir.java +++ b/src/net/sourceforge/plantuml/command/CommandRankDir.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.cucadiagram.Rankdir; +import net.sourceforge.plantuml.klimt.geom.Rankdir; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRankDir extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandRotate.java b/src/net/sourceforge/plantuml/command/CommandRotate.java index 4f0435cf4..85eb6fe7f 100644 --- a/src/net/sourceforge/plantuml/command/CommandRotate.java +++ b/src/net/sourceforge/plantuml/command/CommandRotate.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.UmlDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRotate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScale.java b/src/net/sourceforge/plantuml/command/CommandScale.java index 9c1277555..fa8c44575 100644 --- a/src/net/sourceforge/plantuml/command/CommandScale.java +++ b/src/net/sourceforge/plantuml/command/CommandScale.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleSimple; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScale extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java index 989e3995b..cc5474040 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleMaxHeight; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java index 57633f179..6f9bfa0b5 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleMaxWidth; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxWidth extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java index 691ba73d8..e3f970be0 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleMaxWidthAndHeight; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxWidthAndHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java index 6b02d2fff..91b2f6a81 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleWidthAndHeight; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleWidthAndHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java index 87887bd57..89d50abce 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ScaleHeight; import net.sourceforge.plantuml.ScaleWidth; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleWidthOrHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParam.java b/src/net/sourceforge/plantuml/command/CommandSkinParam.java index da5bb303a..5a9e3a06b 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParam.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParam.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.style.NoStyleAvailableException; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java index 5e9f6cf94..6827721da 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; import net.sourceforge.plantuml.utils.BlocLines; public class CommandSkinParamMultilines extends CommandMultilinesBracket { diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteFile.java b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java index 14df14f97..217f2fbfb 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteFile.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java @@ -44,10 +44,10 @@ import java.util.zip.ZipInputStream; import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.FileUtils; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.sprite.Sprite; diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java b/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java index 4acecab70..e382949a1 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.emoji.SvgNanoParser; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSpriteSvg extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java b/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java index 0e4a5bcc3..846b96e96 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.emoji.SvgNanoParser; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandSpriteSvgMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/command/CommandTitle.java b/src/net/sourceforge/plantuml/command/CommandTitle.java index ae92c31b1..8d1318498 100644 --- a/src/net/sourceforge/plantuml/command/CommandTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandTitle.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandTitle extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java index 6ba9ccf18..75c7ce925 100644 --- a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java +++ b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.command; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public enum MultilinesStrategy { REMOVE_STARTING_QUOTE, KEEP_STARTING_QUOTE; diff --git a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java index 24ff1946a..3eaaf3dc8 100644 --- a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java @@ -44,8 +44,8 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class PSystemAbstractFactory implements PSystemFactory { diff --git a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java index cc00bc5c7..f5e66b1d2 100644 --- a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java @@ -40,13 +40,13 @@ import java.util.Map; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemBasicFactory

extends PSystemAbstractFactory { @@ -55,7 +55,7 @@ public abstract class PSystemBasicFactory

extends PSy super(diagramType); } - @HaxeIgnored + public PSystemBasicFactory() { this(DiagramType.UML); } diff --git a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java index 45f7d371e..73fb18ac0 100644 --- a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java @@ -43,16 +43,16 @@ import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.EmbeddedDiagram; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemCommandFactory extends PSystemAbstractFactory { @@ -63,7 +63,7 @@ public abstract class PSystemCommandFactory extends PSystemAbstractFactory { public abstract AbstractPSystem createEmptyDiagram(UmlSource source, Map skinParam); - @HaxeIgnored + protected PSystemCommandFactory() { this(DiagramType.UML); } diff --git a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java index 8492b4709..c4da02cb0 100644 --- a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java @@ -44,9 +44,9 @@ import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemSingleLineFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/command/Position.java b/src/net/sourceforge/plantuml/command/Position.java index 85234765c..df03ceede 100644 --- a/src/net/sourceforge/plantuml/command/Position.java +++ b/src/net/sourceforge/plantuml/command/Position.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.command; import java.util.Objects; -import net.sourceforge.plantuml.cucadiagram.Rankdir; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.utils.Direction; public enum Position { diff --git a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java index ffd785f58..57ecba6bf 100644 --- a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java +++ b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java @@ -37,22 +37,21 @@ package net.sourceforge.plantuml.command; import java.util.Objects; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class SingleLineCommand2 implements Command { private final IRegex pattern; private final boolean doTrim; - @HaxeIgnored + public SingleLineCommand2(IRegex pattern) { this(true, pattern); } diff --git a/src/net/sourceforge/plantuml/command/SkinLoader.java b/src/net/sourceforge/plantuml/command/SkinLoader.java index a78737de1..211ef818e 100644 --- a/src/net/sourceforge/plantuml/command/SkinLoader.java +++ b/src/net/sourceforge/plantuml/command/SkinLoader.java @@ -39,12 +39,12 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.style.NoStyleAvailableException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class SkinLoader { diff --git a/src/net/sourceforge/plantuml/command/Trim.java b/src/net/sourceforge/plantuml/command/Trim.java index 58eedfcc2..426c8846e 100644 --- a/src/net/sourceforge/plantuml/command/Trim.java +++ b/src/net/sourceforge/plantuml/command/Trim.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.command; import java.util.regex.Pattern; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public enum Trim { BOTH, LEFT_ONLY, NONE; diff --git a/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java b/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java index 65bf224d1..607f5af05 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java +++ b/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java @@ -40,14 +40,14 @@ import java.util.List; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java index 31ad4460e..d01304165 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java @@ -45,16 +45,16 @@ import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java index b3ba099c9..ead6028e1 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java @@ -36,9 +36,6 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; @@ -49,19 +46,22 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java index 6043e0bec..13790d540 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -51,11 +48,6 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkArg; @@ -63,10 +55,18 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java index 047bb4d44..9f37caaf3 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java @@ -36,9 +36,6 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -47,16 +44,19 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.CucaNote; import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java index 99eda14a3..0f38e0bc4 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -49,10 +46,6 @@ import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; @@ -61,10 +54,17 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; public final class CommandFactoryTipOnEntity implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java index d8e6c7143..6b1cb4942 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java @@ -36,9 +36,6 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -46,20 +43,23 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; import net.sourceforge.plantuml.command.note.SingleMultiFactoryCommand; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java index ef4bda7e0..0f9a58b2d 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -47,21 +44,24 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; import net.sourceforge.plantuml.command.note.SingleMultiFactoryCommand; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java index c68d98707..7c0a6ae36 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -47,15 +44,17 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; import net.sourceforge.plantuml.command.note.SingleMultiFactoryCommand; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.EventWithDeactivate; import net.sourceforge.plantuml.sequencediagram.GroupingLeaf; @@ -63,8 +62,9 @@ import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java index b72d232cd..f50432f52 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -47,20 +44,23 @@ import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.Trim; import net.sourceforge.plantuml.command.note.SingleMultiFactoryCommand; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java index 9dbeb6c80..ed05891a5 100644 --- a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java +++ b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.compositediagram; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommonCommands; import net.sourceforge.plantuml.command.PSystemCommandFactory; diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java index 339162cb5..afc6541d0 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java @@ -39,14 +39,14 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java index cc416cf69..1e2d34c67 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.compositediagram.command; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackageBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java index a80ed98e5..0026c0e84 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.compositediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPackageBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java index 1e3dc90ee..d66da25ae 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java @@ -38,17 +38,17 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLinkBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/core/UmlSource.java b/src/net/sourceforge/plantuml/core/UmlSource.java index 28d6714e1..c5d5eb474 100755 --- a/src/net/sourceforge/plantuml/core/UmlSource.java +++ b/src/net/sourceforge/plantuml/core/UmlSource.java @@ -40,15 +40,15 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; import net.sourceforge.plantuml.version.IteratorCounter2Impl; diff --git a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java index d1289a130..1c0468920 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java +++ b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java @@ -35,20 +35,20 @@ */ package net.sourceforge.plantuml.creole; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.atom.AbstractAtom; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CreoleHorizontalLine extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/Fission.java b/src/net/sourceforge/plantuml/creole/Fission.java index 048b29f9d..91c6500ff 100644 --- a/src/net/sourceforge/plantuml/creole/Fission.java +++ b/src/net/sourceforge/plantuml/creole/Fission.java @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.atom.AbstractAtom; import net.sourceforge.plantuml.creole.atom.Atom; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class Fission { diff --git a/src/net/sourceforge/plantuml/creole/Neutron.java b/src/net/sourceforge/plantuml/creole/Neutron.java index 35e6a74da..3e0e013e2 100644 --- a/src/net/sourceforge/plantuml/creole/Neutron.java +++ b/src/net/sourceforge/plantuml/creole/Neutron.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.creole; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.legacy.AtomText; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class Neutron { diff --git a/src/net/sourceforge/plantuml/creole/Position.java b/src/net/sourceforge/plantuml/creole/Position.java index 9537a32ec..f9125e270 100644 --- a/src/net/sourceforge/plantuml/creole/Position.java +++ b/src/net/sourceforge/plantuml/creole/Position.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.creole; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.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.HColors; public class Position { diff --git a/src/net/sourceforge/plantuml/creole/Sea.java b/src/net/sourceforge/plantuml/creole/Sea.java index 3eb814e91..81f5ecdbf 100644 --- a/src/net/sourceforge/plantuml/creole/Sea.java +++ b/src/net/sourceforge/plantuml/creole/Sea.java @@ -41,8 +41,8 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.atom.Atom; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; public class Sea { diff --git a/src/net/sourceforge/plantuml/creole/Sheet.java b/src/net/sourceforge/plantuml/creole/Sheet.java index 2ae94ab25..b007ca2b8 100644 --- a/src/net/sourceforge/plantuml/creole/Sheet.java +++ b/src/net/sourceforge/plantuml/creole/Sheet.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class Sheet implements Iterable { diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock1.java b/src/net/sourceforge/plantuml/creole/SheetBlock1.java index a566b398c..c08a91557 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock1.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock1.java @@ -42,22 +42,22 @@ import java.util.Map; import java.util.Objects; import net.sourceforge.plantuml.LineBreakStrategy; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class SheetBlock1 extends AbstractTextBlock implements TextBlock, Atom, Stencil { @@ -74,7 +74,7 @@ public class SheetBlock1 extends AbstractTextBlock implements TextBlock, Atom, S private Class lastCaller; private double minimumWidth; - @HaxeIgnored + public SheetBlock1(Sheet sheet, LineBreakStrategy maxWidth, double padding) { this(sheet, maxWidth, ClockwiseTopRightBottomLeft.same(padding), 0, 0); } diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock2.java b/src/net/sourceforge/plantuml/creole/SheetBlock2.java index c5acf2193..34142eb0c 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock2.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock2.java @@ -42,16 +42,16 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; final public class SheetBlock2 extends AbstractTextBlock implements TextBlock, Atom, WithPorts { diff --git a/src/net/sourceforge/plantuml/creole/Stencil.java b/src/net/sourceforge/plantuml/creole/Stencil.java index fe82de456..da9f7e275 100644 --- a/src/net/sourceforge/plantuml/creole/Stencil.java +++ b/src/net/sourceforge/plantuml/creole/Stencil.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface Stencil { diff --git a/src/net/sourceforge/plantuml/creole/StripeStyle.java b/src/net/sourceforge/plantuml/creole/StripeStyle.java index 6728956b6..b83545c4e 100644 --- a/src/net/sourceforge/plantuml/creole/StripeStyle.java +++ b/src/net/sourceforge/plantuml/creole/StripeStyle.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.creole; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.atom.Bullet; import net.sourceforge.plantuml.creole.legacy.AtomTextUtils; -import net.sourceforge.plantuml.graphic.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; public class StripeStyle { diff --git a/src/net/sourceforge/plantuml/creole/UCreole.java b/src/net/sourceforge/plantuml/creole/UCreole.java index b5c69fbe4..bd1d48cf9 100644 --- a/src/net/sourceforge/plantuml/creole/UCreole.java +++ b/src/net/sourceforge/plantuml/creole/UCreole.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.klimt.UShape; public interface UCreole extends UShape { } diff --git a/src/net/sourceforge/plantuml/creole/atom/Atom.java b/src/net/sourceforge/plantuml/creole/atom/Atom.java index 0524ebcb0..4ed33935f 100644 --- a/src/net/sourceforge/plantuml/creole/atom/Atom.java +++ b/src/net/sourceforge/plantuml/creole/atom/Atom.java @@ -39,9 +39,9 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Neutron; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public interface Atom extends UShape { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java index e61233a86..ba3744911 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.creole.atom; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.emoji.Emoji; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class AtomEmoji extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java index 774856fda..c4d608885 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.creole.atom; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class AtomHorizontalTexts extends AbstractAtom implements Atom { private final List all; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java index 6fdac3703..dc4bc5235 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java @@ -43,15 +43,16 @@ import java.io.IOException; import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.FileUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.code.Base64Coder; import net.sourceforge.plantuml.creole.legacy.AtomTextUtils; import net.sourceforge.plantuml.flashcode.FlashCodeFactory; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.ImgValign; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TileImageSvg; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; @@ -60,9 +61,8 @@ import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; +import net.sourceforge.plantuml.url.Url; public class AtomImg extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java index 24c5ad44e..ca8db6365 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.creole.atom; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TileImageSvg; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class AtomImgSvg extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java index 5dbf5703f..0c6e9a065 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java @@ -39,14 +39,14 @@ import java.awt.Color; import java.awt.image.BufferedImage; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.math.ScientificEquationSafe; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; public class AtomMath extends AbstractAtom implements Atom { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java index cdf6ab8ad..911438aa9 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.creole.atom; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.openiconic.OpenIcon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class AtomOpenIcon extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java index 59f56b640..39283d1b6 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.creole.atom; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class AtomSpace extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java index 97dbb9dc0..1e5d65fa9 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.creole.atom; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class AtomSprite extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java index 8c0b94c1f..584bd5851 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java @@ -43,14 +43,14 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Position; import net.sourceforge.plantuml.creole.SheetBlock1; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class AtomTable extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java index f845af544..88839eb81 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java @@ -41,11 +41,11 @@ import java.util.List; import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.salt.element.Skeleton2; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class AtomTree extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java index 28bf18b17..c5155d465 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.creole.atom; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class AtomVerticalTexts extends AbstractAtom implements Atom { private final List all; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java index 1ac67ce1e..360bf74cc 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.creole.atom; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class AtomWithMargin extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/atom/Bullet.java b/src/net/sourceforge/plantuml/creole/atom/Bullet.java index 2659c098e..3bfa1ebb4 100644 --- a/src/net/sourceforge/plantuml/creole/atom/Bullet.java +++ b/src/net/sourceforge/plantuml/creole/atom/Bullet.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.creole.atom; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; public class Bullet extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleCache.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleCache.java index d0fa6504e..277cf25de 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleCache.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleCache.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.creole.command; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; abstract class CommandCreoleCache implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorAndSizeChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorAndSizeChange.java index e78226f6e..8708c0b7b 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorAndSizeChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorAndSizeChange.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleColorAndSizeChange implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorChange.java index d5c8b1f5b..7d87f862d 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleColorChange.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Splitter; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleColorChange implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleEmoji.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleEmoji.java index f717aca38..d37e1ba5b 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleEmoji.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleEmoji.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleEmoji implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleExposantChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleExposantChange.java index a35214832..adb01d9ed 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleExposantChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleExposantChange.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontPosition; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; public class CommandCreoleExposantChange extends CommandCreoleCache implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleFontFamilyChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleFontFamilyChange.java index cb1e50950..ba4164fb1 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleFontFamilyChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleFontFamilyChange.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Splitter; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleFontFamilyChange implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java index 8ce18fd89..842aa66ad 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.creole.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleImg implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleLatex.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleLatex.java index fb92ad197..59c6436ec 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleLatex.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleLatex.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; import net.sourceforge.plantuml.math.ScientificEquationSafe; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleLatex implements Command { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleMath.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleMath.java index 2585d30e9..131ff1a42 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleMath.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleMath.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; import net.sourceforge.plantuml.math.ScientificEquationSafe; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleMath implements Command { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleMonospaced.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleMonospaced.java index 26fe0ddc6..5ea8a9a1d 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleMonospaced.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleMonospaced.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleMonospaced implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleOpenIcon.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleOpenIcon.java index 698a8166b..4b89fd25f 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleOpenIcon.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleOpenIcon.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleOpenIcon implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleQrcode.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleQrcode.java index 8b17114d0..e0bc81a1a 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleQrcode.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleQrcode.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleQrcode implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSizeChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSizeChange.java index 3aea87e78..efee9ef20 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSizeChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSizeChange.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Splitter; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleSizeChange implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSpace.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSpace.java index 4e0bd68bc..f9ad303ec 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSpace.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSpace.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleSpace implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSprite.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSprite.java index 940a9916a..ca380cb66 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSprite.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSprite.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.Splitter; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleSprite implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleStyle.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleStyle.java index 106bd93b0..37322a3b3 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleStyle.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleStyle.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; import net.sourceforge.plantuml.graphic.AddStyle; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; public class CommandCreoleStyle extends CommandCreoleCache implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSvgAttributeChange.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSvgAttributeChange.java index 67502a547..dd7a8d4b6 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleSvgAttributeChange.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleSvgAttributeChange.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.Splitter; import net.sourceforge.plantuml.graphic.SvgAttributes; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class CommandCreoleSvgAttributeChange implements Command { diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java index 9cc1c6c13..8dcf8350e 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.creole.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.legacy.StripeSimple; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; public class CommandCreoleUrl implements Command { diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java index 5e15356d6..e1b400971 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java @@ -39,20 +39,20 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Neutron; import net.sourceforge.plantuml.creole.NeutronType; import net.sourceforge.plantuml.creole.atom.AbstractAtom; import net.sourceforge.plantuml.creole.atom.Atom; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.text.BackSlash; 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.url.Url; import net.sourceforge.plantuml.utils.CharHidder; import net.sourceforge.plantuml.utils.Log; diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java b/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java index 9445095af..c7ff45025 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java @@ -40,8 +40,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.Url; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.atom.Atom; @@ -52,12 +51,13 @@ import net.sourceforge.plantuml.creole.atom.AtomSprite; import net.sourceforge.plantuml.creole.atom.AtomVerticalTexts; import net.sourceforge.plantuml.creole.legacy.AtomText.DelayedDouble; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.ImgValign; import net.sourceforge.plantuml.graphic.Splitter; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.openiconic.OpenIcon; import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.url.Url; public class AtomTextUtils { diff --git a/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java b/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java index 54b19353c..87fac944e 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java @@ -42,8 +42,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.EmbeddedDiagram; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.creole.CreoleContext; @@ -55,11 +55,11 @@ import net.sourceforge.plantuml.creole.Stripe; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorRuntimeException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class CreoleParser implements SheetBuilder { diff --git a/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java b/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java index 27866a4fb..60731b190 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java @@ -37,18 +37,18 @@ package net.sourceforge.plantuml.creole.legacy; import java.util.Objects; -import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.CreoleContext; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Stripe; import net.sourceforge.plantuml.creole.StripeStyle; import net.sourceforge.plantuml.creole.StripeStyleType; -import net.sourceforge.plantuml.graphic.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.utils.CharHidder; public class CreoleStripeSimpleParser { diff --git a/src/net/sourceforge/plantuml/creole/legacy/PSystemCreole.java b/src/net/sourceforge/plantuml/creole/legacy/PSystemCreole.java index 9007379c3..0234df787 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/PSystemCreole.java +++ b/src/net/sourceforge/plantuml/creole/legacy/PSystemCreole.java @@ -49,12 +49,13 @@ import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class PSystemCreole extends PlainDiagram { + // ::remove file when WASM private final List lines = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/creole/legacy/PSystemCreoleFactory.java b/src/net/sourceforge/plantuml/creole/legacy/PSystemCreoleFactory.java index 58356e485..1082ce354 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/PSystemCreoleFactory.java +++ b/src/net/sourceforge/plantuml/creole/legacy/PSystemCreoleFactory.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; public class PSystemCreoleFactory extends PSystemBasicFactory { + // ::remove file when WASM public PSystemCreoleFactory() { super(DiagramType.CREOLE); diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java b/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java index 36e255c40..5f4081074 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java @@ -44,11 +44,11 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Neutron; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.atom.Atom; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class StripeCode implements StripeRaw { diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeLatex.java b/src/net/sourceforge/plantuml/creole/legacy/StripeLatex.java index aa1a5e5aa..1d7c1643e 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeLatex.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeLatex.java @@ -43,8 +43,8 @@ import net.sourceforge.plantuml.creole.Neutron; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.atom.AtomMath; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.math.ScientificEquationSafe; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeSimple.java b/src/net/sourceforge/plantuml/creole/legacy/StripeSimple.java index 909206b96..7c61d90fe 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeSimple.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeSimple.java @@ -42,9 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.Url; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.CreoleContext; import net.sourceforge.plantuml.creole.CreoleHorizontalLine; import net.sourceforge.plantuml.creole.CreoleMode; @@ -77,17 +75,19 @@ import net.sourceforge.plantuml.creole.command.CommandCreoleStyle; import net.sourceforge.plantuml.creole.command.CommandCreoleSvgAttributeChange; import net.sourceforge.plantuml.creole.command.CommandCreoleUrl; import net.sourceforge.plantuml.emoji.Emoji; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontPosition; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.ImgValign; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.math.ScientificEquationSafe; import net.sourceforge.plantuml.openiconic.OpenIcon; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.sprite.Sprite; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.CharHidder; public class StripeSimple implements Stripe { @@ -172,8 +172,10 @@ public class StripeSimple implements Stripe { addCommand(CommandCreoleFontFamilyChange.createEol()); addCommand(CommandCreoleMonospaced.create()); addCommand(CommandCreoleUrl.create()); + // ::comment when WASM if (SecurityUtils.allowSvgText()) addCommand(CommandCreoleSvgAttributeChange.create()); + // ::done this.header = style.getHeader(fontConfiguration, context); diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeTable.java b/src/net/sourceforge/plantuml/creole/legacy/StripeTable.java index a77f67e95..6ee3e4b96 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeTable.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeTable.java @@ -40,8 +40,7 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.creole.CreoleContext; import net.sourceforge.plantuml.creole.CreoleMode; @@ -53,9 +52,10 @@ import net.sourceforge.plantuml.creole.StripeStyleType; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.atom.AtomTable; import net.sourceforge.plantuml.creole.atom.AtomWithMargin; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.text.BackSlash; public class StripeTable implements Stripe { diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeTree.java b/src/net/sourceforge/plantuml/creole/legacy/StripeTree.java index e8d5daadc..0b29003ce 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeTree.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeTree.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.creole.legacy; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.CreoleContext; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Stripe; @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.creole.StripeStyleType; import net.sourceforge.plantuml.creole.atom.Atom; import net.sourceforge.plantuml.creole.atom.AtomTree; import net.sourceforge.plantuml.creole.atom.AtomWithMargin; -import net.sourceforge.plantuml.graphic.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; public class StripeTree implements Stripe { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Bodier.java b/src/net/sourceforge/plantuml/cucadiagram/Bodier.java index f2e96773f..0f0b3da83 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Bodier.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Bodier.java @@ -39,10 +39,10 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public interface Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodierJSon.java b/src/net/sourceforge/plantuml/cucadiagram/BodierJSon.java index 9e25839eb..93048dbf9 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierJSon.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierJSon.java @@ -40,11 +40,11 @@ import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class BodierJSon implements Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java b/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java index bdfe765b8..296226a36 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java @@ -43,18 +43,18 @@ import java.util.Set; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.CreoleParser; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockLineBefore; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.url.UrlBuilder; public class BodierLikeClassOrObject implements Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodierMap.java b/src/net/sourceforge/plantuml/cucadiagram/BodierMap.java index a7e32cae1..743a59ac2 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierMap.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierMap.java @@ -47,8 +47,8 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.Style; public class BodierMap implements Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodierSimple.java b/src/net/sourceforge/plantuml/cucadiagram/BodierSimple.java index 1b6f96497..0fc2c7585 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierSimple.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierSimple.java @@ -42,11 +42,11 @@ import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class BodierSimple implements Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Body3.java b/src/net/sourceforge/plantuml/cucadiagram/Body3.java index da7896e8b..c9f800302 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Body3.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Body3.java @@ -41,10 +41,10 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.Ports; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java index 2135f81f0..7eefcbac9 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java @@ -44,23 +44,23 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.legacy.CreoleParser; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.TextBlockVertical2; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.WithPorts; +import net.sourceforge.plantuml.url.Url; public class BodyEnhanced1 extends BodyEnhancedAbstract implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java index 415f82e37..c4c400cac 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java @@ -39,16 +39,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.EmbeddedDiagram; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.TextBlockVertical2; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java index 823cf0fdb..4c0b38b76 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockLineBefore; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyFactory.java b/src/net/sourceforge/plantuml/cucadiagram/BodyFactory.java index abcea8ec9..beebae79f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyFactory.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyFactory.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.List; import java.util.Set; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.Style; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Display.java b/src/net/sourceforge/plantuml/cucadiagram/Display.java index bf4858efc..1efee711d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Display.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Display.java @@ -45,40 +45,40 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.Guillemet; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; -import net.sourceforge.plantuml.SpriteContainer; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.Quark; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; import net.sourceforge.plantuml.creole.legacy.CreoleParser; import net.sourceforge.plantuml.graphic.CircledCharacter; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockSprited; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.sequencediagram.MessageNumber; import net.sourceforge.plantuml.skin.VisibilityModifier; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.Value; import net.sourceforge.plantuml.style.ValueNull; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.Guillemet; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; public class Display implements Iterable { diff --git a/src/net/sourceforge/plantuml/cucadiagram/DisplayPositioned.java b/src/net/sourceforge/plantuml/cucadiagram/DisplayPositioned.java index a071240a6..e1de77975 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/DisplayPositioned.java +++ b/src/net/sourceforge/plantuml/cucadiagram/DisplayPositioned.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class DisplayPositioned extends DisplayPositionned { diff --git a/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java b/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java index 553506428..24ed6d5ae 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java +++ b/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.EnumMap; import java.util.Map; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.Style; public class DisplaySection { diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java b/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java index 98442d4af..72384f3f5 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.EntityUtils; +import net.sourceforge.plantuml.text.Guillemet; public class EntityGenderUtils { diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java index c08a6766e..244990c95 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java @@ -40,13 +40,14 @@ import java.util.EnumSet; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.svek.ShapeType; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public enum EntityPosition { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Link.java b/src/net/sourceforge/plantuml/cucadiagram/Link.java index 9d998d6c9..0c3b8242c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Link.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Link.java @@ -37,24 +37,24 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.Objects; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.Hideable; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.Removeable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.entity.IEntityFactory; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbolInterface; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.Bibliotekon; -import net.sourceforge.plantuml.ugraphic.UComment; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.LineLocation; public class Link extends WithLinkType implements Hideable, Removeable { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java index 21eb52986..b9aa63af4 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColors; public class LinkConstraint { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java b/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java index 3ee7609c6..b5b93efcf 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.cucadiagram; import net.sourceforge.plantuml.OptionFlags; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.svek.extremity.ExtremityFactory; import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryArrow; import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryArrowAndCircle; @@ -56,7 +57,6 @@ import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryParenthesis; import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryPlus; import net.sourceforge.plantuml.svek.extremity.ExtremityFactorySquare; import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryTriangle; -import net.sourceforge.plantuml.ugraphic.color.HColor; public enum LinkDecor { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java b/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java index e8161feff..02af48437 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.cucadiagram; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.svek.extremity.MiddleCircleCircledMode; import net.sourceforge.plantuml.svek.extremity.MiddleFactory; import net.sourceforge.plantuml.svek.extremity.MiddleFactoryCircle; import net.sourceforge.plantuml.svek.extremity.MiddleFactoryCircleCircled; -import net.sourceforge.plantuml.ugraphic.color.HColor; public enum LinkMiddleDecor { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java b/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java index 427ffddd9..799f73098 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.ugraphic.UStroke; +import net.sourceforge.plantuml.klimt.UStroke; public class LinkStyle { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkType.java b/src/net/sourceforge/plantuml/cucadiagram/LinkType.java index 92ce7b17e..5a5c42444 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkType.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.Objects; -import net.sourceforge.plantuml.ugraphic.UStroke; +import net.sourceforge.plantuml.klimt.UStroke; public class LinkType { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Member.java b/src/net/sourceforge/plantuml/cucadiagram/Member.java index 6e1d62d75..52477d9f7 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Member.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Member.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.skin.VisibilityModifier; +import net.sourceforge.plantuml.text.Guillemet; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; public class Member implements CharSequence { diff --git a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java index 7afbb29ae..acdabdcf4 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java @@ -45,20 +45,21 @@ import java.util.List; import net.sourceforge.plantuml.EmbeddedDiagram; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockLineBefore; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.TextBlockWithUrl; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; @@ -71,8 +72,7 @@ import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2Left; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2Right; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.CharHidder; public class MethodsOrFieldsArea extends AbstractTextBlock implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Stereostyles.java b/src/net/sourceforge/plantuml/cucadiagram/Stereostyles.java index 4da6fd1e9..3fc54a1a0 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Stereostyles.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Stereostyles.java @@ -40,9 +40,9 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class Stereostyles { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java b/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java index 801204938..c24fdde2f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java @@ -43,17 +43,17 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.Guillemet; -import net.sourceforge.plantuml.SpriteContainer; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.PackageStyle; -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.NoSuchColorException; +import net.sourceforge.plantuml.text.Guillemet; public class Stereotype implements CharSequence { diff --git a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java index 44530cf38..8b9ed8e02 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java +++ b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java @@ -39,22 +39,22 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.command.regex.RegexComposed; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.Parser; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.regex.RegexComposed; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; 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.HColors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.Guillemet; public class StereotypeDecoration { private final static RegexComposed circleChar = new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/cucadiagram/TextBlockCucaJSon.java b/src/net/sourceforge/plantuml/cucadiagram/TextBlockCucaJSon.java index f77db86ed..8ab721975 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/TextBlockCucaJSon.java +++ b/src/net/sourceforge/plantuml/cucadiagram/TextBlockCucaJSon.java @@ -40,19 +40,19 @@ import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockCucaJSon extends AbstractTextBlock implements WithPorts { diff --git a/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java b/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java index d13f5a047..c22c2d963 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java +++ b/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java @@ -46,20 +46,20 @@ import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; public class TextBlockMap extends AbstractTextBlock implements WithPorts { diff --git a/src/net/sourceforge/plantuml/cucadiagram/WithLinkType.java b/src/net/sourceforge/plantuml/cucadiagram/WithLinkType.java index f53a7a2b3..6f143799c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/WithLinkType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/WithLinkType.java @@ -40,11 +40,11 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; public abstract class WithLinkType { diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java index c2988d307..37aad0c0d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java @@ -43,7 +43,7 @@ import java.util.List; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.LeafType; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.GroupPngMakerActivity; import net.sourceforge.plantuml.svek.IEntityImage; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java index e329a64fc..d14ce05e4 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.LeafType; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.GroupPngMakerState; import net.sourceforge.plantuml.svek.IEntityImage; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java index 3fb48311e..f2714cea6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java @@ -46,9 +46,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.asciiart.BasicCharArea; +import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; @@ -56,13 +57,15 @@ import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.PortionShower; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.posimo.Block; import net.sourceforge.plantuml.posimo.Cluster; import net.sourceforge.plantuml.posimo.GraphvizSolverB; import net.sourceforge.plantuml.posimo.Path; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; public final class CucaDiagramTxtMaker { @@ -119,7 +122,7 @@ public final class CucaDiagramTxtMaker { if (p.isInvis()) { continue; } - p.getDotPath().draw(globalUg.getCharArea(), getXPixelPerChar(), getYPixelPerChar()); + drawDotPath(p.getDotPath(), globalUg.getCharArea(), getXPixelPerChar(), getYPixelPerChar()); } for (EntityImp ent : diagram.getLeafsvalues()) { final Block b = blocks.get(ent); @@ -130,6 +133,17 @@ public final class CucaDiagramTxtMaker { } + private void drawDotPath(DotPath dotPath, BasicCharArea area, double pixelXPerChar, double pixelYPerChar) { + for (XCubicCurve2D bez : dotPath.getBeziers()) + if (bez.x1 == bez.x2) + area.drawVLine('|', (int) (bez.x1 / pixelXPerChar), (int) (bez.y1 / pixelYPerChar), + (int) (bez.y2 / pixelYPerChar)); + else if (bez.y1 == bez.y2) + area.drawHLine('-', (int) (bez.y1 / pixelYPerChar), (int) (bez.x1 / pixelXPerChar), + (int) (bez.x2 / pixelXPerChar)); + + } + private void printClass(final EntityImp ent, UGraphicTxt ug) { final int w = getWidth(ent); final int h = getHeight(ent); diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java index 8a39d9b34..37c6aafbf 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java @@ -45,12 +45,12 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Link; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.SvekLine; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Neighborhood { diff --git a/src/net/sourceforge/plantuml/dedication/BlumBlumShub.java b/src/net/sourceforge/plantuml/dedication/BlumBlumShub.java index 7c61d21f0..7646f898e 100644 --- a/src/net/sourceforge/plantuml/dedication/BlumBlumShub.java +++ b/src/net/sourceforge/plantuml/dedication/BlumBlumShub.java @@ -3,6 +3,7 @@ package net.sourceforge.plantuml.dedication; import java.math.BigInteger; public class BlumBlumShub { + // ::remove folder when WASM private static final BigInteger two = BigInteger.valueOf(2L); diff --git a/src/net/sourceforge/plantuml/dedication/PSystemDedication.java b/src/net/sourceforge/plantuml/dedication/PSystemDedication.java index f13a755c0..3a9874a15 100644 --- a/src/net/sourceforge/plantuml/dedication/PSystemDedication.java +++ b/src/net/sourceforge/plantuml/dedication/PSystemDedication.java @@ -43,10 +43,10 @@ import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; public class PSystemDedication extends PlainDiagram { diff --git a/src/net/sourceforge/plantuml/definition/PSystemDefinition.java b/src/net/sourceforge/plantuml/definition/PSystemDefinition.java index 4e7d2de96..c66eefea7 100644 --- a/src/net/sourceforge/plantuml/definition/PSystemDefinition.java +++ b/src/net/sourceforge/plantuml/definition/PSystemDefinition.java @@ -45,12 +45,12 @@ import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class PSystemDefinition extends PlainDiagram implements UDrawable { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java index 90b3fcb92..acfd6127f 100644 --- a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java +++ b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; -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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class BoxedCharacter extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java index a272e0f74..a91faa3f2 100644 --- a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java @@ -35,27 +35,27 @@ */ package net.sourceforge.plantuml.descdiagram; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.command.GenericRegexProducer; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateDomain extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java index 07ef66761..138f484ba 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java @@ -51,8 +51,6 @@ import net.sourceforge.plantuml.command.PSystemCommandFactory; import net.sourceforge.plantuml.command.note.CommandFactoryNote; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnEntity; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnLink; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.descdiagram.command.CommandArchimate; import net.sourceforge.plantuml.descdiagram.command.CommandArchimateMultilines; @@ -65,6 +63,8 @@ import net.sourceforge.plantuml.descdiagram.command.CommandTogether; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJson; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJsonSingleLine; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateMap; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; public class DescriptionDiagramFactory extends PSystemCommandFactory { diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java index 928fcbebd..196e90443 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java @@ -36,31 +36,31 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; 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.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageDesignedDomain extends AbstractEntityImage { final private TextBlock name; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java index d94012815..9e6873e59 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java @@ -36,32 +36,32 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; 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.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageDomain extends AbstractEntityImage { final private TextBlock name; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java index aa3150f29..ca1a6fd68 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java @@ -36,31 +36,31 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; 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.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageMachine extends AbstractEntityImage { final private TextBlock name; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java index 1ed4985ca..212ea05dd 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java @@ -36,37 +36,37 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; 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.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.AbstractUGraphicHorizontalLine; import net.sourceforge.plantuml.ugraphic.TextBlockInEllipse; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class EntityImageRequirement extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java index ba0d8fda3..ae8c29b87 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java @@ -35,27 +35,27 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandArchimate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java index d9e7ff9fe..54f517c14 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -44,19 +42,21 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; public class CommandArchimateMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java index ae04c6bec..003644d91 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -36,11 +36,7 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.baraye.Quark; @@ -48,12 +44,6 @@ import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotag; @@ -61,11 +51,21 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateElementFull extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java index 7db4e6d24..6f591c6ac 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java @@ -37,11 +37,7 @@ package net.sourceforge.plantuml.descdiagram.command; import java.util.List; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -49,19 +45,23 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; public class CommandCreateElementMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java index c7a289799..324e6c0c6 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java @@ -35,32 +35,32 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateElementParenthesis extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java index 9fbc74855..9f212641c 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java @@ -40,11 +40,6 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; @@ -55,9 +50,14 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java index 6d311d739..c7f71254a 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java @@ -40,10 +40,10 @@ import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.PSystemCommandFactory; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewpage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index dd93173d2..f3783eb83 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -36,30 +36,30 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPackageWithUSymbol extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandTogether.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandTogether.java index 59979a2ce..9ca0e61ba 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandTogether.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandTogether.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandTogether extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/Labels.java b/src/net/sourceforge/plantuml/descdiagram/command/Labels.java index 9a0401fb6..9c7d1160b 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/Labels.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/Labels.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LinkArrow; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.regex.RegexResult; public class Labels { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java b/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java index be88bf7b9..f14ac83c5 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java @@ -39,12 +39,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LinkArrow; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockArrow2; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.GuideLine; public class StringWithArrow { diff --git a/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java b/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java index 7c148bae1..c74403735 100644 --- a/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java +++ b/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java @@ -45,7 +45,6 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.UmlDiagram; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.svek.GraphvizCrash; +import net.sourceforge.plantuml.text.BackSlash; public class PSystemDitaa extends AbstractPSystem { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java b/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java index c2f8206a2..0d97fca8d 100644 --- a/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java +++ b/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java @@ -51,8 +51,8 @@ public class PSystemDitaaFactory extends PSystemBasicFactory { // // -S,--no-shadows // private boolean dropShadows; - public PSystemDitaaFactory(DiagramType diagramType) { - super(diagramType); + public PSystemDitaaFactory() { + super(DiagramType.DITAA); } @Override @@ -79,12 +79,9 @@ public class PSystemDitaaFactory extends PSystemBasicFactory { final float scale = extractScale(startLine); final Font font = extractFont(startLine); - if (getDiagramType() == DiagramType.UML) - return null; - else if (getDiagramType() == DiagramType.DITAA) - return new PSystemDitaa(source, "", performSeparationOfCommonEdges, dropShadows, allCornersAreRound, transparentBackground, scale, font, forceFontSize); - else - throw new IllegalStateException(getDiagramType().name()); + + return new PSystemDitaa(source, "", performSeparationOfCommonEdges, dropShadows, allCornersAreRound, + transparentBackground, scale, font, forceFontSize); } @@ -113,7 +110,8 @@ public class PSystemDitaaFactory extends PSystemBasicFactory { final float scale = extractScale(line); final Font font = extractFont(line); - return new PSystemDitaa(source, "", performSeparationOfCommonEdges, dropShadows, allCornersAreRound, transparentBackground, scale, font, forceFontSize); + return new PSystemDitaa(source, "", performSeparationOfCommonEdges, dropShadows, allCornersAreRound, + transparentBackground, scale, font, forceFontSize); } if (system == null) return null; @@ -141,35 +139,31 @@ public class PSystemDitaaFactory extends PSystemBasicFactory { final Pattern pName = Pattern.compile("font-family=([a-zA-Z0-0 ]+)"); final Matcher mName = pName.matcher(line); String fontName = "Dialog"; - if (mName.find()) - { + if (mName.find()) { fontName = mName.group(1); } final Pattern pVariant = Pattern.compile("font-variant=(BOLD|ITALIC|PLAIN)"); final Matcher mVariant = pVariant.matcher(line); int fontVariant = Font.BOLD; - if (mVariant.find()) - { - switch (mVariant.group(1)) - { - case "BOLD": - fontVariant = Font.BOLD; - break; - case "ITALIC": - fontVariant = Font.ITALIC; - break; - case "PLAIN": - fontVariant = Font.PLAIN; - break; + if (mVariant.find()) { + switch (mVariant.group(1)) { + case "BOLD": + fontVariant = Font.BOLD; + break; + case "ITALIC": + fontVariant = Font.ITALIC; + break; + case "PLAIN": + fontVariant = Font.PLAIN; + break; } } final Pattern pSize = Pattern.compile("font-size=([\\d]+)"); final Matcher mSize = pSize.matcher(line); int fontSize = 12; - if (mSize.find()) - { + if (mSize.find()) { fontSize = Integer.parseInt(mSize.group(1)); } diff --git a/src/net/sourceforge/plantuml/donors/PSystemDonors.java b/src/net/sourceforge/plantuml/donors/PSystemDonors.java index 9d37b3afc..ebad44da0 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemDonors.java +++ b/src/net/sourceforge/plantuml/donors/PSystemDonors.java @@ -41,7 +41,6 @@ import java.util.Arrays; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -54,16 +53,17 @@ import net.sourceforge.plantuml.code.TranscoderImpl; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.GraphicStrings; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.svek.TextBlockBackcolored; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.version.PSystemVersion; public class PSystemDonors extends PlainDiagram { diff --git a/src/net/sourceforge/plantuml/donors/PSystemSkinparameterList.java b/src/net/sourceforge/plantuml/donors/PSystemSkinparameterList.java index 960324828..4feeea381 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemSkinparameterList.java +++ b/src/net/sourceforge/plantuml/donors/PSystemSkinparameterList.java @@ -46,13 +46,14 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.GraphicStrings; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PSystemSkinparameterList extends PlainDiagram { + // ::remove file when WASM public PSystemSkinparameterList(UmlSource source) { super(source); diff --git a/src/net/sourceforge/plantuml/donors/PSystemSkinparameterListFactory.java b/src/net/sourceforge/plantuml/donors/PSystemSkinparameterListFactory.java index cdaa284ff..7ae0955ac 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemSkinparameterListFactory.java +++ b/src/net/sourceforge/plantuml/donors/PSystemSkinparameterListFactory.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; public class PSystemSkinparameterListFactory extends PSystemSingleLineFactory { + // ::remove file when WASM @Override protected AbstractPSystem executeLine(UmlSource source, String line) { diff --git a/src/net/sourceforge/plantuml/ebnf/Brace.java b/src/net/sourceforge/plantuml/ebnf/Brace.java index c5ce0b839..6b2994518 100644 --- a/src/net/sourceforge/plantuml/ebnf/Brace.java +++ b/src/net/sourceforge/plantuml/ebnf/Brace.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Brace implements UDrawable { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandComment.java b/src/net/sourceforge/plantuml/ebnf/CommandComment.java index 7fc79b8a3..4f8fdee98 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandComment.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandComment.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandComment extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java index 79e54b7e5..1a6cd485b 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java @@ -39,11 +39,11 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.utils.BlocLines; public class CommandCommentMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java index 0405a9b66..f3bca7ec2 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java @@ -39,11 +39,11 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.utils.BlocLines; public class CommandCommentMultilines2 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java b/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java index 8e2263182..3d696af29 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java @@ -39,15 +39,15 @@ import java.util.Collections; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandEBnfSingleLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java index c47d75d03..84781944e 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java @@ -39,10 +39,10 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.utils.BlocLines; public class CommandEbnfMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java index 44dc925cf..1faf461a8 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java @@ -39,15 +39,15 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CornerCurved.java b/src/net/sourceforge/plantuml/ebnf/CornerCurved.java index a67a9d6e1..b63612419 100644 --- a/src/net/sourceforge/plantuml/ebnf/CornerCurved.java +++ b/src/net/sourceforge/plantuml/ebnf/CornerCurved.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.CopyForegroundColorToBackgroundColor; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; enum CornerType { NW, NE, SE, SW; diff --git a/src/net/sourceforge/plantuml/ebnf/ETile.java b/src/net/sourceforge/plantuml/ebnf/ETile.java index 8021f8834..8dac50548 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETile.java +++ b/src/net/sourceforge/plantuml/ebnf/ETile.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.CopyForegroundColorToBackgroundColor; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; public abstract class ETile extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java b/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java index 9af35f688..f51c32912 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java @@ -39,9 +39,9 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ETileAlternation extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileBox.java b/src/net/sourceforge/plantuml/ebnf/ETileBox.java index c1311b90c..9a67e88d1 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileBox.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileBox.java @@ -40,20 +40,20 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UStroke; -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.HColorSet; import net.sourceforge.plantuml.utils.Direction; public class ETileBox extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java b/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java index 78c0dbb54..056592b19 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.ebnf; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ETileConcatenation extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileEmpty.java b/src/net/sourceforge/plantuml/ebnf/ETileEmpty.java index c5f625e0f..766ca8b60 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileEmpty.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileEmpty.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class ETileEmpty extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileOneOrMore.java b/src/net/sourceforge/plantuml/ebnf/ETileOneOrMore.java index d82b8fa4d..ca988dc90 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileOneOrMore.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileOneOrMore.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class ETileOneOrMore extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileOptional.java b/src/net/sourceforge/plantuml/ebnf/ETileOptional.java index 27f9cd354..1d2ea3da8 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileOptional.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileOptional.java @@ -39,14 +39,14 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class ETileOptional extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileWithCircles.java b/src/net/sourceforge/plantuml/ebnf/ETileWithCircles.java index bc5debb64..9d0f4e6bf 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileWithCircles.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileWithCircles.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.CopyForegroundColorToBackgroundColor; 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.HColor; public class ETileWithCircles extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileZeroOrMore.java b/src/net/sourceforge/plantuml/ebnf/ETileZeroOrMore.java index 7a927212e..8e938395f 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileZeroOrMore.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileZeroOrMore.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class ETileZeroOrMore extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/EbnfEngine.java b/src/net/sourceforge/plantuml/ebnf/EbnfEngine.java index fc7a4cf25..286388736 100644 --- a/src/net/sourceforge/plantuml/ebnf/EbnfEngine.java +++ b/src/net/sourceforge/plantuml/ebnf/EbnfEngine.java @@ -38,16 +38,16 @@ package net.sourceforge.plantuml.ebnf; import java.util.ArrayDeque; import java.util.Deque; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class EbnfEngine { diff --git a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java index bcab0e7ce..982f2a122 100644 --- a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java +++ b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java @@ -42,14 +42,14 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.CharInspector; public class EbnfExpression implements TextBlockable { diff --git a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java index 4e2e8ee14..68052a6d7 100644 --- a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java +++ b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java @@ -50,11 +50,11 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.TextBlockBackcolored; diff --git a/src/net/sourceforge/plantuml/ebnf/TitleBox.java b/src/net/sourceforge/plantuml/ebnf/TitleBox.java index e1a6c7d65..08c9daa83 100644 --- a/src/net/sourceforge/plantuml/ebnf/TitleBox.java +++ b/src/net/sourceforge/plantuml/ebnf/TitleBox.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.ebnf; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TitleBox extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/eggs/EggUtils.java b/src/net/sourceforge/plantuml/eggs/EggUtils.java index 8e23364b0..e75d9b840 100644 --- a/src/net/sourceforge/plantuml/eggs/EggUtils.java +++ b/src/net/sourceforge/plantuml/eggs/EggUtils.java @@ -40,6 +40,7 @@ import java.math.BigInteger; import net.sourceforge.plantuml.StringUtils; public class EggUtils { + // ::remove file when WASM public static String fromByteArrays(byte data[]) { final StringBuilder sb = new StringBuilder(); diff --git a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java index 3a45b9985..fbc2b6752 100644 --- a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java +++ b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java @@ -45,15 +45,16 @@ import net.sourceforge.plantuml.EmptyImageBuilder; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UMotif; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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.HColors; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; public class GraphicsPath { + // ::remove file when WASM private final String path; private final ColorMapper colorMapper; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java index c03ebec90..a99baf966 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.graphic.GraphicPosition; import net.sourceforge.plantuml.version.PSystemVersion; public class PSystemAppleTwo extends PlainStringsDiagram { + // ::remove file when WASM public PSystemAppleTwo(UmlSource source) throws IOException { super(source); diff --git a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java index 85440bbe1..220d15f28 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java @@ -44,12 +44,12 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; public class PSystemAppleTwoFactory extends PSystemSingleLineFactory { + // ::remove file when WASM @Override protected AbstractPSystem executeLine(UmlSource source, String line) { - if (line.equalsIgnoreCase("apple //e") || line.equalsIgnoreCase("apple ][") - || line.equalsIgnoreCase("apple II") || line.equalsIgnoreCase("Steve Jobs") - || line.equalsIgnoreCase("Steve Wozniak")) { + if (line.equalsIgnoreCase("apple //e") || line.equalsIgnoreCase("apple ][") || line.equalsIgnoreCase("apple II") + || line.equalsIgnoreCase("Steve Jobs") || line.equalsIgnoreCase("Steve Wozniak")) { try { return new PSystemAppleTwo(source); } catch (IOException e) { diff --git a/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java b/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java index 46276f418..5f473ad5d 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java @@ -42,11 +42,11 @@ import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.ImageBuilder; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.version.PSystemVersion; public class PSystemCharlie extends PlainDiagram { diff --git a/src/net/sourceforge/plantuml/eggs/PSystemColors.java b/src/net/sourceforge/plantuml/eggs/PSystemColors.java index bdbc815b3..91d7b7696 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemColors.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemColors.java @@ -42,7 +42,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.SpriteContainerEmpty; @@ -51,21 +50,22 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColors; // http://www.redblobgames.com/grids/hexagons/ public class PSystemColors extends PlainDiagram implements UDrawable { diff --git a/src/net/sourceforge/plantuml/eggs/PSystemEgg.java b/src/net/sourceforge/plantuml/eggs/PSystemEgg.java index 67b2df66f..7cd542393 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemEgg.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemEgg.java @@ -42,6 +42,7 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; public class PSystemEgg extends PlainStringsDiagram { + // ::remove file when WASM PSystemEgg(UmlSource source, String sentence) { super(source); diff --git a/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java index f6c4ac8d1..1bf4ce7c2 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; public class PSystemEggFactory extends PSystemSingleLineFactory { + // ::remove file when WASM final static private List all = Arrays .asList(EggUtils diff --git a/src/net/sourceforge/plantuml/eggs/PSystemPath.java b/src/net/sourceforge/plantuml/eggs/PSystemPath.java index 70edff1de..7021e9d3b 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemPath.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemPath.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorMapper; public class PSystemPath extends AbstractPSystem { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java index 65f47e147..f0c367c12 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.eggs; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class PSystemPathFactory extends PSystemSingleLineFactory { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/eggs/PSystemRIP.java b/src/net/sourceforge/plantuml/eggs/PSystemRIP.java index 09a1bfefc..26363b994 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemRIP.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemRIP.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.graphic.GraphicPosition; import net.sourceforge.plantuml.security.SImageIO; public class PSystemRIP extends PlainStringsDiagram { + // ::remove file when WASM public PSystemRIP(UmlSource source) throws IOException { super(source); diff --git a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java index 30a45d457..6fac16ccb 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; public class PSystemRIPFactory extends PSystemSingleLineFactory { + // ::remove file when WASM @Override protected AbstractPSystem executeLine(UmlSource source, String line) { diff --git a/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java b/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java index 4b001c194..be383b6a3 100644 --- a/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java +++ b/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java @@ -40,6 +40,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.UnsupportedEncodingException; public class SentenceDecoder { + // ::remove file when WASM private final String secret; diff --git a/src/net/sourceforge/plantuml/eggs/SentenceProducer.java b/src/net/sourceforge/plantuml/eggs/SentenceProducer.java index 75e5d9f03..dd38c008e 100644 --- a/src/net/sourceforge/plantuml/eggs/SentenceProducer.java +++ b/src/net/sourceforge/plantuml/eggs/SentenceProducer.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.eggs; import static java.nio.charset.StandardCharsets.UTF_8; public class SentenceProducer { + // ::remove file when WASM private final String secret; diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index 46fd456ef..c2ad930a5 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -47,7 +47,6 @@ import java.util.Map.Entry; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagram; @@ -102,13 +101,21 @@ import net.sourceforge.plantuml.elk.proxy.graph.ElkLabel; import net.sourceforge.plantuml.elk.proxy.graph.ElkNode; import net.sourceforge.plantuml.elk.proxy.graph.util.ElkGraphUtil; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.QuoteUtils; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.USymbolFolder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -116,7 +123,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.Cluster; import net.sourceforge.plantuml.svek.ClusterDecoration; -import net.sourceforge.plantuml.svek.ClusterPosition; import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; import net.sourceforge.plantuml.svek.DotStringFactory; import net.sourceforge.plantuml.svek.GeneralImageBuilder; @@ -124,13 +130,7 @@ import net.sourceforge.plantuml.svek.GraphvizCrash; import net.sourceforge.plantuml.svek.IEntityImage; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; /* * Some notes: diff --git a/src/net/sourceforge/plantuml/elk/ElkPath.java b/src/net/sourceforge/plantuml/elk/ElkPath.java index 08429414e..c5208fd54 100644 --- a/src/net/sourceforge/plantuml/elk/ElkPath.java +++ b/src/net/sourceforge/plantuml/elk/ElkPath.java @@ -70,7 +70,12 @@ import net.sourceforge.plantuml.elk.proxy.graph.ElkEdgeSection; import net.sourceforge.plantuml.elk.proxy.graph.ElkLabel; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -78,11 +83,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.extremity.ExtremityFactory; import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryExtends; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class ElkPath implements UDrawable { diff --git a/src/net/sourceforge/plantuml/emoji/Emoji.java b/src/net/sourceforge/plantuml/emoji/Emoji.java index 85060064e..e8a993619 100644 --- a/src/net/sourceforge/plantuml/emoji/Emoji.java +++ b/src/net/sourceforge/plantuml/emoji/Emoji.java @@ -47,13 +47,18 @@ import java.util.Map; import java.util.TreeMap; import net.sourceforge.plantuml.emoji.data.Dummy; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; // Emojji from https://twemoji.twitter.com/ // Shorcut from https://api.github.com/emojis +// ::uncomment when WASM +//import com.plantuml.wasm.RunInit; +//import java.io.FileInputStream; +// ::done + public class Emoji { private final static Map ALL = new HashMap<>(); @@ -111,8 +116,14 @@ public class Emoji { return; final List data = new ArrayList(); + // ::uncomment when WASM +// final String fullpath = RunInit.cheerpjPath + "emoji/" + unicode + ".svg"; +// try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(fullpath)))) { + // ::done + // ::comment when WASM try (BufferedReader br = new BufferedReader( new InputStreamReader(Dummy.class.getResourceAsStream(unicode + ".svg")))) { + // ::done final String singleLine = br.readLine(); data.add(singleLine); } diff --git a/src/net/sourceforge/plantuml/emoji/PSystemListEmoji.java b/src/net/sourceforge/plantuml/emoji/PSystemListEmoji.java index 01ab927c9..0786a9b82 100644 --- a/src/net/sourceforge/plantuml/emoji/PSystemListEmoji.java +++ b/src/net/sourceforge/plantuml/emoji/PSystemListEmoji.java @@ -45,13 +45,14 @@ import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.GraphicStrings; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PSystemListEmoji extends PlainDiagram { + // ::remove file when WASM private final String text; diff --git a/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java b/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java index a86df093a..6858352c4 100644 --- a/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java +++ b/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; public class PSystemListEmojiFactory extends PSystemSingleLineFactory { + // ::remove file when WASM @Override protected AbstractPSystem executeLine(UmlSource source, String line) { diff --git a/src/net/sourceforge/plantuml/emoji/SpriteSvgNanoParser.java b/src/net/sourceforge/plantuml/emoji/SpriteSvgNanoParser.java index 573efec5d..b4791f079 100644 --- a/src/net/sourceforge/plantuml/emoji/SpriteSvgNanoParser.java +++ b/src/net/sourceforge/plantuml/emoji/SpriteSvgNanoParser.java @@ -42,17 +42,17 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SpriteSvgNanoParser implements Sprite { diff --git a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java index 240ba1748..8799b6240 100644 --- a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java +++ b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java @@ -44,25 +44,25 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.openiconic.SvgPath; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.ColorUtils; -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.HColors; // Emojji from https://twemoji.twitter.com/ // Shorcut from https://api.github.com/emojis diff --git a/src/net/sourceforge/plantuml/emoji/UGraphicWithScale.java b/src/net/sourceforge/plantuml/emoji/UGraphicWithScale.java index a4b3b6860..91d800f1e 100644 --- a/src/net/sourceforge/plantuml/emoji/UGraphicWithScale.java +++ b/src/net/sourceforge/plantuml/emoji/UGraphicWithScale.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.emoji; import java.awt.geom.AffineTransform; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public class UGraphicWithScale { diff --git a/src/net/sourceforge/plantuml/eps/EpsGraphics.java b/src/net/sourceforge/plantuml/eps/EpsGraphics.java index 3e95e3b4b..9e497d77a 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphics.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphics.java @@ -38,17 +38,20 @@ package net.sourceforge.plantuml.eps; import java.awt.Color; import java.awt.geom.PathIterator; import java.awt.image.BufferedImage; +import java.util.List; import java.util.Locale; import java.util.StringTokenizer; -import net.sourceforge.plantuml.BackSlash; +import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.ShadowManager; -import net.sourceforge.plantuml.ugraphic.UPath; -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.HColorGradient; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.utils.MathUtils; import net.sourceforge.plantuml.version.Version; @@ -840,4 +843,29 @@ public class EpsGraphics { } } + public void drawOk(DotPath dotPath, double x, double y) { + // boolean first = true; + for (XCubicCurve2D bez : dotPath.getBeziers()) { + bez = new XCubicCurve2D(x + bez.x1, y + bez.y1, x + bez.ctrlx1, y + bez.ctrly1, x + bez.ctrlx2, + y + bez.ctrly2, x + bez.x2, y + bez.y2); + this.epsLine(bez.x1, bez.y1, bez.x2, bez.y2); + } + } + + public void drawBezier(List beziers, double x, double y) { + this.newpathDot(); + final boolean dashed = false; + boolean first = true; + for (XCubicCurve2D bez : beziers) { + bez = new XCubicCurve2D(x + bez.x1, y + bez.y1, x + bez.ctrlx1, y + bez.ctrly1, x + bez.ctrlx2, + y + bez.ctrly2, x + bez.x2, y + bez.y2); + if (first) { + this.movetoNoMacro(bez.x1, bez.y1); + first = dashed; + } + this.curvetoNoMacro(bez.ctrlx1, bez.ctrly1, bez.ctrlx2, bez.ctrly2, bez.x2, bez.y2); + } + this.closepathDot(); + } + } diff --git a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java index 5362ccc0a..8298307e2 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.eps; import java.io.UnsupportedEncodingException; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UFontContext; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.font.UFontContext; public class EpsGraphicsMacroAndText extends EpsGraphicsMacro { diff --git a/src/net/sourceforge/plantuml/error/PSystemError.java b/src/net/sourceforge/plantuml/error/PSystemError.java index b1dce25bb..e92136252 100644 --- a/src/net/sourceforge/plantuml/error/PSystemError.java +++ b/src/net/sourceforge/plantuml/error/PSystemError.java @@ -44,7 +44,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; @@ -61,35 +60,36 @@ import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.eggs.PSystemWelcome; import net.sourceforge.plantuml.flashcode.FlashCodeFactory; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.GraphicPosition; import net.sourceforge.plantuml.graphic.GraphicStrings; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockRaw; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.svek.GraphvizCrash; import net.sourceforge.plantuml.svek.TextBlockBackcolored; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.PixelImage; -import net.sourceforge.plantuml.ugraphic.UFont; 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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.LicenseInfo; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; @@ -265,8 +265,10 @@ public abstract class PSystemError extends PlainDiagram { udrawable = addMessageLiberapay(udrawable); } else if (min == 30 || min == 39 || min == 48) { udrawable = addMessageDedication(udrawable); + // ::comment when WASM } else if (getSource().containsIgnoreCase("arecibo")) { udrawable = addMessageArecibo(udrawable); + // ::done } return udrawable; } @@ -342,7 +344,6 @@ public abstract class PSystemError extends PlainDiagram { TextBlock result = TextBlockUtils.mergeTB(message, source, HorizontalAlignment.LEFT); return result; } - // ::done private TextBlock addMessageArecibo(final TextBlock source) throws IOException { final UImage message = new UImage( @@ -350,6 +351,7 @@ public abstract class PSystemError extends PlainDiagram { TextBlock result = TextBlockUtils.mergeLR(source, TextBlockUtils.fromUImage(message), VerticalAlignment.TOP); return result; } + // ::done private TextBlockBackcolored getMessageDedication() { final HColorSimple backColor = (HColorSimple) HColorSet.instance().getColorOrWhite("#eae2c9"); diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java b/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java index 2fac42105..707cd9f4f 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class PSystemErrorEmpty extends PSystemError { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java b/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java index 809148f9c..80d642e48 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class PSystemErrorPreprocessor extends PSystemError { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java b/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java index 53f7e7e77..294c019ff 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java @@ -41,7 +41,7 @@ import java.util.List; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class PSystemErrorUtils { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorV2.java b/src/net/sourceforge/plantuml/error/PSystemErrorV2.java index 48c4d5117..8bb8d1db6 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorV2.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorV2.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class PSystemErrorV2 extends PSystemError { diff --git a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java index 73f30b1eb..e4b5cf741 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java +++ b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java @@ -40,17 +40,17 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.golem.Tile; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.Shadowable; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColors; public class ActivityBox extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java index a4817a6b7..3b1d71bf6 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.flowdiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.golem.TileGeometry; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLineSimple extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java index efb7141a9..b05c1bb73 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.flowdiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.golem.TileGeometry; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java index 93ce0d50f..a7463f5d4 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java +++ b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java @@ -59,17 +59,17 @@ import net.sourceforge.plantuml.golem.TileArea; import net.sourceforge.plantuml.golem.TileGeometry; import net.sourceforge.plantuml.golem.TilesField; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; public class FlowDiagram extends UmlDiagram implements TextBlock { diff --git a/src/net/sourceforge/plantuml/gitlog/GitCurve.java b/src/net/sourceforge/plantuml/gitlog/GitCurve.java index 7bd01ee0f..817ffc061 100644 --- a/src/net/sourceforge/plantuml/gitlog/GitCurve.java +++ b/src/net/sourceforge/plantuml/gitlog/GitCurve.java @@ -40,10 +40,10 @@ import h.ST_splines; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.jsondiagram.Arrow; import net.sourceforge.plantuml.jsondiagram.Mirror; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class GitCurve { diff --git a/src/net/sourceforge/plantuml/gitlog/GitDiagram.java b/src/net/sourceforge/plantuml/gitlog/GitDiagram.java index d2589ce03..caec8deaa 100644 --- a/src/net/sourceforge/plantuml/gitlog/GitDiagram.java +++ b/src/net/sourceforge/plantuml/gitlog/GitDiagram.java @@ -47,11 +47,11 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; 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; public class GitDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java b/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java index 6638e51f9..98f7adacf 100644 --- a/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java +++ b/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.command.PSystemAbstractFactory; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class GitDiagramFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/gitlog/MagicBox.java b/src/net/sourceforge/plantuml/gitlog/MagicBox.java index a93a623db..49cdffc80 100644 --- a/src/net/sourceforge/plantuml/gitlog/MagicBox.java +++ b/src/net/sourceforge/plantuml/gitlog/MagicBox.java @@ -37,21 +37,21 @@ package net.sourceforge.plantuml.gitlog; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UFont; 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.HColor; public class MagicBox { diff --git a/src/net/sourceforge/plantuml/gitlog/SmetanaForGit.java b/src/net/sourceforge/plantuml/gitlog/SmetanaForGit.java index f96d2777b..a57667fab 100644 --- a/src/net/sourceforge/plantuml/gitlog/SmetanaForGit.java +++ b/src/net/sourceforge/plantuml/gitlog/SmetanaForGit.java @@ -56,15 +56,15 @@ import h.ST_Agraph_s; import h.ST_GVC_s; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.jsondiagram.Mirror; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import smetana.core.CString; import smetana.core.Macro; import smetana.core.Z; diff --git a/src/net/sourceforge/plantuml/golem/Tile.java b/src/net/sourceforge/plantuml/golem/Tile.java index 22139e05e..942e25c3c 100644 --- a/src/net/sourceforge/plantuml/golem/Tile.java +++ b/src/net/sourceforge/plantuml/golem/Tile.java @@ -43,16 +43,16 @@ import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UEllipse; -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.HColors; public class Tile extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/golem/TilesField.java b/src/net/sourceforge/plantuml/golem/TilesField.java index 90304c7dc..70ab1e30d 100644 --- a/src/net/sourceforge/plantuml/golem/TilesField.java +++ b/src/net/sourceforge/plantuml/golem/TilesField.java @@ -45,12 +45,12 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class TilesField extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java b/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java index 64b40ed67..976fdf507 100644 --- a/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java +++ b/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java @@ -36,7 +36,8 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XRectangle2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; public abstract class AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/AddStyle.java b/src/net/sourceforge/plantuml/graphic/AddStyle.java index 56654b375..7c11d1620 100644 --- a/src/net/sourceforge/plantuml/graphic/AddStyle.java +++ b/src/net/sourceforge/plantuml/graphic/AddStyle.java @@ -35,7 +35,8 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; public class AddStyle implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/BigFrame.java b/src/net/sourceforge/plantuml/graphic/BigFrame.java index 20aca3de8..4838c842a 100644 --- a/src/net/sourceforge/plantuml/graphic/BigFrame.java +++ b/src/net/sourceforge/plantuml/graphic/BigFrame.java @@ -35,13 +35,15 @@ */ package net.sourceforge.plantuml.graphic; +import net.atmp.SpecialText; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.Shadowable; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class BigFrame extends AbstractTextBlock { private final TextBlock title; diff --git a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java index 3aa2e4925..fa03cc20d 100644 --- a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java +++ b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java @@ -36,12 +36,13 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -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; public class CircledCharacter extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java b/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java index b91a51b0a..6019e4a41 100644 --- a/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java +++ b/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java @@ -35,11 +35,12 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; class ColorAndSizeChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/ColorChange.java b/src/net/sourceforge/plantuml/graphic/ColorChange.java index 0c0ffa77d..ff34e57d8 100644 --- a/src/net/sourceforge/plantuml/graphic/ColorChange.java +++ b/src/net/sourceforge/plantuml/graphic/ColorChange.java @@ -35,11 +35,12 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; class ColorChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/DisplayUtils.java b/src/net/sourceforge/plantuml/graphic/DisplayUtils.java index 0be2bf469..25ae61a7e 100644 --- a/src/net/sourceforge/plantuml/graphic/DisplayUtils.java +++ b/src/net/sourceforge/plantuml/graphic/DisplayUtils.java @@ -35,8 +35,9 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.SpriteContainer; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.sprite.SpriteContainer; public class DisplayUtils { diff --git a/src/net/sourceforge/plantuml/graphic/ExposantChange.java b/src/net/sourceforge/plantuml/graphic/ExposantChange.java index 148bd9816..02f35c447 100644 --- a/src/net/sourceforge/plantuml/graphic/ExposantChange.java +++ b/src/net/sourceforge/plantuml/graphic/ExposantChange.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; + class ExposantChange implements FontChange { private final FontPosition fontPosition; diff --git a/src/net/sourceforge/plantuml/graphic/FontChange.java b/src/net/sourceforge/plantuml/graphic/FontChange.java index 10af28215..0ad1ba0e3 100644 --- a/src/net/sourceforge/plantuml/graphic/FontChange.java +++ b/src/net/sourceforge/plantuml/graphic/FontChange.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; + public interface FontChange extends HtmlCommand { FontConfiguration apply(FontConfiguration initial); diff --git a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java index 6d8b3ed8b..fbc777439 100644 --- a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java +++ b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java @@ -36,9 +36,10 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; class FontFamilyChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/FontPosition.java b/src/net/sourceforge/plantuml/graphic/FontPosition.java index 1dddd7a9c..182c4c5f7 100644 --- a/src/net/sourceforge/plantuml/graphic/FontPosition.java +++ b/src/net/sourceforge/plantuml/graphic/FontPosition.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.UFont; public enum FontPosition { NORMAL, EXPOSANT, INDICE; diff --git a/src/net/sourceforge/plantuml/graphic/FontStyle.java b/src/net/sourceforge/plantuml/graphic/FontStyle.java index 252f02f0a..ee54be2da 100644 --- a/src/net/sourceforge/plantuml/graphic/FontStyle.java +++ b/src/net/sourceforge/plantuml/graphic/FontStyle.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.graphic; import java.awt.Font; import java.util.EnumSet; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; public enum FontStyle { PLAIN, ITALIC, BOLD, UNDERLINE, STRIKE, WAVE, BACKCOLOR; diff --git a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java index f574b1190..a8a0311d8 100644 --- a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java +++ b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java @@ -42,19 +42,22 @@ import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.IEntityImage; import net.sourceforge.plantuml.svek.Margins; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -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.HColors; public class GraphicStrings extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java b/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java index cb4f89219..a62f2a8f1 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java @@ -39,13 +39,13 @@ import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.LinkStyle; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.style.PName; 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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class HtmlColorAndStyle { diff --git a/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java b/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java index 13a41c9b9..3d7a3d74c 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.graphic; import java.util.EnumSet; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; class HtmlCommandFactory { diff --git a/src/net/sourceforge/plantuml/graphic/Img.java b/src/net/sourceforge/plantuml/graphic/Img.java index 6d2b37570..e25f99bd3 100644 --- a/src/net/sourceforge/plantuml/graphic/Img.java +++ b/src/net/sourceforge/plantuml/graphic/Img.java @@ -41,10 +41,10 @@ import java.io.IOException; import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.FileUtils; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SURL; diff --git a/src/net/sourceforge/plantuml/graphic/Line.java b/src/net/sourceforge/plantuml/graphic/Line.java index 0b6a7a320..8a2e7e009 100644 --- a/src/net/sourceforge/plantuml/graphic/Line.java +++ b/src/net/sourceforge/plantuml/graphic/Line.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; + public interface Line extends TextBlock { HorizontalAlignment getHorizontalAlignment(); diff --git a/src/net/sourceforge/plantuml/graphic/Rainbow.java b/src/net/sourceforge/plantuml/graphic/Rainbow.java index 290b97eed..297dce0c0 100644 --- a/src/net/sourceforge/plantuml/graphic/Rainbow.java +++ b/src/net/sourceforge/plantuml/graphic/Rainbow.java @@ -41,14 +41,14 @@ import java.util.List; import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; 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.HColors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class Rainbow { diff --git a/src/net/sourceforge/plantuml/graphic/RemoveStyle.java b/src/net/sourceforge/plantuml/graphic/RemoveStyle.java index 6b2d7dc2a..035223466 100644 --- a/src/net/sourceforge/plantuml/graphic/RemoveStyle.java +++ b/src/net/sourceforge/plantuml/graphic/RemoveStyle.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; + class RemoveStyle implements FontChange { private final FontStyle style; diff --git a/src/net/sourceforge/plantuml/graphic/ResetFont.java b/src/net/sourceforge/plantuml/graphic/ResetFont.java index b8eb57d1d..1d1d29463 100644 --- a/src/net/sourceforge/plantuml/graphic/ResetFont.java +++ b/src/net/sourceforge/plantuml/graphic/ResetFont.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; + class ResetFont implements FontChange { public FontConfiguration apply(FontConfiguration initial) { diff --git a/src/net/sourceforge/plantuml/graphic/SimpleTextBlockBordered.java b/src/net/sourceforge/plantuml/graphic/SimpleTextBlockBordered.java index 8f2141127..0820a13e1 100644 --- a/src/net/sourceforge/plantuml/graphic/SimpleTextBlockBordered.java +++ b/src/net/sourceforge/plantuml/graphic/SimpleTextBlockBordered.java @@ -36,10 +36,11 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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; class SimpleTextBlockBordered extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/SingleLine.java b/src/net/sourceforge/plantuml/graphic/SingleLine.java index 96ea63111..0eee7bcf3 100644 --- a/src/net/sourceforge/plantuml/graphic/SingleLine.java +++ b/src/net/sourceforge/plantuml/graphic/SingleLine.java @@ -38,12 +38,15 @@ package net.sourceforge.plantuml.graphic; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.SpriteContainer; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; class SingleLine extends AbstractTextBlock implements Line { diff --git a/src/net/sourceforge/plantuml/graphic/SizeChange.java b/src/net/sourceforge/plantuml/graphic/SizeChange.java index a76302072..44eb429d5 100644 --- a/src/net/sourceforge/plantuml/graphic/SizeChange.java +++ b/src/net/sourceforge/plantuml/graphic/SizeChange.java @@ -35,9 +35,10 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; class SizeChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/Splitter.java b/src/net/sourceforge/plantuml/graphic/Splitter.java index ddf4b0a82..e8ffe48cd 100644 --- a/src/net/sourceforge/plantuml/graphic/Splitter.java +++ b/src/net/sourceforge/plantuml/graphic/Splitter.java @@ -42,10 +42,10 @@ import java.util.EnumSet; import java.util.List; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.emoji.Emoji; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.sprite.SpriteUtils; public class Splitter { diff --git a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java index b077fc321..41d261227 100644 --- a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java +++ b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java @@ -40,9 +40,9 @@ import java.util.Map; import java.util.TreeMap; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class SvgAttributes { diff --git a/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java b/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java index da2e8093a..2b7e6eaab 100644 --- a/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java +++ b/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java @@ -35,9 +35,10 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; class SvgAttributesChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/SymbolContext.java b/src/net/sourceforge/plantuml/graphic/SymbolContext.java index 330a17e23..3dbacc71f 100644 --- a/src/net/sourceforge/plantuml/graphic/SymbolContext.java +++ b/src/net/sourceforge/plantuml/graphic/SymbolContext.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColors; public class SymbolContext { diff --git a/src/net/sourceforge/plantuml/graphic/Text.java b/src/net/sourceforge/plantuml/graphic/Text.java index 7e373872a..c3d7a04c8 100644 --- a/src/net/sourceforge/plantuml/graphic/Text.java +++ b/src/net/sourceforge/plantuml/graphic/Text.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.BackSlash; +import net.sourceforge.plantuml.text.BackSlash; public class Text implements HtmlCommand { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlock.java b/src/net/sourceforge/plantuml/graphic/TextBlock.java index 5fece0888..eea77a201 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlock.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlock.java @@ -37,8 +37,9 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; public interface TextBlock extends UDrawable, UShape { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java index bcb6aff5e..2666593f7 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java @@ -38,10 +38,12 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; public class TextBlockArrow extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockArrow2.java b/src/net/sourceforge/plantuml/graphic/TextBlockArrow2.java index 5e88b9593..953fc2c7a 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockArrow2.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockArrow2.java @@ -39,11 +39,13 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.GuideLine; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TextBlockArrow2 extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java index 736cfb544..fea49a4ea 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java @@ -37,14 +37,15 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.SheetBlock2; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.ugraphic.Shadowable; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class TextBlockBordered extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java b/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java index 24d88bbc0..929112118 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class TextBlockEmpty extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java b/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java index 0a6ef24e6..a64eedbda 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java @@ -36,10 +36,11 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TextBlockGeneric extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java b/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java index 58129ebec..46d6d513e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java @@ -39,8 +39,9 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockHorizontal extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java index 577ee0fd3..058a024bd 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java @@ -37,12 +37,13 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.Ports; 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.HColors; public class TextBlockLineBefore extends AbstractTextBlock implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java b/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java index e07822dda..9c4b76f78 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java @@ -37,12 +37,13 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class TextBlockMarged extends AbstractTextBlock implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java b/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java index ec8ae4ce1..391991f32 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java @@ -36,8 +36,10 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class TextBlockMinWidth extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockRaw.java b/src/net/sourceforge/plantuml/graphic/TextBlockRaw.java index e7dadea34..fd909711c 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockRaw.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockRaw.java @@ -39,8 +39,10 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockRaw extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java b/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java index 55d11aae8..b7882742e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java @@ -36,11 +36,12 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TextBlockRecentred extends AbstractTextBlock implements TextBlockBackcolored { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java b/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java index 8daa5a4e7..f91e8dd13 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java @@ -39,12 +39,15 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.SpriteContainer; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public final class TextBlockSimple extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java b/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java index be93d6d3f..f556ef480 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java @@ -36,8 +36,9 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockSprited extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockTitle.java b/src/net/sourceforge/plantuml/graphic/TextBlockTitle.java index 7efaf217a..be9443954 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockTitle.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockTitle.java @@ -35,15 +35,18 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TextBlockTitle implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java b/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java index 5797bb9d9..044909d53 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java @@ -42,18 +42,20 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; -import net.sourceforge.plantuml.posimo.Positionable; -import net.sourceforge.plantuml.posimo.PositionableImpl; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.Positionable; +import net.sourceforge.plantuml.klimt.geom.PositionableImpl; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.LimitFinder; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TextBlockUtils { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java b/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java index 9f042cd7f..9919c4a57 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java @@ -40,14 +40,16 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.svek.WithPorts; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TextBlockVertical2 extends AbstractTextBlock implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockWithUrl.java b/src/net/sourceforge/plantuml/graphic/TextBlockWithUrl.java index 3d2189067..851d12db8 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockWithUrl.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockWithUrl.java @@ -35,11 +35,12 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.url.Url; public class TextBlockWithUrl implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TextLink.java b/src/net/sourceforge/plantuml/graphic/TextLink.java index 9252ca33d..2b8080d5c 100644 --- a/src/net/sourceforge/plantuml/graphic/TextLink.java +++ b/src/net/sourceforge/plantuml/graphic/TextLink.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.url.Url; public class TextLink implements HtmlCommand { diff --git a/src/net/sourceforge/plantuml/graphic/TileImage.java b/src/net/sourceforge/plantuml/graphic/TileImage.java index b4101eaa3..eac56d6be 100644 --- a/src/net/sourceforge/plantuml/graphic/TileImage.java +++ b/src/net/sourceforge/plantuml/graphic/TileImage.java @@ -39,11 +39,12 @@ import java.awt.image.BufferedImage; import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TileImage extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TileImageSvg.java b/src/net/sourceforge/plantuml/graphic/TileImageSvg.java index 61b90314b..8381f0306 100644 --- a/src/net/sourceforge/plantuml/graphic/TileImageSvg.java +++ b/src/net/sourceforge/plantuml/graphic/TileImageSvg.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImageSvg; diff --git a/src/net/sourceforge/plantuml/graphic/TileText.java b/src/net/sourceforge/plantuml/graphic/TileText.java index ad4618121..0beef1bb9 100644 --- a/src/net/sourceforge/plantuml/graphic/TileText.java +++ b/src/net/sourceforge/plantuml/graphic/TileText.java @@ -37,11 +37,13 @@ package net.sourceforge.plantuml.graphic; import java.util.StringTokenizer; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Log; public class TileText extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java b/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java index 1d5dd4770..81a216bf2 100644 --- a/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java +++ b/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.graphic; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class UDrawableUtils { diff --git a/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java b/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java index cf2292a3c..681be87b0 100644 --- a/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java +++ b/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java @@ -39,13 +39,14 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public abstract class UGraphicDelegator implements UGraphic { diff --git a/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java b/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java index 6df5711b2..90a99a19f 100644 --- a/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java +++ b/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.graphic; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public class UGraphicInterceptorUDrawable extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/graphic/USymbol.java b/src/net/sourceforge/plantuml/graphic/USymbol.java index cb147eca4..7d69fad0c 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbol.java +++ b/src/net/sourceforge/plantuml/graphic/USymbol.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; public abstract class USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java index 347c597a0..067e312f1 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java @@ -36,13 +36,15 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolArtifact extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCard.java b/src/net/sourceforge/plantuml/graphic/USymbolCard.java index 4bc3336e8..d5936d123 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCard.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCard.java @@ -36,12 +36,14 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolCard extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java index 424dca5a8..51831ac99 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java @@ -41,15 +41,13 @@ import java.util.Random; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; -// https://stackoverflow.com/questions/39552127/algorithm-for-drawing-random-comic-style-clouds -// http://martin-oehm.de/data/cloud.html -// https://stackoverflow.com/questions/34623855/what-is-the-algorithm-behind-the-pdf-cloud-annotation -// https://stackoverflow.com/questions/3177121/how-do-i-paint-clouds class USymbolCloud extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCollections.java b/src/net/sourceforge/plantuml/graphic/USymbolCollections.java index 7b2f0a2c4..527297c92 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCollections.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCollections.java @@ -36,11 +36,13 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolCollections extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java index d9f6cd55b..76ab49efa 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java @@ -36,12 +36,14 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolComponent1 extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java index 621ce722a..8301dfea7 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java @@ -36,12 +36,14 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolComponent2 extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java index 4f8ab85e0..e53aa453e 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java @@ -36,14 +36,16 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.AbstractUGraphicHorizontalLine; import net.sourceforge.plantuml.ugraphic.UEmpty; 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.HColors; class USymbolDatabase extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFile.java b/src/net/sourceforge/plantuml/graphic/USymbolFile.java index 4807c82ee..e39f08a20 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFile.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFile.java @@ -37,13 +37,15 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolFile extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java index cdb7ff025..c96a2cb35 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java @@ -39,14 +39,16 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class USymbolFolder extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java index 91fe5fa99..e1504460b 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java @@ -35,15 +35,18 @@ */ package net.sourceforge.plantuml.graphic; +import net.atmp.SpecialText; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; 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.HColors; class USymbolFrame extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java b/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java index 14aa5b086..65ac4cfcb 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java @@ -36,10 +36,12 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class USymbolHexagon extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolLabel.java b/src/net/sourceforge/plantuml/graphic/USymbolLabel.java index 7eeeff1a4..d22ac7ebe 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolLabel.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolLabel.java @@ -36,10 +36,12 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolLabel extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolNode.java b/src/net/sourceforge/plantuml/graphic/USymbolNode.java index 2e8e805a2..d10d4fcf0 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolNode.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolNode.java @@ -36,15 +36,17 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.AbstractUGraphicHorizontalLine; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; 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.HColors; class USymbolNode extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolPerson.java b/src/net/sourceforge/plantuml/graphic/USymbolPerson.java index c2e0a3634..2d264264b 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolPerson.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolPerson.java @@ -36,12 +36,14 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolPerson extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java index 715221406..68d1f53f4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java @@ -37,13 +37,15 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Stencil; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.AbstractUGraphicHorizontalLine; 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.HColors; class USymbolQueue extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java b/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java index aa00f3995..1069df4a6 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java @@ -36,12 +36,14 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolRectangle extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java index cd1ec52cf..0f6a741f4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java @@ -38,9 +38,11 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UTranslate; abstract class USymbolSimpleAbstract extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStack.java b/src/net/sourceforge/plantuml/graphic/USymbolStack.java index 8fc40f085..db6b4524b 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStack.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStack.java @@ -37,13 +37,15 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; 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.HColors; class USymbolStack extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java index 9f9e7e976..837cb7910 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java @@ -36,11 +36,13 @@ package net.sourceforge.plantuml.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; class USymbolStorage extends USymbol { diff --git a/src/net/sourceforge/plantuml/graphic/UnusedSpace.java b/src/net/sourceforge/plantuml/graphic/UnusedSpace.java index 4f60bad53..33d95d66e 100644 --- a/src/net/sourceforge/plantuml/graphic/UnusedSpace.java +++ b/src/net/sourceforge/plantuml/graphic/UnusedSpace.java @@ -43,7 +43,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.UFont; public class UnusedSpace { diff --git a/src/net/sourceforge/plantuml/graphic/color/Colors.java b/src/net/sourceforge/plantuml/graphic/color/Colors.java index 54bcc5581..c8360709a 100644 --- a/src/net/sourceforge/plantuml/graphic/color/Colors.java +++ b/src/net/sourceforge/plantuml/graphic/color/Colors.java @@ -46,11 +46,12 @@ import net.sourceforge.plantuml.SkinParamColors; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.LinkStyle; import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; 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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class Colors { diff --git a/src/net/sourceforge/plantuml/help/CommandHelp.java b/src/net/sourceforge/plantuml/help/CommandHelp.java index 4796d0f05..e3c579a9b 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelp.java +++ b/src/net/sourceforge/plantuml/help/CommandHelp.java @@ -37,13 +37,14 @@ package net.sourceforge.plantuml.help; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelp extends SingleLineCommand2 { + // ::remove folder when WASM public CommandHelp() { super(getRegexConcat()); diff --git a/src/net/sourceforge/plantuml/help/CommandHelpColor.java b/src/net/sourceforge/plantuml/help/CommandHelpColor.java index 2febb408b..89e9e3550 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpColor.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpColor.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.help; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpColor extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpFont.java b/src/net/sourceforge/plantuml/help/CommandHelpFont.java index 2868530f9..767407654 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpFont.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpFont.java @@ -39,10 +39,10 @@ import java.awt.GraphicsEnvironment; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpFont extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java b/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java index 983f00f78..db88d4152 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.help; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.syntax.LanguageDescriptor; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java b/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java index 29c8f2e2a..1d6b4dc72 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.help; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpSkinparam extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpTheme.java b/src/net/sourceforge/plantuml/help/CommandHelpTheme.java index 2245a91b0..3351b4de5 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpTheme.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpTheme.java @@ -39,11 +39,11 @@ import java.io.IOException; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.theme.ThemeUtils; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.Log; diff --git a/src/net/sourceforge/plantuml/help/CommandHelpType.java b/src/net/sourceforge/plantuml/help/CommandHelpType.java index d7c8e7171..9fb86ce6c 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpType.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpType.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.help; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.syntax.LanguageDescriptor; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/help/Help.java b/src/net/sourceforge/plantuml/help/Help.java index 2c9dc3dff..be3542f57 100644 --- a/src/net/sourceforge/plantuml/help/Help.java +++ b/src/net/sourceforge/plantuml/help/Help.java @@ -50,11 +50,11 @@ import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.UFont; public class Help extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java index 69367f857..c7c77dbeb 100644 --- a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java +++ b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java @@ -39,15 +39,15 @@ import java.io.IOException; import java.io.StringReader; import java.util.Properties; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemBasicFactory; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.utils.Log; public class PSystemJcckitFactory extends PSystemBasicFactory { @@ -56,8 +56,8 @@ public class PSystemJcckitFactory extends PSystemBasicFactory { private int width; private int height; - public PSystemJcckitFactory(DiagramType diagramType) { - super(diagramType); + public PSystemJcckitFactory() { + super(DiagramType.JCCKIT); } @Override @@ -65,15 +65,9 @@ public class PSystemJcckitFactory extends PSystemBasicFactory { this.data = null; this.width = 640; this.height = 400; - if (getDiagramType() == DiagramType.UML) { - return null; - } else if (getDiagramType() == DiagramType.JCCKIT) { - extractDimension(startLine); - data = new StringBuilder(); - return createSystem(source); - } else { - throw new IllegalStateException(getDiagramType().name()); - } + extractDimension(startLine); + data = new StringBuilder(); + return createSystem(source); } diff --git a/src/net/sourceforge/plantuml/jsondiagram/Arrow.java b/src/net/sourceforge/plantuml/jsondiagram/Arrow.java index 35fcb69ec..a57f3124d 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/Arrow.java +++ b/src/net/sourceforge/plantuml/jsondiagram/Arrow.java @@ -31,10 +31,10 @@ package net.sourceforge.plantuml.jsondiagram; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; public class Arrow { diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonCurve.java b/src/net/sourceforge/plantuml/jsondiagram/JsonCurve.java index e8452febd..6d2b78e35 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/JsonCurve.java +++ b/src/net/sourceforge/plantuml/jsondiagram/JsonCurve.java @@ -38,12 +38,12 @@ import h.ST_bezier; import h.ST_pointf; import h.ST_splines; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class JsonCurve { diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java index 42b14b7ca..078192728 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java +++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java @@ -48,19 +48,19 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.hand.UGraphicHandwritten; import net.sourceforge.plantuml.yaml.Highlighted; diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java index 6a7704f35..9b9e8f0a1 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java +++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java @@ -40,7 +40,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.command.PSystemAbstractFactory; import net.sourceforge.plantuml.core.Diagram; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.json.ParseException; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.style.parser.StyleParsingException; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.yaml.Highlighted; public class JsonDiagramFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java index e6e337faa..b9a4579ac 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java +++ b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java @@ -54,15 +54,15 @@ import h.ST_GVC_s; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.yaml.Highlighted; import smetana.core.CString; import smetana.core.Macro; diff --git a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java index bab1fe578..f3ba98205 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java +++ b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java @@ -44,8 +44,8 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.parser.StyleParser; import net.sourceforge.plantuml.style.parser.StyleParsingException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class StyleExtractor { diff --git a/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java b/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java index 8f69b003d..be2fadd1a 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java +++ b/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java @@ -46,14 +46,18 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonObject.Member; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -63,10 +67,6 @@ import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.yaml.Highlighted; //See TextBlockMap diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java b/src/net/sourceforge/plantuml/klimt/AbstractShadowable.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java rename to src/net/sourceforge/plantuml/klimt/AbstractShadowable.java index f63621746..9ed83c674 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java +++ b/src/net/sourceforge/plantuml/klimt/AbstractShadowable.java @@ -33,9 +33,9 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -abstract class AbstractShadowable implements Shadowable { +public abstract class AbstractShadowable implements Shadowable { private double deltaShadow; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java b/src/net/sourceforge/plantuml/klimt/Arrows.java similarity index 94% rename from src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java rename to src/net/sourceforge/plantuml/klimt/Arrows.java index f04095e60..18558f5b3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java +++ b/src/net/sourceforge/plantuml/klimt/Arrows.java @@ -33,9 +33,8 @@ * * */ -package net.sourceforge.plantuml.activitydiagram3.ftile; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.utils.Direction; public abstract class Arrows { diff --git a/src/net/sourceforge/plantuml/posimo/DotPath.java b/src/net/sourceforge/plantuml/klimt/DotPath.java similarity index 72% rename from src/net/sourceforge/plantuml/posimo/DotPath.java rename to src/net/sourceforge/plantuml/klimt/DotPath.java index 3d41d4b99..f10f62f2c 100644 --- a/src/net/sourceforge/plantuml/posimo/DotPath.java +++ b/src/net/sourceforge/plantuml/klimt/DotPath.java @@ -34,7 +34,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt; import java.awt.Graphics2D; import java.awt.geom.CubicCurve2D; @@ -43,29 +43,24 @@ import java.awt.geom.Line2D; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; -import net.sourceforge.plantuml.EnsureVisible; -import net.sourceforge.plantuml.asciiart.BasicCharArea; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.eps.EpsGraphics; -import net.sourceforge.plantuml.svek.Cluster; -import net.sourceforge.plantuml.svek.ClusterPosition; -import net.sourceforge.plantuml.svek.MinFinder; -import net.sourceforge.plantuml.svek.PointAndAngle; -import net.sourceforge.plantuml.svek.SvgResult; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.USegmentType; -import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.klimt.geom.BezierUtils; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; +import net.sourceforge.plantuml.klimt.geom.MinFinder; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.Moveable; +import net.sourceforge.plantuml.klimt.geom.PointAndAngle; +import net.sourceforge.plantuml.klimt.geom.USegmentType; public class DotPath implements UShape, Moveable { - static class TriPoints { + public static class TriPoints { public TriPoints(XPoint2D p1, XPoint2D p2, XPoint2D p) { x1 = p1.getX(); y1 = p1.getY(); @@ -75,12 +70,12 @@ public class DotPath implements UShape, Moveable { y = p.getY(); } - private final double x1; - private final double y1; - private final double x2; - private final double y2; - private final double x; - private final double y; + public final double x1; + public final double y1; + public final double x2; + public final double y2; + public final double x; + public final double y; // @Override // public String toString() { @@ -101,7 +96,7 @@ public class DotPath implements UShape, Moveable { return result; } - private static DotPath fromBeziers(List beziers) { + public static DotPath fromBeziers(List beziers) { final DotPath result = new DotPath(); result.beziers.addAll(Objects.requireNonNull(beziers)); return result; @@ -110,34 +105,6 @@ public class DotPath implements UShape, Moveable { public DotPath() { } - public DotPath(SvgResult fullSvg) { - if (isPathConsistent(fullSvg.getSvg()) == false) - throw new IllegalArgumentException(); - - final int posC = fullSvg.indexOf("C", 0); - if (posC == -1) - throw new IllegalArgumentException(); - - final XPoint2D start = fullSvg.substring(1, posC).getNextPoint(); - - final List triPoints = new ArrayList<>(); - for (Iterator it = fullSvg.substring(posC + 1).getPoints(" ").iterator(); it.hasNext();) { - final XPoint2D p1 = it.next(); - final XPoint2D p2 = it.next(); - final XPoint2D p = it.next(); - triPoints.add(new TriPoints(p1, p2, p)); - } - double x = start.getX(); - double y = start.getY(); - for (TriPoints p : triPoints) { - final XCubicCurve2D bezier = new XCubicCurve2D(x, y, p.x1, p.y1, p.x2, p.y2, p.x, p.y); - beziers.add(bezier); - x = p.x; - y = p.y; - } - // this.print = triPoints.toString(); - } - public DotPath addCurve(XPoint2D pt1, XPoint2D pt2, XPoint2D pt3, XPoint2D pt4) { final List beziersNew = new ArrayList<>(beziers); beziersNew.add(new XCubicCurve2D(pt1.getX(), pt1.getY(), pt2.getX(), pt2.getY(), pt3.getX(), pt3.getY(), @@ -151,13 +118,6 @@ public class DotPath implements UShape, Moveable { return addCurve(p1, pt2, pt3, pt4); } - public static boolean isPathConsistent(String init) { - if (init.startsWith("M") == false) - return false; - - return true; - } - // private final String print; public XPoint2D getStartPoint() { @@ -378,44 +338,6 @@ public class DotPath implements UShape, Moveable { } - // ::comment when WASM - public void drawOk(EpsGraphics eps, double x, double y) { - // boolean first = true; - for (XCubicCurve2D bez : beziers) { - bez = new XCubicCurve2D(x + bez.x1, y + bez.y1, x + bez.ctrlx1, y + bez.ctrly1, x + bez.ctrlx2, - y + bez.ctrly2, x + bez.x2, y + bez.y2); - eps.epsLine(bez.x1, bez.y1, bez.x2, bez.y2); - } - } - - public void draw(EpsGraphics eps, double x, double y) { - eps.newpathDot(); - final boolean dashed = false; - boolean first = true; - for (XCubicCurve2D bez : beziers) { - bez = new XCubicCurve2D(x + bez.x1, y + bez.y1, x + bez.ctrlx1, y + bez.ctrly1, x + bez.ctrlx2, - y + bez.ctrly2, x + bez.x2, y + bez.y2); - if (first) { - eps.movetoNoMacro(bez.x1, bez.y1); - first = dashed; - } - eps.curvetoNoMacro(bez.ctrlx1, bez.ctrly1, bez.ctrlx2, bez.ctrly2, bez.x2, bez.y2); - } - eps.closepathDot(); - } - - public void draw(BasicCharArea area, double pixelXPerChar, double pixelYPerChar) { - for (XCubicCurve2D bez : beziers) - if (bez.x1 == bez.x2) - area.drawVLine('|', (int) (bez.x1 / pixelXPerChar), (int) (bez.y1 / pixelYPerChar), - (int) (bez.y2 / pixelYPerChar)); - else if (bez.y1 == bez.y2) - area.drawHLine('-', (int) (bez.y1 / pixelYPerChar), (int) (bez.x1 / pixelXPerChar), - (int) (bez.x2 / pixelXPerChar)); - - } - // ::done - public UPath toUPath() { final UPath result = new UPath(comment, codeLine); boolean start = true; @@ -431,7 +353,7 @@ public class DotPath implements UShape, Moveable { return result; } - static String toString(XCubicCurve2D c) { + static public String toString(XCubicCurve2D c) { return "(" + c.x1 + "," + c.y1 + ") " + "(" + c.ctrlx1 + "," + c.ctrly1 + ") " + "(" + c.ctrlx2 + "," + c.ctrly2 + ") " + "(" + c.x2 + "," + c.y2 + ") "; @@ -476,40 +398,35 @@ public class DotPath implements UShape, Moveable { return Collections.unmodifiableList(beziers); } - public DotPath simulateCompound(Cluster head, Cluster tail) { - // if (OptionFlags.USE_COMPOUND) { - // throw new IllegalStateException(); - // } - if (head == null && tail == null) { + public DotPath simulateCompound(ClusterPosition head, ClusterPosition tail) { + if (head == null && tail == null) return this; - } + // System.err.println("head=" + head + " tail=" + tail); DotPath me = this; if (tail != null) { // System.err.println("beziers1=" + this.toString()); - final ClusterPosition clusterPosition = tail.getClusterPosition(); - if (clusterPosition.contains(getStartPoint())) { + if (tail.contains(getStartPoint())) { final DotPath result = new DotPath(); int idx = 0; - while (idx + 1 < this.beziers.size() && clusterPosition.contains(this.beziers.get(idx).getP2())) { - if (clusterPosition.contains(this.beziers.get(idx).getP1()) == false) + while (idx + 1 < this.beziers.size() && tail.contains(this.beziers.get(idx).getP2())) { + if (tail.contains(this.beziers.get(idx).getP1()) == false) throw new IllegalStateException(); idx++; } - if (clusterPosition.contains(this.beziers.get(idx).getP2())) { + if (tail.contains(this.beziers.get(idx).getP2())) { // System.err.println("strange1"); } else { - assert clusterPosition.contains(this.beziers.get(idx).getP1()); - assert clusterPosition.contains(this.beziers.get(idx).getP2()) == false; + assert tail.contains(this.beziers.get(idx).getP1()); + assert tail.contains(this.beziers.get(idx).getP2()) == false; XCubicCurve2D current = this.beziers.get(idx); for (int k = 0; k < 8; k++) { - // System.err.println("length=" + length(current)); final XCubicCurve2D part1 = new XCubicCurve2D(); final XCubicCurve2D part2 = new XCubicCurve2D(); current.subdivide(part1, part2); assert part1.getP2().equals(part2.getP1()); - if (clusterPosition.contains(part1.getP2())) { + if (tail.contains(part1.getP2())) { current = part2; } else { result.beziers.add(0, part2); @@ -524,35 +441,29 @@ public class DotPath implements UShape, Moveable { } } if (head != null) { - // System.err.println("beziers2=" + me.toString()); final DotPath result = new DotPath(); - final ClusterPosition clusterPosition = head.getClusterPosition(); - if (clusterPosition.contains(getEndPoint())) { + if (head.contains(getEndPoint())) { for (XCubicCurve2D current : me.beziers) { - if (clusterPosition.contains(current.getP2()) == false) { + if (head.contains(current.getP2()) == false) { result.beziers.add(current); } else { - if (clusterPosition.contains(current.getP1())) { - // System.err.println("strange2"); + if (head.contains(current.getP1())) { return me; } - assert clusterPosition.contains(current.getP1()) == false; - assert clusterPosition.contains(current.getP2()); + assert head.contains(current.getP1()) == false; + assert head.contains(current.getP2()); for (int k = 0; k < 8; k++) { - // System.err.println("length=" + length(current)); final XCubicCurve2D part1 = new XCubicCurve2D(); final XCubicCurve2D part2 = new XCubicCurve2D(); current.subdivide(part1, part2); assert part1.getP2().equals(part2.getP1()); - if (clusterPosition.contains(part1.getP2())) { + if (head.contains(part1.getP2())) { current = part1; } else { result.beziers.add(part1); current = part2; - // System.err.println("k=" + k + " result=" + result.toString()); } } - // System.err.println("Final Result=" + result.toString()); return result; } } diff --git a/src/net/sourceforge/plantuml/ugraphic/MutableImage.java b/src/net/sourceforge/plantuml/klimt/MutableImage.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/MutableImage.java rename to src/net/sourceforge/plantuml/klimt/MutableImage.java index f25d285cb..37742d3e8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MutableImage.java +++ b/src/net/sourceforge/plantuml/klimt/MutableImage.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/net/sourceforge/plantuml/ugraphic/Shadowable.java b/src/net/sourceforge/plantuml/klimt/Shadowable.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/Shadowable.java rename to src/net/sourceforge/plantuml/klimt/Shadowable.java index 74a557b96..a2c43ec59 100644 --- a/src/net/sourceforge/plantuml/ugraphic/Shadowable.java +++ b/src/net/sourceforge/plantuml/klimt/Shadowable.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public interface Shadowable extends UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java b/src/net/sourceforge/plantuml/klimt/UAntiAliasing.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java rename to src/net/sourceforge/plantuml/klimt/UAntiAliasing.java index 9281d732e..66b078dd1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java +++ b/src/net/sourceforge/plantuml/klimt/UAntiAliasing.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.Graphics2D; import java.awt.RenderingHints; diff --git a/src/net/sourceforge/plantuml/ugraphic/UBackground.java b/src/net/sourceforge/plantuml/klimt/UBackground.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/UBackground.java rename to src/net/sourceforge/plantuml/klimt/UBackground.java index daead3fc1..7fa373bc6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UBackground.java +++ b/src/net/sourceforge/plantuml/klimt/UBackground.java @@ -33,9 +33,9 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public interface UBackground extends UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/UChange.java b/src/net/sourceforge/plantuml/klimt/UChange.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UChange.java rename to src/net/sourceforge/plantuml/klimt/UChange.java index ce9954b94..0992aebc8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UChange.java +++ b/src/net/sourceforge/plantuml/klimt/UChange.java @@ -33,10 +33,8 @@ * * */ -package net.sourceforge.plantuml.ugraphic; - +package net.sourceforge.plantuml.klimt; public interface UChange { - } diff --git a/src/net/sourceforge/plantuml/ugraphic/UClip.java b/src/net/sourceforge/plantuml/klimt/UClip.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/UClip.java rename to src/net/sourceforge/plantuml/klimt/UClip.java index 61da1a268..3c7243569 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UClip.java +++ b/src/net/sourceforge/plantuml/klimt/UClip.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.geom.Line2D; import java.awt.geom.Rectangle2D; diff --git a/src/net/sourceforge/plantuml/ugraphic/UComment.java b/src/net/sourceforge/plantuml/klimt/UComment.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/UComment.java rename to src/net/sourceforge/plantuml/klimt/UComment.java index efbc13ca4..be9478c8c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UComment.java +++ b/src/net/sourceforge/plantuml/klimt/UComment.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public class UComment implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGroupType.java b/src/net/sourceforge/plantuml/klimt/UGroupType.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UGroupType.java rename to src/net/sourceforge/plantuml/klimt/UGroupType.java index 82d864091..5d3f9ea8f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGroupType.java +++ b/src/net/sourceforge/plantuml/klimt/UGroupType.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public enum UGroupType { ID, CLASS diff --git a/src/net/sourceforge/plantuml/ugraphic/UHidden.java b/src/net/sourceforge/plantuml/klimt/UHidden.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UHidden.java rename to src/net/sourceforge/plantuml/klimt/UHidden.java index b8d979cb5..e815551f1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UHidden.java +++ b/src/net/sourceforge/plantuml/klimt/UHidden.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public enum UHidden implements UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/UImage.java b/src/net/sourceforge/plantuml/klimt/UImage.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/UImage.java rename to src/net/sourceforge/plantuml/klimt/UImage.java index 2a2a172b4..3e59d4c42 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UImage.java +++ b/src/net/sourceforge/plantuml/klimt/UImage.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/net/sourceforge/plantuml/ugraphic/ULine.java b/src/net/sourceforge/plantuml/klimt/ULine.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/ULine.java rename to src/net/sourceforge/plantuml/klimt/ULine.java index c7a087d4b..2b51a828d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ULine.java +++ b/src/net/sourceforge/plantuml/klimt/ULine.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.geom.AffineTransform; diff --git a/src/net/sourceforge/plantuml/ugraphic/UMotif.java b/src/net/sourceforge/plantuml/klimt/UMotif.java similarity index 95% rename from src/net/sourceforge/plantuml/ugraphic/UMotif.java rename to src/net/sourceforge/plantuml/klimt/UMotif.java index 69213325a..9fc5431d7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UMotif.java +++ b/src/net/sourceforge/plantuml/klimt/UMotif.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.util.ArrayList; import java.util.Collections; @@ -41,7 +41,7 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.ugraphic.UGraphic; public class UMotif { @@ -63,7 +63,7 @@ public class UMotif { } } - double getLength() { + public double getLength() { return points.get(0).distance(points.get(points.size() - 1)); } @@ -81,14 +81,14 @@ public class UMotif { return h1; } - static XPoint2D convertPoint(char c) { + public static XPoint2D convertPoint(char c) { final int v = convertFromChar(c); final int x = v % 7; final int y = v / 7; return new XPoint2D(x - 3, y - 3); } - static int convertFromChar(char c) { + public static int convertFromChar(char c) { if (c >= 'A' && c <= 'Z') { return c - 'A'; } diff --git a/src/net/sourceforge/plantuml/ugraphic/UParam.java b/src/net/sourceforge/plantuml/klimt/UParam.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/UParam.java rename to src/net/sourceforge/plantuml/klimt/UParam.java index dedcc9b87..23210664e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UParam.java +++ b/src/net/sourceforge/plantuml/klimt/UParam.java @@ -33,9 +33,9 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public interface UParam { diff --git a/src/net/sourceforge/plantuml/ugraphic/UParamNull.java b/src/net/sourceforge/plantuml/klimt/UParamNull.java similarity index 91% rename from src/net/sourceforge/plantuml/ugraphic/UParamNull.java rename to src/net/sourceforge/plantuml/klimt/UParamNull.java index 6e403cf54..2fd4b1da9 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UParamNull.java +++ b/src/net/sourceforge/plantuml/klimt/UParamNull.java @@ -33,10 +33,10 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; public class UParamNull implements UParam { diff --git a/src/net/sourceforge/plantuml/ugraphic/UPath.java b/src/net/sourceforge/plantuml/klimt/UPath.java similarity index 95% rename from src/net/sourceforge/plantuml/ugraphic/UPath.java rename to src/net/sourceforge/plantuml/klimt/UPath.java index 51a5cdb36..f8a9f9ff7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPath.java +++ b/src/net/sourceforge/plantuml/klimt/UPath.java @@ -34,7 +34,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.geom.AffineTransform; import java.util.ArrayList; @@ -42,7 +42,11 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; +import net.sourceforge.plantuml.ugraphic.UGraphic; public class UPath extends AbstractShadowable implements Iterable, UShapeIgnorableForCompression { diff --git a/src/net/sourceforge/plantuml/ugraphic/UPattern.java b/src/net/sourceforge/plantuml/klimt/UPattern.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UPattern.java rename to src/net/sourceforge/plantuml/klimt/UPattern.java index 822cbcd81..c012c9195 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPattern.java +++ b/src/net/sourceforge/plantuml/klimt/UPattern.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public enum UPattern implements UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/UPixel.java b/src/net/sourceforge/plantuml/klimt/UPixel.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UPixel.java rename to src/net/sourceforge/plantuml/klimt/UPixel.java index 6f2533c93..3f23bb613 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPixel.java +++ b/src/net/sourceforge/plantuml/klimt/UPixel.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public class UPixel implements UShape { } diff --git a/src/net/sourceforge/plantuml/ugraphic/UPolygon.java b/src/net/sourceforge/plantuml/klimt/UPolygon.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UPolygon.java rename to src/net/sourceforge/plantuml/klimt/UPolygon.java index 567887595..e6621896c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPolygon.java +++ b/src/net/sourceforge/plantuml/klimt/UPolygon.java @@ -33,14 +33,15 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import java.awt.geom.AffineTransform; import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.geom.MinMax; public class UPolygon extends AbstractShadowable { diff --git a/src/net/sourceforge/plantuml/ugraphic/URectangle.java b/src/net/sourceforge/plantuml/klimt/URectangle.java similarity index 95% rename from src/net/sourceforge/plantuml/ugraphic/URectangle.java rename to src/net/sourceforge/plantuml/klimt/URectangle.java index 58b43cc5c..485bf7834 100644 --- a/src/net/sourceforge/plantuml/ugraphic/URectangle.java +++ b/src/net/sourceforge/plantuml/klimt/URectangle.java @@ -33,10 +33,13 @@ * Contribution: Miguel Esteves * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.ugraphic.UEmpty; +import net.sourceforge.plantuml.ugraphic.UGraphic; public class URectangle extends AbstractShadowable implements UShapeSized, UShapeIgnorableForCompression { diff --git a/src/net/sourceforge/plantuml/ugraphic/UShape.java b/src/net/sourceforge/plantuml/klimt/UShape.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UShape.java rename to src/net/sourceforge/plantuml/klimt/UShape.java index f11283a9b..b0234282b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UShape.java +++ b/src/net/sourceforge/plantuml/klimt/UShape.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public interface UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UShapeIgnorableForCompression.java b/src/net/sourceforge/plantuml/klimt/UShapeIgnorableForCompression.java similarity index 90% rename from src/net/sourceforge/plantuml/ugraphic/UShapeIgnorableForCompression.java rename to src/net/sourceforge/plantuml/klimt/UShapeIgnorableForCompression.java index dc5b28904..559479070 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UShapeIgnorableForCompression.java +++ b/src/net/sourceforge/plantuml/klimt/UShapeIgnorableForCompression.java @@ -33,9 +33,10 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.ugraphic.UGraphic; public interface UShapeIgnorableForCompression extends UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UShapeSized.java b/src/net/sourceforge/plantuml/klimt/UShapeSized.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UShapeSized.java rename to src/net/sourceforge/plantuml/klimt/UShapeSized.java index fb4974b50..1575be92e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UShapeSized.java +++ b/src/net/sourceforge/plantuml/klimt/UShapeSized.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public interface UShapeSized extends UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UStroke.java b/src/net/sourceforge/plantuml/klimt/UStroke.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/UStroke.java rename to src/net/sourceforge/plantuml/klimt/UStroke.java index 0844f219c..268080fd8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UStroke.java +++ b/src/net/sourceforge/plantuml/klimt/UStroke.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; public class UStroke implements UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/UText.java b/src/net/sourceforge/plantuml/klimt/UText.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/UText.java rename to src/net/sourceforge/plantuml/klimt/UText.java index 34cc6ae75..8fb83fde0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UText.java +++ b/src/net/sourceforge/plantuml/klimt/UText.java @@ -33,10 +33,10 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class UText implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java b/src/net/sourceforge/plantuml/klimt/UTranslate.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/UTranslate.java rename to src/net/sourceforge/plantuml/klimt/UTranslate.java index f7850b7be..9819dc2cf 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java +++ b/src/net/sourceforge/plantuml/klimt/UTranslate.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/graphic/color/ColorHSB.java b/src/net/sourceforge/plantuml/klimt/color/ColorHSB.java similarity index 94% rename from src/net/sourceforge/plantuml/graphic/color/ColorHSB.java rename to src/net/sourceforge/plantuml/klimt/color/ColorHSB.java index cafefa1fa..acd66a90b 100644 --- a/src/net/sourceforge/plantuml/graphic/color/ColorHSB.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorHSB.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.graphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; import java.util.Locale; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapper.java b/src/net/sourceforge/plantuml/klimt/color/ColorMapper.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/color/ColorMapper.java rename to src/net/sourceforge/plantuml/klimt/color/ColorMapper.java index 7e4cea3ba..1e0cd0d9d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorMapper.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorMapper.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorOrder.java b/src/net/sourceforge/plantuml/klimt/color/ColorOrder.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/color/ColorOrder.java rename to src/net/sourceforge/plantuml/klimt/color/ColorOrder.java index ffbf35a4f..d5f5ddced 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorOrder.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorOrder.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/graphic/color/ColorParser.java b/src/net/sourceforge/plantuml/klimt/color/ColorParser.java similarity index 92% rename from src/net/sourceforge/plantuml/graphic/color/ColorParser.java rename to src/net/sourceforge/plantuml/klimt/color/ColorParser.java index c481ffa7d..f12c7a062 100644 --- a/src/net/sourceforge/plantuml/graphic/color/ColorParser.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorParser.java @@ -33,12 +33,11 @@ * * */ -package net.sourceforge.plantuml.graphic.color; +package net.sourceforge.plantuml.klimt.color; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ColorParser { diff --git a/src/net/sourceforge/plantuml/graphic/color/ColorType.java b/src/net/sourceforge/plantuml/klimt/color/ColorType.java similarity index 96% rename from src/net/sourceforge/plantuml/graphic/color/ColorType.java rename to src/net/sourceforge/plantuml/klimt/color/ColorType.java index 16a0a68ce..6fb92f09f 100644 --- a/src/net/sourceforge/plantuml/graphic/color/ColorType.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorType.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.graphic.color; +package net.sourceforge.plantuml.klimt.color; public enum ColorType { TEXT, LINE, BACK, HEADER, ARROW; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/ColorUtils.java b/src/net/sourceforge/plantuml/klimt/color/ColorUtils.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/color/ColorUtils.java rename to src/net/sourceforge/plantuml/klimt/color/ColorUtils.java index aef16f39e..1671939c2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/ColorUtils.java +++ b/src/net/sourceforge/plantuml/klimt/color/ColorUtils.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColor.java b/src/net/sourceforge/plantuml/klimt/color/HColor.java similarity index 94% rename from src/net/sourceforge/plantuml/ugraphic/color/HColor.java rename to src/net/sourceforge/plantuml/klimt/color/HColor.java index dafa890cf..9e39f51ef 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColor.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColor.java @@ -32,13 +32,13 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; public abstract class HColor implements UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java b/src/net/sourceforge/plantuml/klimt/color/HColorAutomagic.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java rename to src/net/sourceforge/plantuml/klimt/color/HColorAutomagic.java index 182a8a3dc..6ade0afbc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorAutomagic.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorAutomagic.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; class HColorAutomagic extends HColor { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java b/src/net/sourceforge/plantuml/klimt/color/HColorGradient.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java rename to src/net/sourceforge/plantuml/klimt/color/HColorGradient.java index 59d5f7b9a..b8859997b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorGradient.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorGradient.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java b/src/net/sourceforge/plantuml/klimt/color/HColorMiddle.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java rename to src/net/sourceforge/plantuml/klimt/color/HColorMiddle.java index 55693a62e..09f9b7984 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorMiddle.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorMiddle.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java b/src/net/sourceforge/plantuml/klimt/color/HColorScheme.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java rename to src/net/sourceforge/plantuml/klimt/color/HColorScheme.java index 14d43b3cd..38bca4f5c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorScheme.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorScheme.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; class HColorScheme extends HColor { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java b/src/net/sourceforge/plantuml/klimt/color/HColorSet.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java rename to src/net/sourceforge/plantuml/klimt/color/HColorSet.java index 409d66943..242b799f1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorSet.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; import java.util.Collection; @@ -45,8 +45,8 @@ import java.util.Set; import java.util.TreeSet; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; public class HColorSet { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java b/src/net/sourceforge/plantuml/klimt/color/HColorSimple.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java rename to src/net/sourceforge/plantuml/klimt/color/HColorSimple.java index efd114297..f7302eff7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColorSimple.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColors.java b/src/net/sourceforge/plantuml/klimt/color/HColors.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/color/HColors.java rename to src/net/sourceforge/plantuml/klimt/color/HColors.java index fb31ed234..006dc7334 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColors.java +++ b/src/net/sourceforge/plantuml/klimt/color/HColors.java @@ -33,11 +33,11 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; import net.sourceforge.plantuml.ugraphic.UGraphic; public class HColors { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HSLColor.java b/src/net/sourceforge/plantuml/klimt/color/HSLColor.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/color/HSLColor.java rename to src/net/sourceforge/plantuml/klimt/color/HSLColor.java index 7e20ad5cf..adbf66fca 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HSLColor.java +++ b/src/net/sourceforge/plantuml/klimt/color/HSLColor.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.awt.Color; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HUSLColorConverter.java b/src/net/sourceforge/plantuml/klimt/color/HUSLColorConverter.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/color/HUSLColorConverter.java rename to src/net/sourceforge/plantuml/klimt/color/HUSLColorConverter.java index 4adfd21f9..b0dd1caad 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HUSLColorConverter.java +++ b/src/net/sourceforge/plantuml/klimt/color/HUSLColorConverter.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorException.java b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorException.java rename to src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java index 2be3f3ceb..bcf0a0ffc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorException.java +++ b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; public class NoSuchColorException extends Exception { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorRuntimeException.java b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorRuntimeException.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorRuntimeException.java rename to src/net/sourceforge/plantuml/klimt/color/NoSuchColorRuntimeException.java index ab401d177..7c3b6dad3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/NoSuchColorRuntimeException.java +++ b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorRuntimeException.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.color; +package net.sourceforge.plantuml.klimt.color; public class NoSuchColorRuntimeException extends RuntimeException { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/CompressionMode.java b/src/net/sourceforge/plantuml/klimt/comp/CompressionMode.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/comp/CompressionMode.java rename to src/net/sourceforge/plantuml/klimt/comp/CompressionMode.java index 1fb4f917a..192c489f9 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/CompressionMode.java +++ b/src/net/sourceforge/plantuml/klimt/comp/CompressionMode.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.comp; +package net.sourceforge.plantuml.klimt.comp; public enum CompressionMode { ON_X, ON_Y diff --git a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java b/src/net/sourceforge/plantuml/klimt/font/FontConfiguration.java similarity index 95% rename from src/net/sourceforge/plantuml/graphic/FontConfiguration.java rename to src/net/sourceforge/plantuml/klimt/font/FontConfiguration.java index e38d454b8..21e7557a2 100644 --- a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java +++ b/src/net/sourceforge/plantuml/klimt/font/FontConfiguration.java @@ -33,24 +33,25 @@ * * */ -package net.sourceforge.plantuml.graphic; +package net.sourceforge.plantuml.klimt.font; import java.util.EnumSet; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.graphic.FontPosition; +import net.sourceforge.plantuml.graphic.FontStyle; +import net.sourceforge.plantuml.graphic.SvgAttributes; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class FontConfiguration { @@ -217,7 +218,7 @@ public class FontConfiguration { return changeColor(color); } - FontConfiguration changeExtendedColor(HColor newExtendedColor) { + public FontConfiguration changeExtendedColor(HColor newExtendedColor) { return new FontConfiguration(styles, motherFont, motherColor, currentFont, currentColor, newExtendedColor, fontPosition, svgAttributes, hyperlinkColor, hyperlinkUnderlineStroke, tabSize); } diff --git a/src/net/sourceforge/plantuml/FontParam.java b/src/net/sourceforge/plantuml/klimt/font/FontParam.java similarity index 97% rename from src/net/sourceforge/plantuml/FontParam.java rename to src/net/sourceforge/plantuml/klimt/font/FontParam.java index 460596daf..67e770a6c 100644 --- a/src/net/sourceforge/plantuml/FontParam.java +++ b/src/net/sourceforge/plantuml/klimt/font/FontParam.java @@ -33,12 +33,13 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.klimt.font; import java.awt.Font; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.graphic.FontConfiguration; +import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.UmlDiagramType; + import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; @@ -47,7 +48,7 @@ interface FontParamConstant { String COLOR = "black"; } -@HaxeIgnored + public enum FontParam { TIMING(12, Font.PLAIN), // ACTIVITY(12, Font.PLAIN), // diff --git a/src/net/sourceforge/plantuml/graphic/StringBounder.java b/src/net/sourceforge/plantuml/klimt/font/StringBounder.java similarity index 89% rename from src/net/sourceforge/plantuml/graphic/StringBounder.java rename to src/net/sourceforge/plantuml/klimt/font/StringBounder.java index 14347cd4a..7fd03c6eb 100644 --- a/src/net/sourceforge/plantuml/graphic/StringBounder.java +++ b/src/net/sourceforge/plantuml/klimt/font/StringBounder.java @@ -33,11 +33,9 @@ * * */ -package net.sourceforge.plantuml.graphic; +package net.sourceforge.plantuml.klimt.font; -import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.UFont; public interface StringBounder { @@ -45,6 +43,6 @@ public interface StringBounder { public double getDescent(UFont font, String text); - public FileFormat getNativeFormat(); + public boolean matchesProperty(String propertyName); } diff --git a/src/net/sourceforge/plantuml/graphic/StringBounderRaw.java b/src/net/sourceforge/plantuml/klimt/font/StringBounderRaw.java similarity index 96% rename from src/net/sourceforge/plantuml/graphic/StringBounderRaw.java rename to src/net/sourceforge/plantuml/klimt/font/StringBounderRaw.java index d6f71721b..2022c67ec 100644 --- a/src/net/sourceforge/plantuml/graphic/StringBounderRaw.java +++ b/src/net/sourceforge/plantuml/klimt/font/StringBounderRaw.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.graphic; +package net.sourceforge.plantuml.klimt.font; import java.awt.font.FontRenderContext; import java.awt.font.LineMetrics; @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.text.RichText; import net.sourceforge.plantuml.text.StyledString; -import net.sourceforge.plantuml.ugraphic.UFont; public abstract class StringBounderRaw implements StringBounder { diff --git a/src/net/sourceforge/plantuml/ugraphic/UFont.java b/src/net/sourceforge/plantuml/klimt/font/UFont.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/UFont.java rename to src/net/sourceforge/plantuml/klimt/font/UFont.java index 357a23762..448430142 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFont.java +++ b/src/net/sourceforge/plantuml/klimt/font/UFont.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.font; import java.awt.Font; import java.awt.GraphicsEnvironment; diff --git a/src/net/sourceforge/plantuml/ugraphic/UFontContext.java b/src/net/sourceforge/plantuml/klimt/font/UFontContext.java similarity index 96% rename from src/net/sourceforge/plantuml/ugraphic/UFontContext.java rename to src/net/sourceforge/plantuml/klimt/font/UFontContext.java index 2bd24ede2..b51a5408d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFontContext.java +++ b/src/net/sourceforge/plantuml/klimt/font/UFontContext.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.font; public enum UFontContext { JAVA, EPS, SVG, DOT, SYSTEM, PNG diff --git a/src/net/sourceforge/plantuml/BasicEnsureVisible.java b/src/net/sourceforge/plantuml/klimt/geom/BasicEnsureVisible.java similarity index 97% rename from src/net/sourceforge/plantuml/BasicEnsureVisible.java rename to src/net/sourceforge/plantuml/klimt/geom/BasicEnsureVisible.java index 45fa90653..f9e4d1697 100644 --- a/src/net/sourceforge/plantuml/BasicEnsureVisible.java +++ b/src/net/sourceforge/plantuml/klimt/geom/BasicEnsureVisible.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.klimt.geom; public class BasicEnsureVisible implements EnsureVisible { diff --git a/src/net/sourceforge/plantuml/posimo/BezierUtils.java b/src/net/sourceforge/plantuml/klimt/geom/BezierUtils.java similarity index 98% rename from src/net/sourceforge/plantuml/posimo/BezierUtils.java rename to src/net/sourceforge/plantuml/klimt/geom/BezierUtils.java index 5e0ee9eaa..b5e7a9ec4 100644 --- a/src/net/sourceforge/plantuml/posimo/BezierUtils.java +++ b/src/net/sourceforge/plantuml/klimt/geom/BezierUtils.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -57,7 +57,7 @@ public class BezierUtils { return getAngle(left.getP1(), left.getCtrlP1()); } - static double getAngle(XPoint2D p1, XPoint2D p2) { + public static double getAngle(XPoint2D p1, XPoint2D p2) { if (p1.equals(p2)) throw new IllegalArgumentException(); diff --git a/src/net/sourceforge/plantuml/svek/ClusterPosition.java b/src/net/sourceforge/plantuml/klimt/geom/ClusterPosition.java similarity index 97% rename from src/net/sourceforge/plantuml/svek/ClusterPosition.java rename to src/net/sourceforge/plantuml/klimt/geom/ClusterPosition.java index 556903e1d..c40b770a9 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterPosition.java +++ b/src/net/sourceforge/plantuml/klimt/geom/ClusterPosition.java @@ -33,13 +33,12 @@ * * */ -package net.sourceforge.plantuml.svek; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.posimo.BezierUtils; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class ClusterPosition { diff --git a/src/net/sourceforge/plantuml/EnsureVisible.java b/src/net/sourceforge/plantuml/klimt/geom/EnsureVisible.java similarity index 96% rename from src/net/sourceforge/plantuml/EnsureVisible.java rename to src/net/sourceforge/plantuml/klimt/geom/EnsureVisible.java index 395462a2f..8029a6ab3 100644 --- a/src/net/sourceforge/plantuml/EnsureVisible.java +++ b/src/net/sourceforge/plantuml/klimt/geom/EnsureVisible.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.klimt.geom; public interface EnsureVisible { diff --git a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java b/src/net/sourceforge/plantuml/klimt/geom/HorizontalAlignment.java similarity index 94% rename from src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java rename to src/net/sourceforge/plantuml/klimt/geom/HorizontalAlignment.java index 40d8aafe6..c07762c77 100644 --- a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java +++ b/src/net/sourceforge/plantuml/klimt/geom/HorizontalAlignment.java @@ -33,14 +33,15 @@ * * */ -package net.sourceforge.plantuml.graphic; +package net.sourceforge.plantuml.klimt.geom; import java.util.Objects; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public enum HorizontalAlignment { diff --git a/src/net/sourceforge/plantuml/svek/MinFinder.java b/src/net/sourceforge/plantuml/klimt/geom/MinFinder.java similarity index 97% rename from src/net/sourceforge/plantuml/svek/MinFinder.java rename to src/net/sourceforge/plantuml/klimt/geom/MinFinder.java index 8254c8189..a9ae7465b 100644 --- a/src/net/sourceforge/plantuml/svek/MinFinder.java +++ b/src/net/sourceforge/plantuml/klimt/geom/MinFinder.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.svek; +package net.sourceforge.plantuml.klimt.geom; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMax.java b/src/net/sourceforge/plantuml/klimt/geom/MinMax.java similarity index 93% rename from src/net/sourceforge/plantuml/ugraphic/MinMax.java rename to src/net/sourceforge/plantuml/klimt/geom/MinMax.java index 50a55cd31..ab07e6c5e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMax.java +++ b/src/net/sourceforge/plantuml/klimt/geom/MinMax.java @@ -33,12 +33,15 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.ugraphic.UGraphic; public class MinMax { diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java b/src/net/sourceforge/plantuml/klimt/geom/MinMaxMutable.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java rename to src/net/sourceforge/plantuml/klimt/geom/MinMaxMutable.java index bd65a59ac..f76e81fbf 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java +++ b/src/net/sourceforge/plantuml/klimt/geom/MinMaxMutable.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XDimension2D; diff --git a/src/net/sourceforge/plantuml/posimo/Moveable.java b/src/net/sourceforge/plantuml/klimt/geom/Moveable.java similarity index 96% rename from src/net/sourceforge/plantuml/posimo/Moveable.java rename to src/net/sourceforge/plantuml/klimt/geom/Moveable.java index 038ba18d0..ea57cfe5f 100644 --- a/src/net/sourceforge/plantuml/posimo/Moveable.java +++ b/src/net/sourceforge/plantuml/klimt/geom/Moveable.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt.geom; public interface Moveable { diff --git a/src/net/sourceforge/plantuml/svek/PointAndAngle.java b/src/net/sourceforge/plantuml/klimt/geom/PointAndAngle.java similarity index 97% rename from src/net/sourceforge/plantuml/svek/PointAndAngle.java rename to src/net/sourceforge/plantuml/klimt/geom/PointAndAngle.java index 9e3e8d9e0..26b5bdaa9 100644 --- a/src/net/sourceforge/plantuml/svek/PointAndAngle.java +++ b/src/net/sourceforge/plantuml/klimt/geom/PointAndAngle.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.svek; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/svek/PointDirected.java b/src/net/sourceforge/plantuml/klimt/geom/PointDirected.java similarity index 97% rename from src/net/sourceforge/plantuml/svek/PointDirected.java rename to src/net/sourceforge/plantuml/klimt/geom/PointDirected.java index 1f970ee99..dce71aec3 100644 --- a/src/net/sourceforge/plantuml/svek/PointDirected.java +++ b/src/net/sourceforge/plantuml/klimt/geom/PointDirected.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.svek; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/posimo/Positionable.java b/src/net/sourceforge/plantuml/klimt/geom/Positionable.java similarity index 97% rename from src/net/sourceforge/plantuml/posimo/Positionable.java rename to src/net/sourceforge/plantuml/klimt/geom/Positionable.java index 874bae44e..8898a060c 100644 --- a/src/net/sourceforge/plantuml/posimo/Positionable.java +++ b/src/net/sourceforge/plantuml/klimt/geom/Positionable.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java b/src/net/sourceforge/plantuml/klimt/geom/PositionableImpl.java similarity index 97% rename from src/net/sourceforge/plantuml/posimo/PositionableImpl.java rename to src/net/sourceforge/plantuml/klimt/geom/PositionableImpl.java index 58bc4f688..ea06cd4f7 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java +++ b/src/net/sourceforge/plantuml/klimt/geom/PositionableImpl.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java b/src/net/sourceforge/plantuml/klimt/geom/PositionableUtils.java similarity index 98% rename from src/net/sourceforge/plantuml/posimo/PositionableUtils.java rename to src/net/sourceforge/plantuml/klimt/geom/PositionableUtils.java index 7201835d9..04804d819 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java +++ b/src/net/sourceforge/plantuml/klimt/geom/PositionableUtils.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.posimo; +package net.sourceforge.plantuml.klimt.geom; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java b/src/net/sourceforge/plantuml/klimt/geom/Rankdir.java similarity index 96% rename from src/net/sourceforge/plantuml/cucadiagram/Rankdir.java rename to src/net/sourceforge/plantuml/klimt/geom/Rankdir.java index 95e773431..ac1ddf7d2 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java +++ b/src/net/sourceforge/plantuml/klimt/geom/Rankdir.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.cucadiagram; +package net.sourceforge.plantuml.klimt.geom; public enum Rankdir { LEFT_TO_RIGHT, TOP_TO_BOTTOM; diff --git a/src/net/sourceforge/plantuml/svek/Side.java b/src/net/sourceforge/plantuml/klimt/geom/Side.java similarity index 96% rename from src/net/sourceforge/plantuml/svek/Side.java rename to src/net/sourceforge/plantuml/klimt/geom/Side.java index 8967d0294..68ab1c018 100644 --- a/src/net/sourceforge/plantuml/svek/Side.java +++ b/src/net/sourceforge/plantuml/klimt/geom/Side.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.svek; +package net.sourceforge.plantuml.klimt.geom; public enum Side { diff --git a/src/net/sourceforge/plantuml/ugraphic/USegment.java b/src/net/sourceforge/plantuml/klimt/geom/USegment.java similarity index 98% rename from src/net/sourceforge/plantuml/ugraphic/USegment.java rename to src/net/sourceforge/plantuml/klimt/geom/USegment.java index 1fe7fa32b..d35148a8a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/USegment.java +++ b/src/net/sourceforge/plantuml/klimt/geom/USegment.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.geom; import java.awt.geom.AffineTransform; import java.util.Arrays; diff --git a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java b/src/net/sourceforge/plantuml/klimt/geom/USegmentType.java similarity index 97% rename from src/net/sourceforge/plantuml/ugraphic/USegmentType.java rename to src/net/sourceforge/plantuml/klimt/geom/USegmentType.java index a8107f501..9bf765111 100644 --- a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java +++ b/src/net/sourceforge/plantuml/klimt/geom/USegmentType.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic; +package net.sourceforge.plantuml.klimt.geom; import java.awt.geom.PathIterator; import java.util.EnumSet; diff --git a/src/net/sourceforge/plantuml/logo/PSystemLogo.java b/src/net/sourceforge/plantuml/logo/PSystemLogo.java index 5d96bf6d7..5d29dffee 100644 --- a/src/net/sourceforge/plantuml/logo/PSystemLogo.java +++ b/src/net/sourceforge/plantuml/logo/PSystemLogo.java @@ -50,11 +50,11 @@ import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; public class PSystemLogo extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java b/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java index 354757993..f10c43428 100644 --- a/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java +++ b/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.logo; import java.util.HashMap; import java.util.Map; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; public class TinyJavaLogo { private final LogoScanner scanner = new LogoScanner(); diff --git a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java index 35052a11b..fd2b3f3fd 100644 --- a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java +++ b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java @@ -43,17 +43,17 @@ import java.util.List; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; class TurtleGraphicsPane { final private double width; diff --git a/src/net/sourceforge/plantuml/math/AsciiMath.java b/src/net/sourceforge/plantuml/math/AsciiMath.java index 56cece71b..ac9e60ce1 100644 --- a/src/net/sourceforge/plantuml/math/AsciiMath.java +++ b/src/net/sourceforge/plantuml/math/AsciiMath.java @@ -42,7 +42,7 @@ import java.lang.reflect.InvocationTargetException; import javax.script.ScriptException; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.MutableImage; +import net.sourceforge.plantuml.klimt.MutableImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; public class AsciiMath implements ScientificEquation { diff --git a/src/net/sourceforge/plantuml/math/LatexBuilder.java b/src/net/sourceforge/plantuml/math/LatexBuilder.java index 590c41032..e66d891de 100644 --- a/src/net/sourceforge/plantuml/math/LatexBuilder.java +++ b/src/net/sourceforge/plantuml/math/LatexBuilder.java @@ -44,7 +44,7 @@ import java.lang.reflect.InvocationTargetException; import javax.swing.Icon; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.MutableImage; +import net.sourceforge.plantuml.klimt.MutableImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; public class LatexBuilder implements ScientificEquation { diff --git a/src/net/sourceforge/plantuml/math/PSystemLatex.java b/src/net/sourceforge/plantuml/math/PSystemLatex.java index 1f5d6d8cc..23d9ff473 100644 --- a/src/net/sourceforge/plantuml/math/PSystemLatex.java +++ b/src/net/sourceforge/plantuml/math/PSystemLatex.java @@ -45,10 +45,10 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.log.Logme; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class PSystemLatex extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/math/PSystemMath.java b/src/net/sourceforge/plantuml/math/PSystemMath.java index 6d63b3520..ee6fe739c 100644 --- a/src/net/sourceforge/plantuml/math/PSystemMath.java +++ b/src/net/sourceforge/plantuml/math/PSystemMath.java @@ -45,10 +45,10 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.log.Logme; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class PSystemMath extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/math/ScientificEquation.java b/src/net/sourceforge/plantuml/math/ScientificEquation.java index 356e6f286..90c64d4a9 100644 --- a/src/net/sourceforge/plantuml/math/ScientificEquation.java +++ b/src/net/sourceforge/plantuml/math/ScientificEquation.java @@ -40,7 +40,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.MutableImage; +import net.sourceforge.plantuml.klimt.MutableImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; public interface ScientificEquation { diff --git a/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java b/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java index 2b359e61f..6bb0c2ff7 100644 --- a/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java +++ b/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java @@ -51,11 +51,11 @@ import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.graphic.GraphicStrings; +import net.sourceforge.plantuml.klimt.MutableImage; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.AffineTransformType; -import net.sourceforge.plantuml.ugraphic.MutableImage; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; import net.sourceforge.plantuml.utils.Log; diff --git a/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java b/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java index 36032e59b..a46781084 100644 --- a/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java +++ b/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.core.Diagram; public class MDADiagramImpl implements MDADiagram { - + // ::remove folder when WASM public static MDADiagram create(String uml) { List blocks = new SourceStringReader(uml).getBlocks(); if (blocks.size() == 0) { diff --git a/src/net/sourceforge/plantuml/mindmap/Branch.java b/src/net/sourceforge/plantuml/mindmap/Branch.java index a31230000..d5d6d2c46 100644 --- a/src/net/sourceforge/plantuml/mindmap/Branch.java +++ b/src/net/sourceforge/plantuml/mindmap/Branch.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.mindmap; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; class Branch implements UDrawable { private Idea root; diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java index 027dfcc81..6d1be6da9 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.mindmap; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java index fc78c1d2b..53a8cc72b 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.mindmap; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapOrgmode extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java index 4c820f764..9fa7d51fc 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java @@ -42,14 +42,14 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; public class CommandMindMapOrgmodeMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java index 1817202db..60544f988 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.mindmap; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapPlus extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java index 3e612c91b..342e91648 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.mindmap; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapRoot extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/Finger.java b/src/net/sourceforge/plantuml/mindmap/Finger.java index dd2da20c5..b005e8dcc 100644 --- a/src/net/sourceforge/plantuml/mindmap/Finger.java +++ b/src/net/sourceforge/plantuml/mindmap/Finger.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.mindmap; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface Finger extends UDrawable { diff --git a/src/net/sourceforge/plantuml/mindmap/FingerImpl.java b/src/net/sourceforge/plantuml/mindmap/FingerImpl.java index 62c4549fb..8a542b00c 100644 --- a/src/net/sourceforge/plantuml/mindmap/FingerImpl.java +++ b/src/net/sourceforge/plantuml/mindmap/FingerImpl.java @@ -44,21 +44,21 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileBoxOld; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.creole.CreoleMode; -import net.sourceforge.plantuml.cucadiagram.Rankdir; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class FingerImpl implements Finger, UDrawable { diff --git a/src/net/sourceforge/plantuml/mindmap/Idea.java b/src/net/sourceforge/plantuml/mindmap/Idea.java index 0a44a0d0c..9702d76ac 100644 --- a/src/net/sourceforge/plantuml/mindmap/Idea.java +++ b/src/net/sourceforge/plantuml/mindmap/Idea.java @@ -41,12 +41,12 @@ import java.util.Collections; import java.util.List; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.MergeStrategy; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.wbs.WElement; class Idea { diff --git a/src/net/sourceforge/plantuml/mindmap/MindMap.java b/src/net/sourceforge/plantuml/mindmap/MindMap.java index ee63edef3..42b63ebcb 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMap.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMap.java @@ -39,13 +39,13 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.cucadiagram.Rankdir; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.style.NoStyleAvailableException; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class MindMap implements UDrawable { diff --git a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java index 9b730fb16..690f4df44 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java @@ -51,14 +51,14 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; public class MindMapDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/mindmap/SymetricalTeePositioned.java b/src/net/sourceforge/plantuml/mindmap/SymetricalTeePositioned.java index 92f8eaa01..a45775046 100644 --- a/src/net/sourceforge/plantuml/mindmap/SymetricalTeePositioned.java +++ b/src/net/sourceforge/plantuml/mindmap/SymetricalTeePositioned.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.mindmap; import java.awt.geom.Line2D; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + public class SymetricalTeePositioned { @@ -49,7 +49,7 @@ public class SymetricalTeePositioned { return "y=" + y + " " + tee; } - @HaxeIgnored + public SymetricalTeePositioned(SymetricalTee tee) { this(tee, 0); } diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandComment.java b/src/net/sourceforge/plantuml/nwdiag/CommandComment.java index e8d366369..36b3382b6 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandComment.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandComment.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandComment extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandElement.java b/src/net/sourceforge/plantuml/nwdiag/CommandElement.java index 27a8ac92d..43c54951f 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandElement.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandElement.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandElement extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java b/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java index da1f7ddea..5255722cb 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndSomething extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java b/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java index cd9a566b2..e53afbf7c 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroup extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandLink.java b/src/net/sourceforge/plantuml/nwdiag/CommandLink.java index 1c0202eee..00347405e 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandLink.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandLink.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java index ac74b2cee..0e9d46578 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNetwork extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java b/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java index 84da129c8..ca500379e 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNwDiagInit extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java b/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java index f6565db81..3eab3d7f8 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.nwdiag; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandProperty extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java index ffd3db581..7243facda 100644 --- a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java +++ b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java @@ -55,13 +55,16 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.nwdiag.core.NServer; import net.sourceforge.plantuml.nwdiag.core.NStackable; import net.sourceforge.plantuml.nwdiag.core.Network; @@ -76,11 +79,8 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class NwDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java b/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java index ae74be78d..7e2cf3782 100644 --- a/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java +++ b/src/net/sourceforge/plantuml/nwdiag/VerticalLine.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.nwdiag; import java.util.Set; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class VerticalLine implements UDrawable { diff --git a/src/net/sourceforge/plantuml/nwdiag/core/NServer.java b/src/net/sourceforge/plantuml/nwdiag/core/NServer.java index 9c2b1abf6..40c1fcfcf 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/NServer.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/NServer.java @@ -41,13 +41,15 @@ import java.util.Map; import net.sourceforge.plantuml.ComponentStyle; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; 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.USymbols; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.nwdiag.next.NBar; import net.sourceforge.plantuml.nwdiag.next.NServerDraw; import net.sourceforge.plantuml.skin.ActorStyle; @@ -56,8 +58,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.PackageStyle; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; public class NServer { diff --git a/src/net/sourceforge/plantuml/nwdiag/core/NStackable.java b/src/net/sourceforge/plantuml/nwdiag/core/NStackable.java index 74b69a92f..d4f4c1555 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/NStackable.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/NStackable.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.nwdiag.core; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public interface NStackable { diff --git a/src/net/sourceforge/plantuml/nwdiag/core/Network.java b/src/net/sourceforge/plantuml/nwdiag/core/Network.java index e6372af90..527643b90 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/Network.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/Network.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.nwdiag.core; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.nwdiag.next.NStage; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Network implements NStackable { diff --git a/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java b/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java index b129e2d54..1def25e54 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java @@ -43,19 +43,19 @@ import java.util.Set; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.nwdiag.next.NBox; 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.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class NwGroup implements NStackable { diff --git a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockDecorated.java b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockDecorated.java index b9a45df36..94eed815e 100644 --- a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockDecorated.java +++ b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockDecorated.java @@ -37,7 +37,11 @@ package net.sourceforge.plantuml.nwdiag.next; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.nwdiag.core.Network; import net.sourceforge.plantuml.nwdiag.core.NwGroup; import net.sourceforge.plantuml.style.PName; @@ -45,11 +49,7 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; -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.HColor; public class GridTextBlockDecorated extends GridTextBlockSimple { diff --git a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java index 4f6af41ac..6a5ae8ac1 100644 --- a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java +++ b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java @@ -38,11 +38,11 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GridTextBlockSimple implements TextBlock { diff --git a/src/net/sourceforge/plantuml/nwdiag/next/NServerDraw.java b/src/net/sourceforge/plantuml/nwdiag/next/NServerDraw.java index 55ba489be..dc55ba392 100644 --- a/src/net/sourceforge/plantuml/nwdiag/next/NServerDraw.java +++ b/src/net/sourceforge/plantuml/nwdiag/next/NServerDraw.java @@ -41,15 +41,15 @@ import java.util.Map.Entry; import java.util.TreeSet; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.nwdiag.VerticalLine; import net.sourceforge.plantuml.nwdiag.core.NServer; import net.sourceforge.plantuml.nwdiag.core.Network; import net.sourceforge.plantuml.style.SName; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class NServerDraw { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java index 5d267db10..b86675289 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java @@ -39,13 +39,13 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddData extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java index 04a7a9378..f0ccd24c0 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java @@ -35,26 +35,26 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateEntityObject extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java index 35bb72d85..ca64169a2 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java @@ -35,29 +35,29 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateEntityObjectMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java index 56fe26024..b373ecd96 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -45,23 +43,25 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.BodierJSon; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.json.Json.DefaultHandler; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.json.JsonParser; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateJson extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java index 3310f998c..54f19aeaa 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java @@ -35,28 +35,28 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.BodierJSon; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.json.Json.DefaultHandler; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; import net.sourceforge.plantuml.json.JsonParser; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateJsonSingleLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java index 150dc8666..dd5c69763 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -44,11 +42,6 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.BodierMap; import net.sourceforge.plantuml.cucadiagram.Display; @@ -58,13 +51,20 @@ import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateMap extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java index a9f0ffa07..cd73183b0 100644 --- a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java +++ b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java @@ -45,13 +45,13 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.log.Logme; 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; public class OpenIcon { diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java index 594ee592f..495d4da50 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java @@ -40,8 +40,8 @@ import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class PSystemOpenIconic extends PlainDiagram { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/openiconic/SvgPath.java b/src/net/sourceforge/plantuml/openiconic/SvgPath.java index a8341825e..e3d69bb0e 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgPath.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgPath.java @@ -42,8 +42,8 @@ import java.util.List; import java.util.StringTokenizer; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPath; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; public class SvgPath { diff --git a/src/net/sourceforge/plantuml/oregon/BasicGame.java b/src/net/sourceforge/plantuml/oregon/BasicGame.java index 71d298213..65dba6525 100644 --- a/src/net/sourceforge/plantuml/oregon/BasicGame.java +++ b/src/net/sourceforge/plantuml/oregon/BasicGame.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.oregon; public interface BasicGame { + // ::remove folder when WASM void run(Keyboard keyboard) throws NoInputException; diff --git a/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java b/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java index 813a2b9e5..774a630e0 100644 --- a/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java +++ b/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java @@ -72,8 +72,8 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocationImpl; -import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.Version; public class PicoWebServer implements Runnable { diff --git a/src/net/sourceforge/plantuml/png/PngFlashcoder.java b/src/net/sourceforge/plantuml/png/PngFlashcoder.java index dc1cc46e5..05bb9dc54 100644 --- a/src/net/sourceforge/plantuml/png/PngFlashcoder.java +++ b/src/net/sourceforge/plantuml/png/PngFlashcoder.java @@ -40,7 +40,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.util.List; -import net.sourceforge.plantuml.ugraphic.UAntiAliasing; +import net.sourceforge.plantuml.klimt.UAntiAliasing; public class PngFlashcoder { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/png/PngIO.java b/src/net/sourceforge/plantuml/png/PngIO.java index e239077b6..b05fb25b7 100644 --- a/src/net/sourceforge/plantuml/png/PngIO.java +++ b/src/net/sourceforge/plantuml/png/PngIO.java @@ -40,10 +40,10 @@ import java.awt.image.RenderedImage; import java.io.IOException; import java.io.OutputStream; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.quantization.Quantizer; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.utils.Log; public class PngIO { diff --git a/src/net/sourceforge/plantuml/png/PngSplitter.java b/src/net/sourceforge/plantuml/png/PngSplitter.java index 198a7222e..373980f97 100644 --- a/src/net/sourceforge/plantuml/png/PngSplitter.java +++ b/src/net/sourceforge/plantuml/png/PngSplitter.java @@ -44,9 +44,9 @@ import java.util.List; import net.sourceforge.plantuml.SplitParam; import net.sourceforge.plantuml.SuggestedFile; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.utils.Log; public class PngSplitter { diff --git a/src/net/sourceforge/plantuml/png/PngTitler.java b/src/net/sourceforge/plantuml/png/PngTitler.java index 0153b0f52..6d258d5b3 100644 --- a/src/net/sourceforge/plantuml/png/PngTitler.java +++ b/src/net/sourceforge/plantuml/png/PngTitler.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.png; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplaySection; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class PngTitler { diff --git a/src/net/sourceforge/plantuml/posimo/Clusterable.java b/src/net/sourceforge/plantuml/posimo/Clusterable.java index 01f849847..85b709b56 100644 --- a/src/net/sourceforge/plantuml/posimo/Clusterable.java +++ b/src/net/sourceforge/plantuml/posimo/Clusterable.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.posimo; +import net.sourceforge.plantuml.klimt.geom.Positionable; + public interface Clusterable extends Positionable { public Cluster getParent(); diff --git a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java index f74ee5a75..dde71b3c1 100644 --- a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java +++ b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java @@ -50,8 +50,9 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.dot.Graphviz; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; import net.sourceforge.plantuml.cucadiagram.dot.ProcessState; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.geom.MinFinder; import net.sourceforge.plantuml.security.SFile; -import net.sourceforge.plantuml.svek.MinFinder; import net.sourceforge.plantuml.svek.SvgResult; import net.sourceforge.plantuml.svek.YDelta; @@ -164,7 +165,7 @@ public class GraphvizSolverB { final int p2 = s.indexOf(" d=\"", p1); final int p3 = s.indexOf("\"", p2 + " d=\"".length()); final String points = s.substring(p2 + " d=\"".length(), p3); - final DotPath dotPath = new DotPath(new SvgResult(points, yDelta)); + final DotPath dotPath = new SvgResult(points, yDelta).toDotPath(); p.setDotPath(dotPath); minMax.manage(dotPath.getMinFinder()); diff --git a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java index 8919cb5d7..23aae376c 100644 --- a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java +++ b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.posimo; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public interface IEntityImageBlock { diff --git a/src/net/sourceforge/plantuml/posimo/Label.java b/src/net/sourceforge/plantuml/posimo/Label.java index 7e7bb4167..d89b077ed 100644 --- a/src/net/sourceforge/plantuml/posimo/Label.java +++ b/src/net/sourceforge/plantuml/posimo/Label.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.posimo; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.geom.Positionable; public class Label implements Positionable { diff --git a/src/net/sourceforge/plantuml/posimo/LabelImage.java b/src/net/sourceforge/plantuml/posimo/LabelImage.java index 1fd4c94f0..3ea07a791 100644 --- a/src/net/sourceforge/plantuml/posimo/LabelImage.java +++ b/src/net/sourceforge/plantuml/posimo/LabelImage.java @@ -40,11 +40,11 @@ import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LabelImage { diff --git a/src/net/sourceforge/plantuml/posimo/MargedBlock.java b/src/net/sourceforge/plantuml/posimo/MargedBlock.java index b66b34c80..665d5f4b1 100644 --- a/src/net/sourceforge/plantuml/posimo/MargedBlock.java +++ b/src/net/sourceforge/plantuml/posimo/MargedBlock.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.posimo; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.Positionable; public class MargedBlock { diff --git a/src/net/sourceforge/plantuml/posimo/Path.java b/src/net/sourceforge/plantuml/posimo/Path.java index f4b55814d..6ec229ec4 100644 --- a/src/net/sourceforge/plantuml/posimo/Path.java +++ b/src/net/sourceforge/plantuml/posimo/Path.java @@ -37,6 +37,8 @@ package net.sourceforge.plantuml.posimo; import java.util.Objects; +import net.sourceforge.plantuml.klimt.DotPath; + public class Path { private final Label label; diff --git a/src/net/sourceforge/plantuml/posimo/PathDrawer.java b/src/net/sourceforge/plantuml/posimo/PathDrawer.java index d857dd12c..f88e6c9e8 100644 --- a/src/net/sourceforge/plantuml/posimo/PathDrawer.java +++ b/src/net/sourceforge/plantuml/posimo/PathDrawer.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.posimo; +import net.sourceforge.plantuml.klimt.geom.Positionable; import net.sourceforge.plantuml.ugraphic.UGraphic; public interface PathDrawer { diff --git a/src/net/sourceforge/plantuml/posimo/Racorder.java b/src/net/sourceforge/plantuml/posimo/Racorder.java index c68b6446d..3312af441 100644 --- a/src/net/sourceforge/plantuml/posimo/Racorder.java +++ b/src/net/sourceforge/plantuml/posimo/Racorder.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.posimo; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; public interface Racorder { public DotPath getRacordIn(XRectangle2D rect, XLine2D tangeante); diff --git a/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java b/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java index ba1d9dcdf..63529a75a 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.posimo; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; public abstract class RacorderAbstract implements Racorder { diff --git a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java index b1603a68b..d4edc4c8d 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; public class RacorderFollowTangeante extends RacorderAbstract implements Racorder { diff --git a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java index 1979cb55c..392b60650 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java @@ -39,6 +39,8 @@ import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.geom.BezierUtils; public class RacorderFollowTangeanteOld extends RacorderAbstract implements Racorder { diff --git a/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java b/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java index 066a48c0c..2ec6b1e34 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java @@ -39,6 +39,8 @@ import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.geom.BezierUtils; public class RacorderInToCenter extends RacorderAbstract implements Racorder { diff --git a/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java b/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java index 44d2311a2..a811b2380 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; +import net.sourceforge.plantuml.klimt.DotPath; public class RacorderOrthogonal extends RacorderAbstract implements Racorder { diff --git a/src/net/sourceforge/plantuml/preproc/Define.java b/src/net/sourceforge/plantuml/preproc/Define.java index de56268c6..3db5dd7f5 100644 --- a/src/net/sourceforge/plantuml/preproc/Define.java +++ b/src/net/sourceforge/plantuml/preproc/Define.java @@ -41,7 +41,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.AParentFolder; -import net.sourceforge.plantuml.BackSlash; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.tim.expression.TValue; public class Define { diff --git a/src/net/sourceforge/plantuml/preproc/ImportedFiles.java b/src/net/sourceforge/plantuml/preproc/ImportedFiles.java index 59db062a1..e331c3d81 100644 --- a/src/net/sourceforge/plantuml/preproc/ImportedFiles.java +++ b/src/net/sourceforge/plantuml/preproc/ImportedFiles.java @@ -48,6 +48,9 @@ import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.utils.Log; +// ::uncomment when WASM +//import java.util.Collections; +// ::done public class ImportedFiles { @@ -107,13 +110,20 @@ public class ImportedFiles { public List getPath() { final List result = new ArrayList<>(imported); + // ::comment when WASM result.addAll(includePath()); result.addAll(SecurityUtils.getPath(SecurityUtils.PATHS_CLASSES)); + // ::done return result; } private List includePath() { + // ::comment when WASM return SecurityUtils.getPath(SecurityUtils.PATHS_INCLUDES); + // ::done + // ::uncomment when WASM + // return Collections.emptyList(); + // ::done } private boolean isAbsolute(String nameOrPath) { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLine.java b/src/net/sourceforge/plantuml/preproc/ReadLine.java index 63c31fb3e..48beb68fb 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLine.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.preproc; import java.io.Closeable; import java.io.IOException; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public interface ReadLine extends Closeable { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineList.java b/src/net/sourceforge/plantuml/preproc/ReadLineList.java index 0ac095756..6ec8640ad 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineList.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineList.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.preproc; import java.util.Iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class ReadLineList implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java index a4ecdf26e..d282420d4 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java @@ -39,10 +39,10 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.LineLocationImpl; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringLocated; public class ReadLineReader implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java b/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java index 5efd6237e..2008fcb9f 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.preproc; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class ReadLineSimple implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java index dfc90c0fb..dcee0e901 100644 --- a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java +++ b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java @@ -44,9 +44,9 @@ import java.nio.charset.Charset; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc2.ReadFilterMergeLines; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; public class StartDiagramExtractReader implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/Stdlib.java b/src/net/sourceforge/plantuml/preproc/Stdlib.java index e482d77db..b734ddaf0 100644 --- a/src/net/sourceforge/plantuml/preproc/Stdlib.java +++ b/src/net/sourceforge/plantuml/preproc/Stdlib.java @@ -45,7 +45,7 @@ public class Stdlib { // fullname = fullname.replace(".puml", ""); // fullname = fullname.replace("awslib/", "awslib14/"); // -// final String fullpath = RunInit.pathStdlib + fullname + ".puml"; +// final String fullpath = RunInit.cheerpjPath + "stdlib/" + fullname + ".puml"; // System.err.println("Trying to read " + fullpath); // // See https://docs.leaningtech.com/cheerpj/File-System-support // try { diff --git a/src/net/sourceforge/plantuml/preproc/Sub.java b/src/net/sourceforge/plantuml/preproc/Sub.java index 62d71d6ac..09c6e4367 100644 --- a/src/net/sourceforge/plantuml/preproc/Sub.java +++ b/src/net/sourceforge/plantuml/preproc/Sub.java @@ -40,12 +40,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class Sub { diff --git a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java index 567dc979d..660dd4517 100644 --- a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.preproc; import java.io.IOException; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; public class UncommentReadLine implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc2/Preprocessor.java b/src/net/sourceforge/plantuml/preproc2/Preprocessor.java index 17ed7f442..d80efb142 100644 --- a/src/net/sourceforge/plantuml/preproc2/Preprocessor.java +++ b/src/net/sourceforge/plantuml/preproc2/Preprocessor.java @@ -40,7 +40,7 @@ import java.util.List; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineNumbered; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class Preprocessor implements ReadLineNumbered { diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index b701f87d8..a3c8f7031 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -52,10 +52,10 @@ import net.sourceforge.plantuml.preproc.ReadLineSimple; import net.sourceforge.plantuml.preproc.StartDiagramExtractReader; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringLocated; public class PreprocessorUtils { diff --git a/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java index 6a67ebdaa..1a331d56a 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java @@ -40,8 +40,8 @@ import java.util.List; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineList; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; public class ReadFilterAddConfig implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java index 591bd5dbe..b4b750c19 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java @@ -40,8 +40,8 @@ import java.io.IOException; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.preproc.ReadLine; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.StartUtils; -import net.sourceforge.plantuml.utils.StringLocated; public class ReadFilterMergeLines implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java index f11800f98..ecf899034 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.preproc2; import java.io.IOException; import net.sourceforge.plantuml.preproc.ReadLine; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class ReadFilterQuoteComment implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/project/GArrows.java b/src/net/sourceforge/plantuml/project/GArrows.java index 14a8cbeb9..dff26459f 100644 --- a/src/net/sourceforge/plantuml/project/GArrows.java +++ b/src/net/sourceforge/plantuml/project/GArrows.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.project; -import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.Arrows; +import net.sourceforge.plantuml.klimt.UPolygon; public class GArrows extends Arrows { diff --git a/src/net/sourceforge/plantuml/project/GanttArrow.java b/src/net/sourceforge/plantuml/project/GanttArrow.java index 6a7bf48c2..edab53ded 100644 --- a/src/net/sourceforge/plantuml/project/GanttArrow.java +++ b/src/net/sourceforge/plantuml/project/GanttArrow.java @@ -35,8 +35,12 @@ */ package net.sourceforge.plantuml.project; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; @@ -48,10 +52,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColorSet; import net.sourceforge.plantuml.utils.Direction; public class GanttArrow implements UDrawable { diff --git a/src/net/sourceforge/plantuml/project/GanttConstraint.java b/src/net/sourceforge/plantuml/project/GanttConstraint.java index 0d0233e28..f2f0c8e3d 100644 --- a/src/net/sourceforge/plantuml/project/GanttConstraint.java +++ b/src/net/sourceforge/plantuml/project/GanttConstraint.java @@ -39,6 +39,8 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.WithLinkType; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; @@ -49,8 +51,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; 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; public class GanttConstraint extends WithLinkType { diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 5670c0beb..2f4ba3958 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -62,10 +62,16 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.project.core.Moment; import net.sourceforge.plantuml.project.core.MomentImpl; @@ -107,13 +113,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.GraphvizCrash; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprite { diff --git a/src/net/sourceforge/plantuml/project/LabelStrategy.java b/src/net/sourceforge/plantuml/project/LabelStrategy.java index 20fde7c27..3e0fc3c02 100644 --- a/src/net/sourceforge/plantuml/project/LabelStrategy.java +++ b/src/net/sourceforge/plantuml/project/LabelStrategy.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.project; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class LabelStrategy { diff --git a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java index c18f48984..217fac544 100644 --- a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java +++ b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java @@ -39,11 +39,11 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class TimeHeaderParameters { diff --git a/src/net/sourceforge/plantuml/project/ToTaskDraw.java b/src/net/sourceforge/plantuml/project/ToTaskDraw.java index 46c5db059..5c25ced75 100644 --- a/src/net/sourceforge/plantuml/project/ToTaskDraw.java +++ b/src/net/sourceforge/plantuml/project/ToTaskDraw.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.project; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.draw.TaskDraw; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public interface ToTaskDraw { diff --git a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java index bdfaf541c..f2c33d16e 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java +++ b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.lang.CenterBorderColor; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandColorTask extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java index 7b2f0927a..ffa80481a 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootbox extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java index 28b8462c0..c82313d5c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGanttArrow extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java index 860176107..1ee0791db 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGanttArrow2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java index 2641f9bb2..9b3c50a98 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupEnd extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java index 6b7fa783d..b05dd9b6c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupStart extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java index fb1063217..647c92acd 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideResourceFootbox extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java index c4d237308..688b2760b 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideResourceName extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java index 0b052b3ec..e0031f614 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.LabelPosition; import net.sourceforge.plantuml.project.LabelStrategy; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLabelOnColumn extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java index 0f7b67013..0f3ec0733 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandLanguage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java b/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java index 2839273c5..324be00e0 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java +++ b/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteBottom extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java index f89f35f23..4a511ec67 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.lang.ComplementDate; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrintBetween extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java index 7499b19ec..cc285b2c5 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.PrintScale; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrintScale extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandSeparator.java b/src/net/sourceforge/plantuml/project/command/CommandSeparator.java index b323a6ec6..83ec228c0 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandSeparator.java +++ b/src/net/sourceforge/plantuml/project/command/CommandSeparator.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSeparator extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java b/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java index bab908c8b..e9aca0942 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java +++ b/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWeekNumberStrategy extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java index a1ba899f6..8f471e2d6 100644 --- a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java +++ b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.lang.Sentence; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class NaturalCommand extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/core/Task.java b/src/net/sourceforge/plantuml/project/core/Task.java index e985a174a..138df1ce6 100644 --- a/src/net/sourceforge/plantuml/project/core/Task.java +++ b/src/net/sourceforge/plantuml/project/core/Task.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.project.core; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.url.Url; public interface Task extends Moment { diff --git a/src/net/sourceforge/plantuml/project/core/TaskGroup.java b/src/net/sourceforge/plantuml/project/core/TaskGroup.java index d8d3537b2..19966bc26 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskGroup.java +++ b/src/net/sourceforge/plantuml/project/core/TaskGroup.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.project.core; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.url.Url; public class TaskGroup extends AbstractTask implements Task { diff --git a/src/net/sourceforge/plantuml/project/core/TaskImpl.java b/src/net/sourceforge/plantuml/project/core/TaskImpl.java index eb13f81c4..96606c0bb 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskImpl.java +++ b/src/net/sourceforge/plantuml/project/core/TaskImpl.java @@ -45,7 +45,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.LoadPlanable; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.project.solver.SolverImpl; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.url.Url; public class TaskImpl extends AbstractTask implements Task, LoadPlanable { diff --git a/src/net/sourceforge/plantuml/project/core/TaskSeparator.java b/src/net/sourceforge/plantuml/project/core/TaskSeparator.java index 157d59d8c..7bd0aa1bb 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskSeparator.java +++ b/src/net/sourceforge/plantuml/project/core/TaskSeparator.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.project.core; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.url.Url; public class TaskSeparator extends AbstractTask implements Task { diff --git a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java index c0fb5d74f..ea3f593cd 100644 --- a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java @@ -36,11 +36,13 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.project.ToTaskDraw; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.lang.CenterBorderColor; @@ -53,9 +55,7 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; 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.HColors; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; public abstract class AbstractTaskDraw implements TaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/PathUtils.java b/src/net/sourceforge/plantuml/project/draw/PathUtils.java index 00efb2fc4..faf1601f0 100644 --- a/src/net/sourceforge/plantuml/project/draw/PathUtils.java +++ b/src/net/sourceforge/plantuml/project/draw/PathUtils.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UPath; +import net.sourceforge.plantuml.klimt.UPath; public class PathUtils { diff --git a/src/net/sourceforge/plantuml/project/draw/RectangleTask.java b/src/net/sourceforge/plantuml/project/draw/RectangleTask.java index 2efd13426..c0843cd1e 100644 --- a/src/net/sourceforge/plantuml/project/draw/RectangleTask.java +++ b/src/net/sourceforge/plantuml/project/draw/RectangleTask.java @@ -40,14 +40,14 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.sequencediagram.graphic.Segment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColors; public class RectangleTask { diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java index 0af1f9dd4..240b0f283 100644 --- a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java @@ -37,20 +37,20 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Resource; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; -import net.sourceforge.plantuml.ugraphic.UFont; 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.HColors; public class ResourceDraw implements UDrawable { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDraw.java b/src/net/sourceforge/plantuml/project/draw/TaskDraw.java index e5ec23565..a6872a1b5 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDraw.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.project.LabelStrategy; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; public interface TaskDraw extends UDrawable { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java index 41b202bbc..c0ee178cb 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java @@ -39,9 +39,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.LabelStrategy; import net.sourceforge.plantuml.project.ToTaskDraw; import net.sourceforge.plantuml.project.core.Task; @@ -56,9 +59,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TaskDrawDiamond extends AbstractTaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java index 4f430a451..65c1fa6f3 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java @@ -39,9 +39,12 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.LabelStrategy; import net.sourceforge.plantuml.project.ToTaskDraw; import net.sourceforge.plantuml.project.core.Task; @@ -56,9 +59,6 @@ import net.sourceforge.plantuml.style.Style; 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.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class TaskDrawGroup extends AbstractTaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java index d35babaff..8fc76109b 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java @@ -47,10 +47,12 @@ import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.LabelStrategy; import net.sourceforge.plantuml.project.ToTaskDraw; @@ -70,8 +72,6 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TaskDrawRegular extends AbstractTaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java index e754655ad..f4c8c790c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java @@ -36,13 +36,17 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.LabelStrategy; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; @@ -57,11 +61,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColorSet; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; public class TaskDrawSeparator implements TaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java index 4ad9858ae..18f185afe 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java @@ -39,22 +39,22 @@ import java.util.Objects; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; public abstract class TimeHeader { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java index e3de7ce9b..95cf66041 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.project.draw; import java.util.Locale; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public abstract class TimeHeaderCalendar extends TimeHeader { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java index fe687f9f8..53658b8ee 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleDaily; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TimeHeaderDaily extends TimeHeaderCalendar { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java index 32f355350..ab4475693 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TimeHeaderMonthly extends TimeHeaderCalendar { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java index 5dfdaee71..49f65f067 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TimeHeaderQuarterly extends TimeHeaderCalendar { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java index c7ec2f1e0..c7a7f8014 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java @@ -39,17 +39,17 @@ import java.util.Set; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.core.PrintScale; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.project.timescale.TimeScaleWink; 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; public class TimeHeaderSimple extends TimeHeader { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java index 3efb8e866..b0a562d57 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.time.WeekNumberStrategy; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TimeHeaderWeekly extends TimeHeaderCalendar { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java index 1cec5ad40..ed9500b6b 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TimeHeaderYearly extends TimeHeaderCalendar { diff --git a/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java b/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java index b4d9ad478..9a28436f6 100644 --- a/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java +++ b/src/net/sourceforge/plantuml/project/lang/CenterBorderColor.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.project.lang; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class CenterBorderColor { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java b/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java index b9f594435..d103f859b 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttConstraintMode; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Moment; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementBeforeOrAfterOrAtTaskStartOrEnd implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementClose.java b/src/net/sourceforge/plantuml/project/lang/ComplementClose.java index 0a7952b32..ab2908de2 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementClose.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementClose.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementClose implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java b/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java index ed6441c37..d1021e5aa 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Completion; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementCompleted implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java index 053bddead..c23241aa1 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.Month; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementDate implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java index c7e4ad524..235e6e168 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.DaysAsDates; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementDates implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java index 17a29c432..fba7d2581 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementDayOfWeek implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java b/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java index 61456ffa4..ff8d9a52a 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementEmpty implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java b/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java index 2a7a55017..73f83b646 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementFromTo implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java index 3de479be6..89dd3152e 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementInColors implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java index 1cec5f531..acc42acb0 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementInColors2 implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java index a59a6527e..323865502 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementInColorsFromTo implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java b/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java index 8c8b02d3c..f61be7ba1 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementNamed implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java b/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java index 8cdb22a5f..131d74185 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementOpen implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java b/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java index ab761481b..2a8a8b9cb 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.Load; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementSeveralDays implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java b/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java index 2ab54c253..7e0961896 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; public class ComplementUrl implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java b/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java index 82e5c099e..e5a772777 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class ComplementWithColorLink implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java b/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java index 08c9ab754..1a9aad3ba 100644 --- a/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java +++ b/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class PairOfSomething implements Something { diff --git a/src/net/sourceforge/plantuml/project/lang/Sentence.java b/src/net/sourceforge/plantuml/project/lang/Sentence.java index bc6e89ff1..a40c4df66 100644 --- a/src/net/sourceforge/plantuml/project/lang/Sentence.java +++ b/src/net/sourceforge/plantuml/project/lang/Sentence.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexResult; public interface Sentence { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java index 73382f150..bb847aa88 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SentenceAnd implements Sentence { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java index 949ec5675..25b9749f6 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SentenceAndAnd implements Sentence { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java b/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java index a5d0238d8..e8763bfcc 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.url.Url; public class SentenceLinksTo extends SentenceSimple { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java index e0094f2be..03ada5fc3 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public abstract class SentenceSimple implements Sentence { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java index fd25459c2..0a152710b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SentenceTaskStarts extends SentenceSimple { diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java index 34ed3cea1..3bfc498ef 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SentenceTaskStartsWithColor extends SentenceSimple { diff --git a/src/net/sourceforge/plantuml/project/lang/Something.java b/src/net/sourceforge/plantuml/project/lang/Something.java index 195b36a8a..297fd07b1 100644 --- a/src/net/sourceforge/plantuml/project/lang/Something.java +++ b/src/net/sourceforge/plantuml/project/lang/Something.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexResult; public interface Something { diff --git a/src/net/sourceforge/plantuml/project/lang/Subject.java b/src/net/sourceforge/plantuml/project/lang/Subject.java index 3fb30f7a5..699c30b74 100644 --- a/src/net/sourceforge/plantuml/project/lang/Subject.java +++ b/src/net/sourceforge/plantuml/project/lang/Subject.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.project.lang; import java.util.Collection; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexResult; public interface Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java index 4d26a7a92..ee0fa50fd 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java @@ -39,15 +39,15 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectDayAsDate implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java index 181ecad19..c5b9cb622 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java @@ -39,13 +39,13 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.DayOfWeek; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectDayOfWeek implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java index 37a605ce2..5a796761d 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java @@ -39,16 +39,16 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.project.DaysAsDates; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectDaysAsDates implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java b/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java index 6b72f9bf3..588d7f213 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java @@ -39,11 +39,11 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; // Removed public class SubjectLinks implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java index d4045c7a2..218007369 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java @@ -39,12 +39,12 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectProject implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java index 213f31d23..bd6613f9c 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java @@ -39,16 +39,16 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.DaysAsDates; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Resource; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectResource implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java index dc2552aed..e28de1d3f 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java @@ -39,13 +39,13 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.TaskInstant; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectSeparator implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index 15f841206..be1e3a3fa 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -39,14 +39,14 @@ import java.util.Arrays; import java.util.Collection; import java.util.StringTokenizer; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectTask implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java index 2af64d0eb..e1b14f686 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java @@ -39,14 +39,14 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.Today; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; public class SubjectToday implements Subject { diff --git a/src/net/sourceforge/plantuml/project/lang/Verb.java b/src/net/sourceforge/plantuml/project/lang/Verb.java index 159cded61..c3538ea02 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verb.java +++ b/src/net/sourceforge/plantuml/project/lang/Verb.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; +import net.sourceforge.plantuml.regex.IRegex; public interface Verb { diff --git a/src/net/sourceforge/plantuml/project/lang/Verbs.java b/src/net/sourceforge/plantuml/project/lang/Verbs.java index 7e513c310..38243ac65 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verbs.java +++ b/src/net/sourceforge/plantuml/project/lang/Verbs.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.project.lang; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; public class Verbs { diff --git a/src/net/sourceforge/plantuml/quantization/QColor.java b/src/net/sourceforge/plantuml/quantization/QColor.java index a220b0fff..ec23fc7c7 100644 --- a/src/net/sourceforge/plantuml/quantization/QColor.java +++ b/src/net/sourceforge/plantuml/quantization/QColor.java @@ -2,7 +2,7 @@ package net.sourceforge.plantuml.quantization; import java.util.Collection; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorMapper; /** * An RGB representation of a color, which stores each component as a double in diff --git a/src/net/sourceforge/plantuml/quantization/QImage.java b/src/net/sourceforge/plantuml/quantization/QImage.java index 21d27c373..2876f6aaa 100644 --- a/src/net/sourceforge/plantuml/quantization/QImage.java +++ b/src/net/sourceforge/plantuml/quantization/QImage.java @@ -2,7 +2,7 @@ package net.sourceforge.plantuml.quantization; import java.awt.image.BufferedImage; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorMapper; /** * An immutable grid of pixel colors. diff --git a/src/net/sourceforge/plantuml/quantization/Quantizer.java b/src/net/sourceforge/plantuml/quantization/Quantizer.java index 24ef18c84..4ca477ac6 100644 --- a/src/net/sourceforge/plantuml/quantization/Quantizer.java +++ b/src/net/sourceforge/plantuml/quantization/Quantizer.java @@ -4,7 +4,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.util.Set; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.ColorMapper; public final class Quantizer { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/command/regex/IRegex.java b/src/net/sourceforge/plantuml/regex/IRegex.java similarity index 93% rename from src/net/sourceforge/plantuml/command/regex/IRegex.java rename to src/net/sourceforge/plantuml/regex/IRegex.java index e06e5a562..2a4b88c5e 100644 --- a/src/net/sourceforge/plantuml/command/regex/IRegex.java +++ b/src/net/sourceforge/plantuml/regex/IRegex.java @@ -33,12 +33,12 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.Iterator; import java.util.Map; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public interface IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/Matcher2.java b/src/net/sourceforge/plantuml/regex/Matcher2.java similarity index 98% rename from src/net/sourceforge/plantuml/command/regex/Matcher2.java rename to src/net/sourceforge/plantuml/regex/Matcher2.java index a8cc9ae33..9af27d886 100644 --- a/src/net/sourceforge/plantuml/command/regex/Matcher2.java +++ b/src/net/sourceforge/plantuml/regex/Matcher2.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.HashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java b/src/net/sourceforge/plantuml/regex/MatcherIterator.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/MatcherIterator.java rename to src/net/sourceforge/plantuml/regex/MatcherIterator.java index 714574b43..2ed8c4a3e 100644 --- a/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java +++ b/src/net/sourceforge/plantuml/regex/MatcherIterator.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/command/regex/MyPattern.java b/src/net/sourceforge/plantuml/regex/MyPattern.java similarity index 98% rename from src/net/sourceforge/plantuml/command/regex/MyPattern.java rename to src/net/sourceforge/plantuml/regex/MyPattern.java index 704580ece..51bad23b5 100644 --- a/src/net/sourceforge/plantuml/command/regex/MyPattern.java +++ b/src/net/sourceforge/plantuml/regex/MyPattern.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/command/regex/Pattern2.java b/src/net/sourceforge/plantuml/regex/Pattern2.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/Pattern2.java rename to src/net/sourceforge/plantuml/regex/Pattern2.java index b128e5fc4..14e2a92a9 100644 --- a/src/net/sourceforge/plantuml/command/regex/Pattern2.java +++ b/src/net/sourceforge/plantuml/regex/Pattern2.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.regex.Pattern; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java b/src/net/sourceforge/plantuml/regex/RegexComposed.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/RegexComposed.java rename to src/net/sourceforge/plantuml/regex/RegexComposed.java index b8de7e552..75459fc33 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java +++ b/src/net/sourceforge/plantuml/regex/RegexComposed.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.Arrays; import java.util.Collections; @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public abstract class RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java b/src/net/sourceforge/plantuml/regex/RegexConcat.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/RegexConcat.java rename to src/net/sourceforge/plantuml/regex/RegexConcat.java index 2a9e2c861..b29c736fb 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java +++ b/src/net/sourceforge/plantuml/regex/RegexConcat.java @@ -33,11 +33,11 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.concurrent.atomic.AtomicLong; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public final class RegexConcat extends RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java b/src/net/sourceforge/plantuml/regex/RegexLeaf.java similarity index 96% rename from src/net/sourceforge/plantuml/command/regex/RegexLeaf.java rename to src/net/sourceforge/plantuml/regex/RegexLeaf.java index ff5c4f91e..dc2c3c100 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java +++ b/src/net/sourceforge/plantuml/regex/RegexLeaf.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.Collections; import java.util.Iterator; @@ -42,8 +42,8 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.FoxSignature; +import net.sourceforge.plantuml.text.StringLocated; public class RegexLeaf implements IRegex { @@ -54,7 +54,7 @@ public class RegexLeaf implements IRegex { private int count = -1; - @HaxeIgnored + public RegexLeaf(String regex) { this(null, regex); } diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java b/src/net/sourceforge/plantuml/regex/RegexOptional.java similarity index 94% rename from src/net/sourceforge/plantuml/command/regex/RegexOptional.java rename to src/net/sourceforge/plantuml/regex/RegexOptional.java index f6f9c338d..f39021753 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java +++ b/src/net/sourceforge/plantuml/regex/RegexOptional.java @@ -33,9 +33,9 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class RegexOptional extends RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOr.java b/src/net/sourceforge/plantuml/regex/RegexOr.java similarity index 93% rename from src/net/sourceforge/plantuml/command/regex/RegexOr.java rename to src/net/sourceforge/plantuml/regex/RegexOr.java index 9f1ca7bc2..eebaa8e2d 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOr.java +++ b/src/net/sourceforge/plantuml/regex/RegexOr.java @@ -33,20 +33,19 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class RegexOr extends RegexComposed implements IRegex { private final String name; - @HaxeIgnored + public RegexOr(IRegex... partial) { this(null, partial); } diff --git a/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java b/src/net/sourceforge/plantuml/regex/RegexPartialMatch.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java rename to src/net/sourceforge/plantuml/regex/RegexPartialMatch.java index cab6b0b61..ea1c6198b 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java +++ b/src/net/sourceforge/plantuml/regex/RegexPartialMatch.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.ArrayList; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexResult.java b/src/net/sourceforge/plantuml/regex/RegexResult.java similarity index 97% rename from src/net/sourceforge/plantuml/command/regex/RegexResult.java rename to src/net/sourceforge/plantuml/regex/RegexResult.java index 0ff7d4f7a..f1b1bd835 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexResult.java +++ b/src/net/sourceforge/plantuml/regex/RegexResult.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.regex; import java.util.Collections; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java b/src/net/sourceforge/plantuml/regexdiagram/CommandRegexfSingleLine.java similarity index 85% rename from src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java rename to src/net/sourceforge/plantuml/regexdiagram/CommandRegexfSingleLine.java index d5f068a14..c59546e5d 100644 --- a/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java +++ b/src/net/sourceforge/plantuml/regexdiagram/CommandRegexfSingleLine.java @@ -33,20 +33,20 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; import java.util.Collections; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class CommandRegexfSingleLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/regex/PSystemRegex.java b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java similarity index 96% rename from src/net/sourceforge/plantuml/regex/PSystemRegex.java rename to src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java index cd1f4be72..87f5bb922 100644 --- a/src/net/sourceforge/plantuml/regex/PSystemRegex.java +++ b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; import java.io.IOException; import java.io.OutputStream; @@ -61,17 +61,17 @@ import net.sourceforge.plantuml.ebnf.ETileZeroOrMore; import net.sourceforge.plantuml.ebnf.Symbol; import net.sourceforge.plantuml.ebnf.TextBlockable; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.CharInspector; diff --git a/src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegexFactory.java similarity index 97% rename from src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java rename to src/net/sourceforge/plantuml/regexdiagram/PSystemRegexFactory.java index 228423407..484c88fed 100644 --- a/src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java +++ b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegexFactory.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/regex/ReToken.java b/src/net/sourceforge/plantuml/regexdiagram/ReToken.java similarity index 97% rename from src/net/sourceforge/plantuml/regex/ReToken.java rename to src/net/sourceforge/plantuml/regexdiagram/ReToken.java index 7703f7240..6012b485e 100644 --- a/src/net/sourceforge/plantuml/regex/ReToken.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ReToken.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; public class ReToken { diff --git a/src/net/sourceforge/plantuml/regex/ReTokenType.java b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java similarity index 97% rename from src/net/sourceforge/plantuml/regex/ReTokenType.java rename to src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java index 02d08546a..594e6ae89 100644 --- a/src/net/sourceforge/plantuml/regex/ReTokenType.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; public enum ReTokenType { diff --git a/src/net/sourceforge/plantuml/regex/RegexExpression.java b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java similarity index 99% rename from src/net/sourceforge/plantuml/regex/RegexExpression.java rename to src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java index 84b6992e6..66872cad8 100644 --- a/src/net/sourceforge/plantuml/regex/RegexExpression.java +++ b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/regex/ShuntingYard.java b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java similarity index 98% rename from src/net/sourceforge/plantuml/regex/ShuntingYard.java rename to src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java index 5dc50d3e8..40f9a8a77 100644 --- a/src/net/sourceforge/plantuml/regex/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.regex; +package net.sourceforge.plantuml.regexdiagram; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/src/net/sourceforge/plantuml/salt/CommandAnything.java b/src/net/sourceforge/plantuml/salt/CommandAnything.java index 928e48215..5bf4c81e2 100644 --- a/src/net/sourceforge/plantuml/salt/CommandAnything.java +++ b/src/net/sourceforge/plantuml/salt/CommandAnything.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.salt; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAnything extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/salt/CommandSalt.java b/src/net/sourceforge/plantuml/salt/CommandSalt.java index 1f581c169..7f8cf56e1 100644 --- a/src/net/sourceforge/plantuml/salt/CommandSalt.java +++ b/src/net/sourceforge/plantuml/salt/CommandSalt.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.salt; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSalt extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java index 929321765..92e5d48bb 100644 --- a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java +++ b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java @@ -40,9 +40,9 @@ import java.util.List; import java.util.StringTokenizer; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class DataSourceImpl implements DataSource { diff --git a/src/net/sourceforge/plantuml/salt/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index 28d8f0860..6f31810f4 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -58,7 +58,11 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.factory.AbstractElementFactoryComplex; @@ -83,18 +87,14 @@ import net.sourceforge.plantuml.salt.factory.ElementFactoryTree; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; 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.HColors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.Log; public class PSystemSalt extends TitledDiagram implements WithSprite { private final List data; - private final Dictionary dictionary = new Dictionary(); + private final SaltDictionary dictionary = new SaltDictionary(); @Deprecated public PSystemSalt(UmlSource source, List data) { @@ -226,7 +226,7 @@ public class PSystemSalt extends TitledDiagram implements WithSprite { } private static void addSimpleFactory(final AbstractElementFactoryComplex cpxFactory, final DataSource source, - Dictionary dictionary) { + SaltDictionary dictionary) { cpxFactory.addFactory(new ElementFactoryMenu(source, dictionary)); cpxFactory.addFactory(new ElementFactoryTree(source, dictionary)); cpxFactory.addFactory(new ElementFactoryTab(source, dictionary)); diff --git a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java index 4d8442655..25b317744 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java @@ -30,44 +30,43 @@ * * * Original Author: Arnaud Roques - * + * * */ package net.sourceforge.plantuml.salt; -import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.PSystemBasicFactory; +import java.util.List; +import java.util.Map; + +import net.sourceforge.plantuml.command.Command; +import net.sourceforge.plantuml.command.CommonCommands; +import net.sourceforge.plantuml.command.PSystemCommandFactory; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; -public class PSystemSaltFactory extends PSystemBasicFactory { +public class PSystemSaltFactory extends PSystemCommandFactory { - public PSystemSaltFactory(DiagramType diagramType) { - super(diagramType); + public PSystemSaltFactory(DiagramType init) { + super(init); } @Override - public PSystemSalt initDiagram(UmlSource source, String startLine) { - if (getDiagramType() == DiagramType.UML) { - return null; - } else if (getDiagramType() == DiagramType.SALT) { - return new PSystemSalt(source); - } else { - throw new IllegalStateException(getDiagramType().name()); - } + protected void initCommandsList(List cmds) { + if (getDiagramType() == DiagramType.UML) + cmds.add(new CommandSalt()); + CommonCommands.addCommonCommands2(cmds); + CommonCommands.addTitleCommands(cmds); + cmds.add(new CommandAnything()); } @Override - public PSystemSalt executeLine(UmlSource source, PSystemSalt system, String line) { - if (system == null && line.replace('\t', ' ').trim().equals("salt")) { - return new PSystemSalt(source); + public PSystemSalt createEmptyDiagram(UmlSource source, Map skinParam) { + final PSystemSalt result = new PSystemSalt(source); + if (getDiagramType() == DiagramType.SALT) { + result.setIamSalt(true); } - if (system == null) { - return null; - } - system.add(StringUtils.trin(line)); - return system; + return result; } } diff --git a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory2.java b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory2.java deleted file mode 100644 index 0558da61f..000000000 --- a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory2.java +++ /dev/null @@ -1,72 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2023, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * If you like this project or if you find it useful, you can support us at: - * - * http://plantuml.com/patreon (only 1$ per month!) - * http://plantuml.com/paypal - * - * This file is part of PlantUML. - * - * PlantUML is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * PlantUML distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - * License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. - * - * - * Original Author: Arnaud Roques - * - * - */ -package net.sourceforge.plantuml.salt; - -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.command.Command; -import net.sourceforge.plantuml.command.CommonCommands; -import net.sourceforge.plantuml.command.PSystemCommandFactory; -import net.sourceforge.plantuml.core.DiagramType; -import net.sourceforge.plantuml.core.UmlSource; - -public class PSystemSaltFactory2 extends PSystemCommandFactory { - - public PSystemSaltFactory2(DiagramType init) { - super(init); - } - - @Override - protected void initCommandsList(List cmds) { - if (getDiagramType() == DiagramType.UML) - cmds.add(new CommandSalt()); - - CommonCommands.addCommonCommands2(cmds); - CommonCommands.addTitleCommands(cmds); - cmds.add(new CommandAnything()); - } - - @Override - public PSystemSalt createEmptyDiagram(UmlSource source, Map skinParam) { - final PSystemSalt result = new PSystemSalt(source); - if (getDiagramType() == DiagramType.SALT) { - result.setIamSalt(true); - } - return result; - } - -} diff --git a/src/net/sourceforge/plantuml/salt/Dictionary.java b/src/net/sourceforge/plantuml/salt/SaltDictionary.java similarity index 90% rename from src/net/sourceforge/plantuml/salt/Dictionary.java rename to src/net/sourceforge/plantuml/salt/SaltDictionary.java index d455eca2a..37266756e 100644 --- a/src/net/sourceforge/plantuml/salt/Dictionary.java +++ b/src/net/sourceforge/plantuml/salt/SaltDictionary.java @@ -39,22 +39,22 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.Guillemet; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.SpriteContainer; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.SheetBuilder; import net.sourceforge.plantuml.creole.legacy.CreoleParser; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.WrappedElement; import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.sprite.SpriteContainer; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.text.Guillemet; -public class Dictionary implements SpriteContainer, ISkinSimple { +public class SaltDictionary implements SpriteContainer, ISkinSimple { private final Map data = new HashMap(); diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java index b584cf75f..f12fa1601 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.graphic.FontConfiguration; -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.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; public abstract class AbstractElement implements Element { diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java index bcc7901e0..b0c48c452 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Splitter; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; abstract class AbstractElementText extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/Element.java b/src/net/sourceforge/plantuml/salt/element/Element.java index 0849d24b7..fc3451de5 100644 --- a/src/net/sourceforge/plantuml/salt/element/Element.java +++ b/src/net/sourceforge/plantuml/salt/element/Element.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public interface Element { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java index f6d070a60..30b8512e2 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class ElementBorder extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementButton.java b/src/net/sourceforge/plantuml/salt/element/ElementButton.java index 77428e810..825921f20 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementButton.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementButton.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementButton extends AbstractElementText implements Element { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java index 1ae756004..fc5da2fdf 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java @@ -39,19 +39,19 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class ElementDroplist extends AbstractElementText implements Element { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java index 3c96dcce4..15c0886c9 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class ElementEmpty extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementImage.java b/src/net/sourceforge/plantuml/salt/element/ElementImage.java index 32e678f13..d14248740 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementImage.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementImage.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.salt.element; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPixel; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementImage extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementLine.java b/src/net/sourceforge/plantuml/salt/element/ElementLine.java index b18613596..3507f157a 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementLine.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementLine.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementLine extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java index cbf25d62c..1350ac393 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java @@ -40,13 +40,13 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementMenuBar extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java index df880a034..8c951107e 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java @@ -35,17 +35,17 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ElementMenuEntry extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java index 607b22e3d..fd1899c35 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.salt.element; import java.util.ArrayList; import java.util.Collection; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementMenuPopup extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java index 19bd5ceb2..c83370b87 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java @@ -41,19 +41,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.salt.Cell; import net.sourceforge.plantuml.salt.Positionner2; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementPyramid extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java b/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java index 6eccacc35..13e603e59 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.salt.Positionner2; import net.sourceforge.plantuml.salt.factory.ScrollStrategy; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementPyramidScrolled extends ElementPyramid { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java index 584a388e4..a05f80638 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java @@ -37,21 +37,21 @@ package net.sourceforge.plantuml.salt.element; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class ElementRadioCheckbox extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java index 77ef060d5..7c077dcbf 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java @@ -39,13 +39,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementTabBar extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementText.java b/src/net/sourceforge/plantuml/salt/element/ElementText.java index 593ed4bc7..9656f782f 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementText.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.salt.element; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; public class ElementText extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java index d6309f535..72d7b7c51 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.salt.element; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementTextField extends AbstractElementText implements Element { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTree.java b/src/net/sourceforge/plantuml/salt/element/ElementTree.java index 8858d3a83..2cdb98735 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTree.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTree.java @@ -40,11 +40,11 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; public class ElementTree extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java index 802ad46f0..178e53c2d 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java @@ -40,9 +40,9 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ElementTreeEntry { diff --git a/src/net/sourceforge/plantuml/salt/element/Grid.java b/src/net/sourceforge/plantuml/salt/element/Grid.java index 435d2f041..e23a1521e 100644 --- a/src/net/sourceforge/plantuml/salt/element/Grid.java +++ b/src/net/sourceforge/plantuml/salt/element/Grid.java @@ -40,12 +40,12 @@ import java.util.Set; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.salt.Cell; import net.sourceforge.plantuml.ugraphic.UGraphic; -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; public class Grid { diff --git a/src/net/sourceforge/plantuml/salt/element/Grid2.java b/src/net/sourceforge/plantuml/salt/element/Grid2.java index 8dacb53aa..c3c4a9771 100644 --- a/src/net/sourceforge/plantuml/salt/element/Grid2.java +++ b/src/net/sourceforge/plantuml/salt/element/Grid2.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.salt.element; import java.util.List; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Grid2 { diff --git a/src/net/sourceforge/plantuml/salt/element/Skeleton.java b/src/net/sourceforge/plantuml/salt/element/Skeleton.java index 5175eb369..984c3d4f1 100644 --- a/src/net/sourceforge/plantuml/salt/element/Skeleton.java +++ b/src/net/sourceforge/plantuml/salt/element/Skeleton.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.salt.element; import java.util.ArrayList; import java.util.List; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Skeleton { diff --git a/src/net/sourceforge/plantuml/salt/element/Skeleton2.java b/src/net/sourceforge/plantuml/salt/element/Skeleton2.java index 6deef8889..1f315e441 100644 --- a/src/net/sourceforge/plantuml/salt/element/Skeleton2.java +++ b/src/net/sourceforge/plantuml/salt/element/Skeleton2.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.salt.element; import java.util.ArrayList; import java.util.List; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Skeleton2 { diff --git a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java index 153d5578f..8de16df1f 100644 --- a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java +++ b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; public class WrappedElement implements Element { diff --git a/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java b/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java index 4527e9126..1c857126b 100644 --- a/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java +++ b/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.Collection; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; @@ -47,10 +47,10 @@ public abstract class AbstractElementFactoryComplex implements ElementFactory { final private DataSource dataSource; final private Collection factories = new ArrayList<>(); - final private Dictionary dictionary; + final private SaltDictionary dictionary; - public AbstractElementFactoryComplex(DataSource dataSource, Dictionary dictionary) { + public AbstractElementFactoryComplex(DataSource dataSource, SaltDictionary dictionary) { this.dataSource = dataSource; this.dictionary = dictionary; } @@ -72,7 +72,7 @@ public abstract class AbstractElementFactoryComplex implements ElementFactory { return dataSource; } - protected final Dictionary getDictionary() { + protected final SaltDictionary getDictionary() { return dictionary; } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java index 5b7b09127..fe4985fe3 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.salt.factory; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementBorder; public class ElementFactoryBorder extends AbstractElementFactoryComplex { - public ElementFactoryBorder(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryBorder(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java index 2bd904d04..9bf9ed7f1 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.salt.factory; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementButton; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryButton implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java index dd7ca804c..27301d73d 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementRadioCheckbox; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryCheckboxOff implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java index 63d89ba42..e477eca33 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementRadioCheckbox; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryCheckboxOn implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java index 4e89f7655..f01525e6b 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.salt.factory; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementDroplist; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryDroplist implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java index edb872136..632a30ea5 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementImage; @@ -47,9 +47,9 @@ import net.sourceforge.plantuml.salt.element.ElementImage; public class ElementFactoryImage implements ElementFactory { final private DataSource dataSource; - final private Dictionary dictionary; + final private SaltDictionary dictionary; - public ElementFactoryImage(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryImage(DataSource dataSource, SaltDictionary dictionary) { this.dataSource = dataSource; this.dictionary = dictionary; } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java index 92d4d64b4..d21c70960 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java @@ -35,17 +35,17 @@ */ package net.sourceforge.plantuml.salt.factory; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.Terminator; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementMenuBar; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryMenu extends AbstractElementFactoryComplex { - public ElementFactoryMenu(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryMenu(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java index ecab7d958..e73536fb2 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.salt.factory; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Positionner2; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.Terminator; @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.salt.element.TableStrategy; public class ElementFactoryPyramid extends AbstractElementFactoryComplex { - public ElementFactoryPyramid(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryPyramid(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java index 9c0766c06..926b38553 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementRadioCheckbox; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryRadioOff implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java index 71c21c990..ad6407b1d 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; import java.util.List; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementRadioCheckbox; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryRadioOn implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java index f81ab0e66..ba1377dc0 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java @@ -38,16 +38,16 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Objects; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; public class ElementFactoryRetrieveFromDictonnary implements ElementFactory { - private final Dictionary dictionary; + private final SaltDictionary dictionary; private final DataSource dataSource; - public ElementFactoryRetrieveFromDictonnary(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryRetrieveFromDictonnary(DataSource dataSource, SaltDictionary dictionary) { this.dataSource = dataSource; this.dictionary = dictionary; } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryScroll.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryScroll.java index 1876e4fec..01f0c1326 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryScroll.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryScroll.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.salt.factory; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Positionner2; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.salt.element.ElementPyramidScrolled; public class ElementFactoryScroll extends AbstractElementFactoryComplex { - public ElementFactoryScroll(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryScroll(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java index 17a2375ca..5234be22d 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java @@ -35,17 +35,17 @@ */ package net.sourceforge.plantuml.salt.factory; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.Terminator; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementTabBar; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryTab extends AbstractElementFactoryComplex { - public ElementFactoryTab(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryTab(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java index 1d642a588..c9c9e9277 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementText; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryText implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java index e0df92c3b..8c870a34d 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.salt.factory; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementTextField; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryTextField implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java index 7a85bc479..66fc34eea 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.salt.factory; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.salt.DataSource; -import net.sourceforge.plantuml.salt.Dictionary; +import net.sourceforge.plantuml.salt.SaltDictionary; import net.sourceforge.plantuml.salt.Terminated; import net.sourceforge.plantuml.salt.Terminator; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementTree; import net.sourceforge.plantuml.salt.element.TableStrategy; -import net.sourceforge.plantuml.ugraphic.UFont; public class ElementFactoryTree extends AbstractElementFactoryComplex { - public ElementFactoryTree(DataSource dataSource, Dictionary dictionary) { + public ElementFactoryTree(DataSource dataSource, SaltDictionary dictionary) { super(dataSource, dictionary); } diff --git a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java index c3b3f60ad..871fd3136 100644 --- a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java +++ b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java @@ -76,12 +76,15 @@ import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.QuoteUtils; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -96,10 +99,7 @@ import net.sourceforge.plantuml.svek.GraphvizCrash; import net.sourceforge.plantuml.svek.IEntityImage; import net.sourceforge.plantuml.svek.SvekNode; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import smetana.core.CString; import smetana.core.JUtils; import smetana.core.Macro; diff --git a/src/net/sourceforge/plantuml/sdot/SmetanaPath.java b/src/net/sourceforge/plantuml/sdot/SmetanaPath.java index ad24378b9..17cb43fac 100644 --- a/src/net/sourceforge/plantuml/sdot/SmetanaPath.java +++ b/src/net/sourceforge/plantuml/sdot/SmetanaPath.java @@ -42,15 +42,19 @@ import h.ST_pointf; import h.ST_splines; import h.ST_textlabel_t; import net.sourceforge.plantuml.LineParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.graphic.color.ColorType; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -58,11 +62,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.extremity.ExtremityFactory; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.url.Url; import smetana.core.Macro; public class SmetanaPath implements UDrawable { diff --git a/src/net/sourceforge/plantuml/sdot/YMirror.java b/src/net/sourceforge/plantuml/sdot/YMirror.java index 04027e7bd..6a9ebd943 100644 --- a/src/net/sourceforge/plantuml/sdot/YMirror.java +++ b/src/net/sourceforge/plantuml/sdot/YMirror.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.sdot; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.posimo.DotPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UTranslate; public class YMirror { diff --git a/src/net/sourceforge/plantuml/security/SFile.java b/src/net/sourceforge/plantuml/security/SFile.java index 9ad189c2d..3ab923bbe 100644 --- a/src/net/sourceforge/plantuml/security/SFile.java +++ b/src/net/sourceforge/plantuml/security/SFile.java @@ -258,6 +258,7 @@ public class SFile implements Comparable { * Check SecurityProfile to see if this file can be open. */ private boolean isFileOk() { + // ::comment when WASM if (SecurityUtils.getSecurityProfile() == SecurityProfile.SANDBOX) // In SANDBOX, we cannot read any files return false; @@ -294,6 +295,7 @@ public class SFile implements Comparable { return false; } + // ::done return true; } @@ -314,12 +316,14 @@ public class SFile implements Comparable { * @throws IOException If an I/O error occurs, which is possible because the * check the pathname may require filesystem queries */ + // ::comment when WASM private boolean isDenied() throws IOException { SFile securityPath = SecurityUtils.getSecurityPath(); if (securityPath == null) return false; return getSanitizedPath().startsWith(securityPath.getSanitizedPath()); } + // ::done /** * Returns a sanitized, canonical and normalized Path to a file. @@ -350,9 +354,11 @@ public class SFile implements Comparable { // https://stackoverflow.com/questions/18743790/can-java-load-images-with-transparency if (isFileOk()) try { + // ::comment when WASM if (internal.getName().endsWith(".webp")) return readWebp(); else + // ::done return SecurityUtils.readRasterImage(new ImageIcon(this.getAbsolutePath())); } catch (Exception e) { Logme.error(e); @@ -360,6 +366,7 @@ public class SFile implements Comparable { return null; } + // ::comment when WASM private BufferedImage readWebp() throws IOException { try (InputStream is = openFile()) { final int riff = read32(is); @@ -405,6 +412,7 @@ public class SFile implements Comparable { return null; } } + // ::done public BufferedReader openBufferedReader() { if (isFileOk()) { diff --git a/src/net/sourceforge/plantuml/security/SURL.java b/src/net/sourceforge/plantuml/security/SURL.java index a01d5af25..dc19a62f2 100644 --- a/src/net/sourceforge/plantuml/security/SURL.java +++ b/src/net/sourceforge/plantuml/security/SURL.java @@ -72,6 +72,9 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.authentication.SecurityAccessInterceptor; import net.sourceforge.plantuml.security.authentication.SecurityAuthentication; import net.sourceforge.plantuml.security.authentication.SecurityCredentials; +//::uncomment when WASM +//import net.sourceforge.plantuml.FileUtils; +//::done /** * Secure replacement for java.net.URL. @@ -108,21 +111,6 @@ public class SURL { */ public static final String WITHOUT_AUTHENTICATION = SecurityUtils.NO_CREDENTIALS; - /** - * Regex to remove the UserInfo part from a URL. - */ - private static final Pattern PATTERN_USERINFO = Pattern.compile("(^https?://)([-_0-9a-zA-Z]+@)([^@]*)"); - - private static final ExecutorService EXE = Executors.newCachedThreadPool(new ThreadFactory() { - public Thread newThread(Runnable r) { - final Thread t = Executors.defaultThreadFactory().newThread(r); - t.setDaemon(true); - return t; - } - }); - - private static final Map BAD_HOSTS = new ConcurrentHashMap(); - /** * Internal URL, maybe cleaned from user-token. */ @@ -173,6 +161,7 @@ public class SURL { if (url == null) throw new MalformedURLException("URL cannot be null"); + // ::comment when WASM final String credentialId = url.getUserInfo(); if (credentialId == null || credentialId.indexOf(':') > 0) @@ -183,9 +172,98 @@ public class SURL { // Given userInfo, but without a password. We try to find SecurityCredentials return new SURL(removeUserInfo(url), credentialId); else + // ::done return new SURL(url, WITHOUT_AUTHENTICATION); } + // ::uncomment when WASM +// public InputStream openStream() { +// try { +// return internal.openStream(); +// } catch (IOException e) { +// System.err.println("SURL::openStream " + e); +// return null; +// } +//} +//public byte[] getBytes() { +// final InputStream is = openStream(); +// if (is != null) +// try { +// final ByteArrayOutputStream baos = new ByteArrayOutputStream(); +// FileUtils.copyInternal(is, baos, true); +// return baos.toByteArray(); +// } catch (IOException e) { +// System.err.println("SURL::getBytes " + e); +// } +// return null; +//} + // ::done + + public BufferedImage readRasterImageFromURL() { + if (isUrlOk()) + try { + final byte[] bytes = getBytes(); + if (bytes == null || bytes.length == 0) + return null; + final ImageIcon tmp = new ImageIcon(bytes); + return SecurityUtils.readRasterImage(tmp); + } catch (Exception e) { + Logme.error(e); + } + return null; + } + + /** + * Check SecurityProfile to see if this URL can be opened. + */ + private boolean isUrlOk() { + // ::comment when WASM + if (SecurityUtils.getSecurityProfile() == SecurityProfile.SANDBOX) + // In SANDBOX, we cannot read any URL + return false; + + if (SecurityUtils.getSecurityProfile() == SecurityProfile.LEGACY) + return true; + + if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) + // We are UNSECURE anyway + return true; + + if (isInUrlAllowList()) + // ::done + return true; + // ::comment when WASM + + if (SecurityUtils.getSecurityProfile() == SecurityProfile.INTERNET) { + if (forbiddenURL(cleanPath(internal.toString()))) + return false; + + final int port = internal.getPort(); + // Using INTERNET profile, port 80 and 443 are ok + return port == 80 || port == 443 || port == -1; + } + return false; + // ::done + } + + + + // ::comment when WASM + /** + * Regex to remove the UserInfo part from a URL. + */ + private static final Pattern PATTERN_USERINFO = Pattern.compile("(^https?://)([-_0-9a-zA-Z]+@)([^@]*)"); + + private static final ExecutorService EXE = Executors.newCachedThreadPool(new ThreadFactory() { + public Thread newThread(Runnable r) { + final Thread t = Executors.defaultThreadFactory().newThread(r); + t.setDaemon(true); + return t; + } + }); + + private static final Map BAD_HOSTS = new ConcurrentHashMap(); + /** * Creates a URL without UserInfo part and without SecurityCredentials. * @@ -215,35 +293,6 @@ public class SURL { return internal.toString(); } - /** - * Check SecurityProfile to see if this URL can be opened. - */ - private boolean isUrlOk() { - if (SecurityUtils.getSecurityProfile() == SecurityProfile.SANDBOX) - // In SANDBOX, we cannot read any URL - return false; - - if (SecurityUtils.getSecurityProfile() == SecurityProfile.LEGACY) - return true; - - if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) - // We are UNSECURE anyway - return true; - - if (isInUrlAllowList()) - return true; - - if (SecurityUtils.getSecurityProfile() == SecurityProfile.INTERNET) { - if (forbiddenURL(cleanPath(internal.toString()))) - return false; - - final int port = internal.getPort(); - // Using INTERNET profile, port 80 and 443 are ok - return port == 80 || port == 443 || port == -1; - } - return false; - } - private boolean forbiddenURL(String full) { if (full.startsWith("https://") == false && full.startsWith("http://") == false) return true; @@ -564,20 +613,6 @@ public class SURL { return null; } - public BufferedImage readRasterImageFromURL() { - if (isUrlOk()) - try { - final byte[] bytes = getBytes(); - if (bytes == null || bytes.length == 0) - return null; - final ImageIcon tmp = new ImageIcon(bytes); - return SecurityUtils.readRasterImage(tmp); - } catch (Exception e) { - Logme.error(e); - } - return null; - } - /** * Informs, if SecurityCredentials are configured for this connection. * @@ -660,4 +695,5 @@ public class SURL { return url; } + // ::done } diff --git a/src/net/sourceforge/plantuml/security/SecurityProfile.java b/src/net/sourceforge/plantuml/security/SecurityProfile.java index df40e7834..78c65dfd1 100644 --- a/src/net/sourceforge/plantuml/security/SecurityProfile.java +++ b/src/net/sourceforge/plantuml/security/SecurityProfile.java @@ -105,6 +105,7 @@ public enum SecurityProfile { * @return the value */ static SecurityProfile init() { + // ::comment when WASM final String env = SecurityUtils.getenv("PLANTUML_SECURITY_PROFILE"); if ("SANDBOX".equalsIgnoreCase(env)) return SANDBOX; @@ -113,9 +114,12 @@ public enum SecurityProfile { else if ("INTERNET".equalsIgnoreCase(env)) return INTERNET; else if ("UNSECURE".equalsIgnoreCase(env)) + // ::done return UNSECURE; + // ::comment when WASM return LEGACY; + // ::done } /** diff --git a/src/net/sourceforge/plantuml/security/SecurityUtils.java b/src/net/sourceforge/plantuml/security/SecurityUtils.java index 9ef745f7f..8d4920946 100644 --- a/src/net/sourceforge/plantuml/security/SecurityUtils.java +++ b/src/net/sourceforge/plantuml/security/SecurityUtils.java @@ -78,11 +78,38 @@ import net.sourceforge.plantuml.utils.Log; public class SecurityUtils { + // ::uncomment when WASM +// public static SecurityProfile getSecurityProfile() { +// return SecurityProfile.UNSECURE; +// } + // ::done + + public static boolean ignoreThisLink(String url) { + // ::comment when WASM + if (allowJavascriptInLink() == false && isJavascriptLink(url)) + return true; + // ::done + return false; + } + /** * Indicates, that we have no authentication and credentials to access the URL. */ public static final String NO_CREDENTIALS = ""; + public synchronized static BufferedImage readRasterImage(final ImageIcon imageIcon) { + final Image tmpImage = imageIcon.getImage(); + if (imageIcon.getIconWidth() == -1) + return null; + + final BufferedImage image = new BufferedImage(imageIcon.getIconWidth(), imageIcon.getIconHeight(), + BufferedImage.TYPE_INT_ARGB); + image.getGraphics().drawImage(tmpImage, 0, 0, null); + tmpImage.flush(); + return image; + } + + // ::comment when WASM /** * Java class paths to import files from. */ @@ -97,7 +124,7 @@ public class SecurityUtils { * Whitelist of paths from where scripts can load data. */ public static final String ALLOWLIST_LOCAL_PATHS = "plantuml.allowlist.path"; - + /** * Whitelist of urls */ @@ -173,12 +200,6 @@ public class SecurityUtils { return current; } - public static boolean ignoreThisLink(String url) { - if (allowJavascriptInLink() == false && isJavascriptLink(url)) - return true; - return false; - } - private static boolean isJavascriptLink(String url) { return url.toLowerCase().replaceAll("[^a-z]", "").startsWith("javascript"); } @@ -265,18 +286,6 @@ public class SecurityUtils { return new PrintStream(os, autoFlush, charset.name()); } - public synchronized static BufferedImage readRasterImage(final ImageIcon imageIcon) { - final Image tmpImage = imageIcon.getImage(); - if (imageIcon.getIconWidth() == -1) - return null; - - final BufferedImage image = new BufferedImage(imageIcon.getIconWidth(), imageIcon.getIconHeight(), - BufferedImage.TYPE_INT_ARGB); - image.getGraphics().drawImage(tmpImage, 0, 0, null); - tmpImage.flush(); - return image; - } - // ---- public static FileReader createFileReader(String path) throws FileNotFoundException { return new FileReader(path); @@ -432,5 +441,6 @@ public class SecurityUtils { } return Json.object(); } + // ::done } diff --git a/src/net/sourceforge/plantuml/security/authentication/SecurityAccessInterceptor.java b/src/net/sourceforge/plantuml/security/authentication/SecurityAccessInterceptor.java index a554a3dc3..591f15e1a 100644 --- a/src/net/sourceforge/plantuml/security/authentication/SecurityAccessInterceptor.java +++ b/src/net/sourceforge/plantuml/security/authentication/SecurityAccessInterceptor.java @@ -38,16 +38,19 @@ package net.sourceforge.plantuml.security.authentication; import java.net.URLConnection; /** - * The security access interceptor applies the authentication information to a HTTP connection. This can be a - * user/password combination for BasicAuth or a bearer token for OAuth2. + * The security access interceptor applies the authentication information to a + * HTTP connection. This can be a user/password combination for BasicAuth or a + * bearer token for OAuth2. * * @author Aljoscha Rittner */ public interface SecurityAccessInterceptor { + // ::remove folder when WASM /** * Applies to a connection the authentication information. * - * @param authentication the determined authentication data to authorize for the endpoint access + * @param authentication the determined authentication data to authorize for the + * endpoint access * @param connection the connection to the endpoint */ void apply(SecurityAuthentication authentication, URLConnection connection); diff --git a/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java b/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java index a18004429..f28ad7d45 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java +++ b/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.url.Url; public abstract class AbstractEvent implements Event { diff --git a/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java b/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java index 96d73fe35..d97858ede 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java @@ -41,7 +41,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.skin.ArrowConfiguration; @@ -52,6 +51,7 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.WithStyle; +import net.sourceforge.plantuml.url.Url; public abstract class AbstractMessage extends AbstractEvent implements EventWithDeactivate, WithStyle { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Doll.java b/src/net/sourceforge/plantuml/sequencediagram/Doll.java index f412a703f..691e2c088 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Doll.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Doll.java @@ -43,7 +43,9 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.PaddingParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.teoz.LivingSpace; import net.sourceforge.plantuml.sequencediagram.teoz.TileArguments; @@ -58,8 +60,6 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.WithStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Doll implements WithStyle { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Event.java b/src/net/sourceforge/plantuml/sequencediagram/Event.java index 5858371c9..3cb6d40b6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Event.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Event.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.url.Url; public interface Event { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Grouping.java b/src/net/sourceforge/plantuml/sequencediagram/Grouping.java index 6376ec2ea..373c574a4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Grouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Grouping.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.sequencediagram; +import net.sourceforge.plantuml.klimt.color.HColor; 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.StyleSignatureBasic; import net.sourceforge.plantuml.style.WithStyle; -import net.sourceforge.plantuml.ugraphic.color.HColor; public abstract class Grouping extends AbstractEvent implements Event, WithStyle { diff --git a/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java b/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java index 71c9acd2b..5b9c310e5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java @@ -39,9 +39,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.StyleBuilder; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; final public class GroupingLeaf extends Grouping implements EventWithDeactivate { diff --git a/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java b/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java index e5a393e0d..5a0fbbfb8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java @@ -39,11 +39,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.Url; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class GroupingStart extends Grouping { diff --git a/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java b/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java index 7fc3e7c3b..3eed18025 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java +++ b/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java b/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java index 311f0f3b3..5005aad3b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java +++ b/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java @@ -40,7 +40,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.graphic.GroupingGraphicalElementElse; import net.sourceforge.plantuml.sequencediagram.graphic.LivingParticipantBox; import net.sourceforge.plantuml.sequencediagram.graphic.MessageExoArrow; diff --git a/src/net/sourceforge/plantuml/sequencediagram/LinkAnchor.java b/src/net/sourceforge/plantuml/sequencediagram/LinkAnchor.java index 4f8a4eb9d..6b622e74b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/LinkAnchor.java +++ b/src/net/sourceforge/plantuml/sequencediagram/LinkAnchor.java @@ -38,10 +38,11 @@ package net.sourceforge.plantuml.sequencediagram; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.teoz.CommonTile; import net.sourceforge.plantuml.sequencediagram.teoz.YGauge; import net.sourceforge.plantuml.style.PName; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class LinkAnchor { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Note.java b/src/net/sourceforge/plantuml/sequencediagram/Note.java index 4ab0063ee..930e14be3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Note.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Note.java @@ -39,7 +39,6 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SpecificBackcolorable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.Colors; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.WithStyle; +import net.sourceforge.plantuml.url.Url; final public class Note extends AbstractEvent implements Event, SpecificBackcolorable, WithStyle { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Participant.java b/src/net/sourceforge/plantuml/sequencediagram/Participant.java index 2d3830293..f1006627a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Participant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Participant.java @@ -39,20 +39,20 @@ import java.util.Objects; import java.util.Set; import net.sourceforge.plantuml.SpecificBackcolorable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.SymbolContext; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.MergeStrategy; 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.style.WithStyle; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class Participant implements SpecificBackcolorable, WithStyle { diff --git a/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java b/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java index a844cf934..fbd66c4e8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java +++ b/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java @@ -41,7 +41,7 @@ import java.util.List; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class ParticipantEnglober { diff --git a/src/net/sourceforge/plantuml/sequencediagram/Reference.java b/src/net/sourceforge/plantuml/sequencediagram/Reference.java index 42e4f53f9..e4162d6ee 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Reference.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Reference.java @@ -40,14 +40,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColor; 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.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class Reference extends AbstractEvent implements Event { diff --git a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java index 6ed2cc2dd..f929e788c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java +++ b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.sequencediagram.graphic.FileMaker; import net.sourceforge.plantuml.sequencediagram.graphic.SequenceDiagramFileMakerPuma2; @@ -70,7 +71,6 @@ import net.sourceforge.plantuml.sequencediagram.teoz.SequenceDiagramFileMakerTeo import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.xmi.SequenceDiagramXmiMaker; public class SequenceDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java index 19445f500..91529e5ec 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java @@ -38,16 +38,16 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java index 34a847712..db6d89a53 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivate2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java index a5aeacbc1..50fdbd332 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java @@ -41,21 +41,21 @@ import java.util.List; import java.util.StringTokenizer; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.Message; import net.sourceforge.plantuml.sequencediagram.Participant; @@ -65,9 +65,9 @@ import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.ArrowDecoration; import net.sourceforge.plantuml.skin.ArrowHead; import net.sourceforge.plantuml.skin.ArrowPart; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandArrow extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java index 4999cdf0e..56bcb837a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java index 725bab019..e69b4a7b9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java index 0d000f698..4a7053e0f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java @@ -39,10 +39,10 @@ import java.text.DecimalFormat; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.DottedNumber; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java index 82408526d..8db69a72a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java index 15cfcc6e5..b5b211962 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java @@ -39,10 +39,10 @@ import java.text.DecimalFormat; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java index 7f2e4e12a..ca145cb76 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java index 274148a30..971003ebe 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java index 59f08ce68..440fb270e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java @@ -38,19 +38,19 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandBoxStart extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java index 6bcfe2aa1..f6e0d7f88 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java index 0d7c0051e..7db96f718 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java index 01266b815..f9c391b41 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java index c9859fd45..406ed3528 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java @@ -36,14 +36,13 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.MessageExo; import net.sourceforge.plantuml.sequencediagram.MessageExoType; @@ -54,8 +53,9 @@ import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.ArrowDecoration; import net.sourceforge.plantuml.skin.ArrowHead; import net.sourceforge.plantuml.skin.ArrowPart; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; abstract class CommandExoArrowAny extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java index 4f7aea6e5..20b10f0fb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.MessageExoType; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandExoArrowLeft extends CommandExoArrowAny { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java index 0335d78e8..9d8ed9c24 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.MessageExoType; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandExoArrowRight extends CommandExoArrowAny { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java index b76a7f055..1fa50bdfb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java index 009c9db1a..1e6986d46 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java index 514df8371..0ff14216f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java @@ -41,16 +41,16 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.GroupingType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGrouping extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java index d92f6d8ad..e507928d2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java index 087e59575..57f543405 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java index 76ce7a42c..a636fbdb8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java index b9039f623..11e05d6ce 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java index 6ff35b135..fec260d36 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java index 78714b542..1080d4a13 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java @@ -35,29 +35,29 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.ParticipantType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public abstract class CommandParticipant extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java index 033dcf279..3d3391041 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.graphic.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA extends CommandParticipant { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java index 76e8be27b..3296b949c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.graphic.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA2 extends CommandParticipant { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java index 9b39bbded..178a6bce6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.graphic.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA3 extends CommandParticipant { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java index 2c14bda9a..94ad5a981 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.graphic.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA4 extends CommandParticipant { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java index d9509ce3e..375d76254 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java @@ -35,27 +35,27 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.ParticipantType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; public class CommandParticipantMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java index 9d9557aa1..895be35bc 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java @@ -39,21 +39,21 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.Reference; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.BlocLines; public class CommandReferenceMultilinesOverSeveral extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java index 1ad33204e..b0940ec9b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java @@ -39,21 +39,21 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.Reference; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandReferenceOverSeveral extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java index e4836b6da..d85a8d55b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java @@ -37,12 +37,14 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.EventWithDeactivate; import net.sourceforge.plantuml.sequencediagram.LifeEventType; @@ -51,8 +53,6 @@ import net.sourceforge.plantuml.sequencediagram.MessageExo; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.skin.ArrowBody; import net.sourceforge.plantuml.skin.ArrowConfiguration; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandReturn extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java index da7a11771..9c0fb86f8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java @@ -40,10 +40,10 @@ import java.io.IOException; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSkin extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java index f4e0bbfcf..07d14b783 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandUrl extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java index b6f360ddd..b411506b9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.url.Url; abstract class Arrow extends GraphicalElement implements InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java index 87df9b2eb..cec3d96e3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java index 5084a914e..f21f7daea 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ArrowAndParticipant extends Arrow implements InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java index 10b3abe98..c7cabac39 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class ConstraintSet { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java index 98ba88f8f..ee06a14f3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java @@ -48,12 +48,15 @@ import java.util.Set; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.SkinParamBackcolored; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.sequencediagram.Doll; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Newpage; @@ -65,12 +68,9 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.SimpleContext2D; import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; +import net.sourceforge.plantuml.url.Url; public class DrawableSet { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java index 9cea4154d..f50c630cf 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.SkinParamBackcoloredReference; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Delay; import net.sourceforge.plantuml.sequencediagram.Divider; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java index 5ad6cd20f..8b09a1be4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class GraphicalDelayText extends GraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java index 4f4806236..04864f007 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class GraphicalDivider extends GraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java index 1f927a4dd..4359532af 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java index 92e1900dc..738b9e516 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java index 107bb814b..d5ec56b08 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java index fa95250ea..46565092c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class GraphicalNewpage extends GraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java index 983258503..89c5fc810 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Objects; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; class GraphicalReference extends GraphicalElement implements InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java index 9ca1d713e..edc8beb2e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Objects; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupableList; abstract class GroupingGraphicalElement extends GraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java index 424a76420..0656e4aee 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.InGroupableList; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class GroupingGraphicalElementElse extends GroupingGraphicalElement implements InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java index 46ab3ed72..0762751f0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java @@ -40,13 +40,13 @@ import java.util.Collection; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupableList; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class GroupingGraphicalElementHeader extends GroupingGraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java index ce66d662e..5667cff2a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupableList; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java index 30e8efc4b..da4e916f1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LifeDestroy extends GraphicalElement { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java index c6bf729a9..9eb4d4f2f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java @@ -45,16 +45,16 @@ import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.SkinParamForceColor; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class LifeLine { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java index 64ae78b62..888758516 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java index 7b57732c9..07edd2f83 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Objects; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowComponent; @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; class MessageArrow extends Arrow { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java index d4603ed5a..7c0b93850 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.MessageExoType; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Area; @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.skin.rose.AbstractComponentRoseArrow; import net.sourceforge.plantuml.skin.rose.ComponentRoseArrow; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; public class MessageExoArrow extends Arrow { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java index f72ab9a52..87681df97 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; class MessageSelfArrow extends Arrow { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java index 30a06d960..1e09e3319 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Objects; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; final class NoteBox extends GraphicalElement implements InGroupable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java index 1bd8c5ef5..1f68de7be 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java index cfe25e306..3f0bb5729 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java @@ -42,12 +42,12 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.SimpleContext2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ParticipantBox implements Pushable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java index 619dbcd87..228076048 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java @@ -38,15 +38,14 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Collection; import java.util.Collections; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class ParticipantBoxSimple implements Pushable { private double pos = 0; private final String name; - @HaxeIgnored + public ParticipantBoxSimple(double pos) { this(pos, null); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java index 2f6c0a739..8035056b1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.util.Collection; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface Pushable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java index e8915629c..aafba5fe8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java @@ -40,14 +40,14 @@ import java.util.Collection; import java.util.Iterator; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.SimpleContext2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; class SegmentColored { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java index e2bb9d81d..d999e17bc 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.png.PngTitler; import net.sourceforge.plantuml.utils.MathUtils; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java index 5bf3fb536..590c2c4e5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java @@ -44,17 +44,19 @@ import java.util.Map; import net.sourceforge.plantuml.AnnotatedBuilder; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplaySection; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.png.PngTitler; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Newpage; @@ -65,8 +67,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SequenceDiagramFileMakerPuma2 implements FileMaker { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java index 7b33af94c..1993b9156 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java @@ -50,12 +50,12 @@ import net.sourceforge.plantuml.asciiart.UmlCharArea; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; public class SequenceDiagramTxtMaker implements FileMaker { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java index d7b386200..49cc40a95 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.sequencediagram.NotePosition; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java index 210b6c277..f48b515c9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.PaddingParam; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.Message; import net.sourceforge.plantuml.sequencediagram.Note; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java index 66c86769e..51ca130c4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.InGroupable; import net.sourceforge.plantuml.sequencediagram.MessageExo; import net.sourceforge.plantuml.sequencediagram.MessageExoType; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/AbstractTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/AbstractTile.java index 10e4ce34b..b8b1ac056 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/AbstractTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/AbstractTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Event; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Blotter.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Blotter.java index e4aef574e..ca0fc0303 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Blotter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Blotter.java @@ -41,13 +41,13 @@ import java.util.TreeMap; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class Blotter implements UDrawable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommonTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommonTile.java index de6731450..6c98513b9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommonTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommonTile.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.font.StringBounder; public abstract class CommonTile implements Tile, UDrawable { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java index 294ed98cb..1a7f9c3eb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.MessageExo; @@ -51,7 +52,6 @@ import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.ComponentRoseArrow; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationExoTile extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java index 94fa7a0dd..677120a0f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java @@ -39,9 +39,11 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Message; @@ -54,8 +56,6 @@ import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.AbstractComponentRoseArrow; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTile extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java index 295c495e5..99c9e44ca 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java @@ -37,8 +37,9 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.skin.Area; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTileNoteBottom extends CommunicationTileNoteBottomTopAbstract { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java index 7983c1ff5..e30d10662 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java @@ -37,7 +37,11 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Event; @@ -50,10 +54,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColor; public abstract class CommunicationTileNoteBottomTopAbstract extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java index fd46107c6..c3f2985f6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java @@ -37,8 +37,9 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Event; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTileNoteLeft extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java index 388734722..584b5660f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java @@ -37,8 +37,9 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Event; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTileNoteRight extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java index e436e6cd4..ee83a8fb2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java @@ -37,8 +37,9 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.skin.Area; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTileNoteTop extends CommunicationTileNoteBottomTopAbstract { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java index 887805f53..8cfe165fb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java @@ -40,7 +40,8 @@ import java.util.Iterator; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Message; @@ -51,7 +52,6 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Log; public class CommunicationTileSelf extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java index 9c24d4245..c89521421 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Message; @@ -48,7 +49,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class CommunicationTileSelfNoteRight extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java index fcebd1ba4..a73df21e8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.SimpleContext2D; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java index 67236f644..6605e3bb4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java @@ -36,7 +36,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Delay; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class DelayTile extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java index 0fe7f48b3..0b30849ad 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Divider; import net.sourceforge.plantuml.sequencediagram.Event; @@ -47,7 +48,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class DividerTile extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Dolls.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Dolls.java index 696ff1c4e..f588bafa7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Dolls.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Dolls.java @@ -40,7 +40,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Doll; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java index f3cc3fb96..f2138ace0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java @@ -39,7 +39,9 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.GroupingLeaf; @@ -49,8 +51,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ElseTile extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java index 6da92a365..99ad21da1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java @@ -43,8 +43,10 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Event; @@ -60,8 +62,6 @@ import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class GroupingTile extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java index 63df0e0b8..0b2ae6952 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Event; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LifeEventTile extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java index 9bff6e2cf..efc27d723 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java @@ -42,8 +42,9 @@ import java.util.Map; import java.util.TreeMap; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.LifeEvent; @@ -55,7 +56,6 @@ import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.SimpleContext2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LiveBoxes { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java index 7b9287ab0..497a713ec 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java @@ -44,8 +44,9 @@ import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.sequencediagram.graphic.Segment; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LiveBoxesDrawer { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java index 5b4715961..0085eedfd 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Delay; import net.sourceforge.plantuml.sequencediagram.Event; @@ -55,7 +55,7 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.url.Url; public class LivingSpace { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java index b7d6147b0..991c62ce6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java @@ -41,14 +41,14 @@ import java.util.LinkedHashMap; import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class LivingSpaces { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java index efc9ffb8c..0e59458a3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java @@ -41,6 +41,7 @@ import java.util.TreeMap; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.sequencediagram.Delay; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Participant; @@ -52,7 +53,6 @@ import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class MutingLine { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java index 6d2a19ab7..a05b0ecf9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Event; @@ -50,7 +51,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class NoteTile extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java index 5730b45d0..7860f11fd 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java @@ -40,7 +40,8 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Event; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class NotesTile extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpace.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpace.java index 3799315d9..49d5dd9cd 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpace.java @@ -39,14 +39,14 @@ import java.util.ArrayList; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.LinkAnchor; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.LimitFinder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PlayingSpace implements Bordered { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java index 8c7a59b25..7ea5cb4d9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java @@ -40,17 +40,17 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.SimpleContext2D; -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.HColors; public class PlayingSpaceWithParticipants extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java index 87d7c4510..5718ac4d5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java @@ -37,7 +37,8 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.sequencediagram.Participant; @@ -47,7 +48,6 @@ import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ReferenceTile extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java index 84e27a682..7203d5614 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java @@ -40,19 +40,20 @@ import java.io.OutputStream; import net.sourceforge.plantuml.AnnotatedBuilder; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplaySection; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.png.PngTitler; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealOrigin; @@ -66,7 +67,6 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class SequenceDiagramFileMakerTeoz implements FileMaker { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java index cee96efe8..5265410c5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.png.PngTitler; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java index 1bd608651..baba4425c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java @@ -38,12 +38,12 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.SkinParamBackcoloredReference; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.Reference; import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class TileArguments implements Bordered { private final StringBounder stringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java index 7a3b2226f..5248104d9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java @@ -41,7 +41,7 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Delay; import net.sourceforge.plantuml.sequencediagram.Divider; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java index 15a10a0a6..f0a58d9e9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TileMarged extends AbstractTile implements Tile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileParallel.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileParallel.java index 7884b4271..6a77bd4fd 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileParallel.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileParallel.java @@ -40,13 +40,13 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.Event; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class TileParallel extends CommonTile { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java index 30f922fe4..38f62ab0a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.UGraphicDelegator; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.skin.Context2D; -import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; public class UGraphicInterceptorTile extends UGraphicDelegator implements Context2D { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicNewpages.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicNewpages.java index ee235af29..bcfe13579 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicNewpages.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicNewpages.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class UGraphicNewpages extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/skin/AbstractComponent.java b/src/net/sourceforge/plantuml/skin/AbstractComponent.java index b013bddb0..88dcaf105 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractComponent.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public abstract class AbstractComponent implements Component { diff --git a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java index 13db396a7..1316c9618 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java @@ -35,23 +35,23 @@ */ package net.sourceforge.plantuml.skin; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColorSet; public abstract class AbstractTextualComponent extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/ActorAwesome.java b/src/net/sourceforge/plantuml/skin/ActorAwesome.java index 6a2bae33a..c655d4721 100644 --- a/src/net/sourceforge/plantuml/skin/ActorAwesome.java +++ b/src/net/sourceforge/plantuml/skin/ActorAwesome.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ActorAwesome extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/skin/ActorHollow.java b/src/net/sourceforge/plantuml/skin/ActorHollow.java index 1d20d04b2..eaefaa559 100644 --- a/src/net/sourceforge/plantuml/skin/ActorHollow.java +++ b/src/net/sourceforge/plantuml/skin/ActorHollow.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ActorHollow extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/skin/ActorStickMan.java b/src/net/sourceforge/plantuml/skin/ActorStickMan.java index 8d4979dd8..495220b00 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStickMan.java +++ b/src/net/sourceforge/plantuml/skin/ActorStickMan.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; public class ActorStickMan extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/skin/ActorStyle.java b/src/net/sourceforge/plantuml/skin/ActorStyle.java index 2dd4401c9..c6ff7875b 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStyle.java +++ b/src/net/sourceforge/plantuml/skin/ActorStyle.java @@ -45,26 +45,26 @@ public enum ActorStyle { STICKMAN, STICKMAN_BUSINESS, AWESOME, HOLLOW; public USymbol toUSymbol() { - if (this == STICKMAN) { + if (this == STICKMAN) return USymbols.ACTOR_STICKMAN; - } else if (this == AWESOME) { + else if (this == AWESOME) return USymbols.ACTOR_AWESOME; - } else if (this == HOLLOW) { + else if (this == HOLLOW) return USymbols.ACTOR_HOLLOW; - } + throw new IllegalStateException(); } public TextBlock getTextBlock(SymbolContext symbolContext) { - if (this == STICKMAN) { + if (this == STICKMAN) return new ActorStickMan(symbolContext, false); - } else if (this == STICKMAN_BUSINESS) { + else if (this == STICKMAN_BUSINESS) return new ActorStickMan(symbolContext, true); - } else if (this == AWESOME) { + else if (this == AWESOME) return new ActorAwesome(symbolContext); - } else if (this == HOLLOW) { + else if (this == HOLLOW) return new ActorHollow(symbolContext); - } + throw new IllegalStateException(); } diff --git a/src/net/sourceforge/plantuml/skin/ArrowComponent.java b/src/net/sourceforge/plantuml/skin/ArrowComponent.java index 50b7d38eb..801f3a579 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowComponent.java +++ b/src/net/sourceforge/plantuml/skin/ArrowComponent.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface ArrowComponent extends Component { diff --git a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java index b5a4c6f4c..f6be2b582 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java +++ b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.skin; import java.util.Objects; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ArrowConfiguration { diff --git a/src/net/sourceforge/plantuml/skin/CircleInterface.java b/src/net/sourceforge/plantuml/skin/CircleInterface.java index d984c7869..e426c7f45 100644 --- a/src/net/sourceforge/plantuml/skin/CircleInterface.java +++ b/src/net/sourceforge/plantuml/skin/CircleInterface.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.skin; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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.HColor; public class CircleInterface implements UDrawable { diff --git a/src/net/sourceforge/plantuml/skin/Component.java b/src/net/sourceforge/plantuml/skin/Component.java index ae86ce197..1e526ba00 100644 --- a/src/net/sourceforge/plantuml/skin/Component.java +++ b/src/net/sourceforge/plantuml/skin/Component.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.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 2ce4b77be..009a6ecc6 100644 --- a/src/net/sourceforge/plantuml/skin/Padder.java +++ b/src/net/sourceforge/plantuml/skin/Padder.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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.HColors; public class Padder { diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index 7d5f748aa..9a179ab7f 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -41,18 +41,18 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public enum VisibilityModifier { PRIVATE_FIELD(StringUtils.PRIVATE_FIELD, ColorParam.iconPrivate, null), diff --git a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java index 1197eceaf..1bcc10c18 100644 --- a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java @@ -35,20 +35,20 @@ */ package net.sourceforge.plantuml.skin.rose; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.Padder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public abstract class AbstractComponentRoseArrow extends AbstractTextualComponent implements ArrowComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java index 38e3497de..109bbf9f8 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java @@ -36,16 +36,16 @@ package net.sourceforge.plantuml.skin.rose; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class ComponentRoseActiveLine extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java index 08983f000..da87e1ac4 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseActor extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java index 66ee656df..0a90a07d4 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java @@ -35,13 +35,17 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.ArrowDecoration; @@ -52,10 +56,6 @@ import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseArrow extends AbstractComponentRoseArrow { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java index 9fd56f350..2b5f26ac9 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.Boundary; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseBoundary extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java index 89edeab48..cc742b7e3 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.Control; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseControl extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java index af9f8c576..d88e0c1bc 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java @@ -35,22 +35,22 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.USymbols; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseDatabase extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java index eec23af5d..77b22e8b5 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java @@ -36,16 +36,16 @@ package net.sourceforge.plantuml.skin.rose; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UAntiAliasing; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UAntiAliasing; 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; public class ComponentRoseDelayLine extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java index a7b861bac..cf99af3f2 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java @@ -35,17 +35,17 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseDelayText extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java index aad378684..3c9fae104 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java @@ -35,17 +35,17 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.atmp.ISkinSimple; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; 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.HColor; public class ComponentRoseDestroy extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java index 74816f0e4..79409ad35 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java @@ -35,22 +35,22 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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; public class ComponentRoseDivider extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java index bc66b1d95..b79427ba3 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseEnglober extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java index a0cd930d0..adf7a9a98 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.EntityDomain; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseEntity extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java index f556dfbaf..69baa4982 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java @@ -35,24 +35,24 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.URectangle; -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.HColors; public class ComponentRoseGroupingElse extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java index 2e5ad1703..ec92b112d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java @@ -37,26 +37,26 @@ package net.sourceforge.plantuml.skin.rose; import java.util.Objects; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -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.HColors; public class ComponentRoseGroupingHeader extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java index a78f65573..628139d37 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.skin.rose; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.Context2D; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java index 96aa96590..00ac04974 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java @@ -36,17 +36,17 @@ package net.sourceforge.plantuml.skin.rose; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; public class ComponentRoseLine extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java index e26ca2ea0..b77ec692e 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.skin.rose; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ComponentRoseNewpage extends AbstractComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java index 9b7a41354..4a12d5b66 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java @@ -35,13 +35,16 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; @@ -49,9 +52,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; final public class ComponentRoseNote extends AbstractTextualComponent implements Stencil { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java index d1ae4f03c..8593f399e 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java @@ -35,19 +35,19 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; final public class ComponentRoseNoteBox extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java index 330595871..cc0067ad4 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java @@ -35,18 +35,18 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; final public class ComponentRoseNoteHexagonal extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java index 413227007..fcf7087ca 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java @@ -35,22 +35,22 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.Shadowable; 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.HColor; public class ComponentRoseParticipant extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java index edb51e878..f811898c7 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java @@ -35,21 +35,21 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.USymbols; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseQueue extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java index cf84c038c..50b4c2b56 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java @@ -35,25 +35,25 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -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; public class ComponentRoseReference extends AbstractTextualComponent { diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java index 466a7c191..dcf1e60ff 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java @@ -35,12 +35,16 @@ */ package net.sourceforge.plantuml.skin.rose; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.ArrowDecoration; @@ -49,10 +53,6 @@ import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class ComponentRoseSelfArrow extends AbstractComponentRoseArrow { diff --git a/src/net/sourceforge/plantuml/skin/rose/Rose.java b/src/net/sourceforge/plantuml/skin/rose/Rose.java index d36345d9e..fd13b94d8 100644 --- a/src/net/sourceforge/plantuml/skin/rose/Rose.java +++ b/src/net/sourceforge/plantuml/skin/rose/Rose.java @@ -42,8 +42,10 @@ import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.PaddingParam; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.ArrowConfiguration; @@ -54,8 +56,6 @@ import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Rose { diff --git a/src/net/sourceforge/plantuml/sprite/ColorPalette.java b/src/net/sourceforge/plantuml/sprite/ColorPalette.java index 936e7bc95..5ea7d8173 100644 --- a/src/net/sourceforge/plantuml/sprite/ColorPalette.java +++ b/src/net/sourceforge/plantuml/sprite/ColorPalette.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.sprite; import java.awt.Color; import java.util.Objects; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; public class ColorPalette { diff --git a/src/net/sourceforge/plantuml/sprite/ColorPalette4096.java b/src/net/sourceforge/plantuml/sprite/ColorPalette4096.java index 1159f01e2..0ad6b4446 100644 --- a/src/net/sourceforge/plantuml/sprite/ColorPalette4096.java +++ b/src/net/sourceforge/plantuml/sprite/ColorPalette4096.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.sprite; import java.awt.Color; import java.util.Objects; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; public class ColorPalette4096 { diff --git a/src/net/sourceforge/plantuml/sprite/CommandListSprite.java b/src/net/sourceforge/plantuml/sprite/CommandListSprite.java index c2bc8d04f..7ba57c61d 100644 --- a/src/net/sourceforge/plantuml/sprite/CommandListSprite.java +++ b/src/net/sourceforge/plantuml/sprite/CommandListSprite.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.sprite; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandListSprite extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sprite/CommandStdlib.java b/src/net/sourceforge/plantuml/sprite/CommandStdlib.java index 5045b8f88..17e9565cb 100644 --- a/src/net/sourceforge/plantuml/sprite/CommandStdlib.java +++ b/src/net/sourceforge/plantuml/sprite/CommandStdlib.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.sprite; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStdlib extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java index cae1bf278..f469da431 100644 --- a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java @@ -48,18 +48,19 @@ import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColors; public class ListSpriteDiagram extends UmlDiagram { + // ::remove file when WASM public ListSpriteDiagram(UmlSource source, Map skinParam) { super(source, UmlDiagramType.HELP, skinParam); diff --git a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagramFactory.java b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagramFactory.java index b11f9e7c6..7b6dac5bd 100644 --- a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagramFactory.java +++ b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagramFactory.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.command.PSystemCommandFactory; import net.sourceforge.plantuml.core.UmlSource; public class ListSpriteDiagramFactory extends PSystemCommandFactory { + // ::remove file when WASM @Override protected void initCommandsList(List cmds) { diff --git a/src/net/sourceforge/plantuml/sprite/Sprite.java b/src/net/sourceforge/plantuml/sprite/Sprite.java index 2fc1e3a87..3243b41cd 100644 --- a/src/net/sourceforge/plantuml/sprite/Sprite.java +++ b/src/net/sourceforge/plantuml/sprite/Sprite.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.sprite; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public interface Sprite { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteColor.java b/src/net/sourceforge/plantuml/sprite/SpriteColor.java index de5cde47f..8d32a6e9d 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteColor.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteColor.java @@ -40,16 +40,16 @@ import java.awt.image.BufferedImage; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class SpriteColor implements Sprite { diff --git a/src/net/sourceforge/plantuml/SpriteContainer.java b/src/net/sourceforge/plantuml/sprite/SpriteContainer.java similarity index 90% rename from src/net/sourceforge/plantuml/SpriteContainer.java rename to src/net/sourceforge/plantuml/sprite/SpriteContainer.java index 38d2017be..6fa77afd3 100644 --- a/src/net/sourceforge/plantuml/SpriteContainer.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteContainer.java @@ -33,9 +33,10 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.sprite; -import net.sourceforge.plantuml.sprite.Sprite; +import net.sourceforge.plantuml.text.Guillemet; +import net.sourceforge.plantuml.text.SvgCharSizeHack; public interface SpriteContainer extends SvgCharSizeHack { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java b/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java index 27f23bdca..111617fc0 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java @@ -50,8 +50,8 @@ import net.sourceforge.plantuml.code.CompressionZopfliZlib; import net.sourceforge.plantuml.code.NoPlantumlCompressionException; import net.sourceforge.plantuml.code.PairInt; import net.sourceforge.plantuml.code.SpiralOnRectangle; +import net.sourceforge.plantuml.klimt.color.ColorUtils; import net.sourceforge.plantuml.log.Logme; -import net.sourceforge.plantuml.ugraphic.color.ColorUtils; public enum SpriteGrayLevel { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteImage.java b/src/net/sourceforge/plantuml/sprite/SpriteImage.java index e1e6736d8..17fe60e65 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteImage.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteImage.java @@ -42,16 +42,16 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Log; public class SpriteImage implements Sprite { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java index 4f1f9f2fb..628b254f7 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java @@ -42,16 +42,16 @@ import java.io.OutputStream; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class SpriteMonochrome implements Sprite { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteSvg.java b/src/net/sourceforge/plantuml/sprite/SpriteSvg.java index 36b509ceb..78e4c68ae 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteSvg.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteSvg.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.sprite; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SpriteSvg implements Sprite { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteUtils.java b/src/net/sourceforge/plantuml/sprite/SpriteUtils.java index e0a50d055..a321a7bc3 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteUtils.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteUtils.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.sprite; import java.awt.image.BufferedImage; import java.util.List; -import net.sourceforge.plantuml.BackSlash; +import net.sourceforge.plantuml.text.BackSlash; public class SpriteUtils { diff --git a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java index 0effbd57d..6a9ebc3b7 100644 --- a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java @@ -52,20 +52,20 @@ import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Stdlib; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class StdlibDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java b/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java index 7fc99939c..88778ab6a 100644 --- a/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java +++ b/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java @@ -50,12 +50,12 @@ import net.sourceforge.plantuml.command.PSystemCommandFactory; import net.sourceforge.plantuml.command.note.CommandFactoryNote; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnEntity; import net.sourceforge.plantuml.command.note.CommandFactoryNoteOnLink; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJson; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateJsonSingleLine; import net.sourceforge.plantuml.objectdiagram.command.CommandCreateMap; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.statediagram.command.CommandAddField; import net.sourceforge.plantuml.statediagram.command.CommandConcurrentState; import net.sourceforge.plantuml.statediagram.command.CommandCreatePackage2; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java index 6946e7c81..fef5d4239 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java @@ -39,15 +39,15 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddField extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java index b279bc8e5..d90f05abb 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.statediagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java index 48f4b831e..98e2c4c8d 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java @@ -35,29 +35,29 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackage2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java index 2ac7bc27c..ab9eb1df4 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java @@ -35,30 +35,30 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackageState extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java index ad3332c1c..d870ee607 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java @@ -35,30 +35,30 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.Url; -import net.sourceforge.plantuml.UrlBuilder; -import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateState extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java index 0e13c69a2..892fe43d9 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.statediagram.command; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java index 97d108e36..d633889bb 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.statediagram.command; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideEmptyDescription extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java index d64450d80..c504dc2b2 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java @@ -36,10 +36,10 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; public class CommandLinkState extends CommandLinkStateCommon { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java index 4e412e812..b9f7592d5 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java @@ -41,9 +41,6 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; @@ -51,9 +48,12 @@ import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java index 85f658312..2b9d5576f 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java @@ -36,10 +36,10 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.utils.Direction; public class CommandLinkStateReverse extends CommandLinkStateCommon { diff --git a/src/net/sourceforge/plantuml/stats/HtmlConverter.java b/src/net/sourceforge/plantuml/stats/HtmlConverter.java index 90106ca6f..c0e367b30 100644 --- a/src/net/sourceforge/plantuml/stats/HtmlConverter.java +++ b/src/net/sourceforge/plantuml/stats/HtmlConverter.java @@ -40,11 +40,11 @@ import java.util.Collection; import java.util.Date; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.stats.api.Stats; import net.sourceforge.plantuml.stats.api.StatsColumn; import net.sourceforge.plantuml.stats.api.StatsLine; import net.sourceforge.plantuml.stats.api.StatsTable; +import net.sourceforge.plantuml.text.BackSlash; public class HtmlConverter { diff --git a/src/net/sourceforge/plantuml/stats/TextTable.java b/src/net/sourceforge/plantuml/stats/TextTable.java index e83f42d69..53946a413 100644 --- a/src/net/sourceforge/plantuml/stats/TextTable.java +++ b/src/net/sourceforge/plantuml/stats/TextTable.java @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class TextTable { diff --git a/src/net/sourceforge/plantuml/stats/XmlConverter.java b/src/net/sourceforge/plantuml/stats/XmlConverter.java index ca686732f..af8c0ccd2 100644 --- a/src/net/sourceforge/plantuml/stats/XmlConverter.java +++ b/src/net/sourceforge/plantuml/stats/XmlConverter.java @@ -52,11 +52,11 @@ import javax.xml.transform.stream.StreamResult; import org.w3c.dom.Document; import org.w3c.dom.Element; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.stats.api.Stats; import net.sourceforge.plantuml.stats.api.StatsColumn; import net.sourceforge.plantuml.stats.api.StatsLine; import net.sourceforge.plantuml.stats.api.StatsTable; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.xml.XmlFactories; public class XmlConverter { diff --git a/src/net/sourceforge/plantuml/style/ClockwiseTopRightBottomLeft.java b/src/net/sourceforge/plantuml/style/ClockwiseTopRightBottomLeft.java index da10e42af..aba094990 100644 --- a/src/net/sourceforge/plantuml/style/ClockwiseTopRightBottomLeft.java +++ b/src/net/sourceforge/plantuml/style/ClockwiseTopRightBottomLeft.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.style; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class ClockwiseTopRightBottomLeft { diff --git a/src/net/sourceforge/plantuml/style/CommandStyleImport.java b/src/net/sourceforge/plantuml/style/CommandStyleImport.java index 3aa20629a..d8a399ff0 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleImport.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleImport.java @@ -42,10 +42,10 @@ import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.style.parser.StyleParser; import net.sourceforge.plantuml.style.parser.StyleParsingException; diff --git a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java index 51aebb968..d614bd389 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java @@ -41,9 +41,9 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.style.parser.StyleParser; import net.sourceforge.plantuml.style.parser.StyleParsingException; import net.sourceforge.plantuml.utils.BlocLines; diff --git a/src/net/sourceforge/plantuml/style/Style.java b/src/net/sourceforge/plantuml/style/Style.java index ac7fce565..4a5c140e8 100644 --- a/src/net/sourceforge/plantuml/style/Style.java +++ b/src/net/sourceforge/plantuml/style/Style.java @@ -40,23 +40,23 @@ import java.util.Map; import java.util.Map.Entry; import java.util.StringTokenizer; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class Style { diff --git a/src/net/sourceforge/plantuml/style/StyleLoader.java b/src/net/sourceforge/plantuml/style/StyleLoader.java index 9095bd5d3..f0647cd09 100644 --- a/src/net/sourceforge/plantuml/style/StyleLoader.java +++ b/src/net/sourceforge/plantuml/style/StyleLoader.java @@ -78,6 +78,13 @@ public class StyleLoader { } public static InputStream getInputStreamForStyle(String filename) throws IOException { + //::uncomment when WASM +// final String res = "/skin/" + filename; +// final InputStream is = StyleLoader.class.getResourceAsStream(res); +// return is; + //::done + + //::comment when WASM InputStream internalIs = null; SFile localFile = new SFile(filename); Log.info("Trying to load style " + filename); @@ -100,6 +107,7 @@ public class StyleLoader { } return internalIs; + //::done } private void loadSkinInternal(final BlocLines lines) throws StyleParsingException { diff --git a/src/net/sourceforge/plantuml/style/StyleSignatureBasic.java b/src/net/sourceforge/plantuml/style/StyleSignatureBasic.java index 580742924..2f43508bd 100644 --- a/src/net/sourceforge/plantuml/style/StyleSignatureBasic.java +++ b/src/net/sourceforge/plantuml/style/StyleSignatureBasic.java @@ -42,10 +42,10 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Stereostyles; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.StereotypeDecoration; +import net.sourceforge.plantuml.url.Url; public class StyleSignatureBasic implements StyleSignature { diff --git a/src/net/sourceforge/plantuml/style/Value.java b/src/net/sourceforge/plantuml/style/Value.java index d5188ebe6..6d4058d69 100644 --- a/src/net/sourceforge/plantuml/style/Value.java +++ b/src/net/sourceforge/plantuml/style/Value.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.style; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public interface Value { diff --git a/src/net/sourceforge/plantuml/style/ValueAbstract.java b/src/net/sourceforge/plantuml/style/ValueAbstract.java index 0339ae1b2..a15a72f34 100644 --- a/src/net/sourceforge/plantuml/style/ValueAbstract.java +++ b/src/net/sourceforge/plantuml/style/ValueAbstract.java @@ -35,9 +35,9 @@ */ package net.sourceforge.plantuml.style; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public abstract class ValueAbstract implements Value { diff --git a/src/net/sourceforge/plantuml/style/ValueColor.java b/src/net/sourceforge/plantuml/style/ValueColor.java index 7490b7ac2..214423133 100644 --- a/src/net/sourceforge/plantuml/style/ValueColor.java +++ b/src/net/sourceforge/plantuml/style/ValueColor.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.style; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; public class ValueColor extends ValueAbstract { diff --git a/src/net/sourceforge/plantuml/style/ValueImpl.java b/src/net/sourceforge/plantuml/style/ValueImpl.java index cd411848c..7703ec398 100644 --- a/src/net/sourceforge/plantuml/style/ValueImpl.java +++ b/src/net/sourceforge/plantuml/style/ValueImpl.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.style; import java.awt.Font; import java.util.Objects; -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.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class ValueImpl implements Value { diff --git a/src/net/sourceforge/plantuml/style/ValueNull.java b/src/net/sourceforge/plantuml/style/ValueNull.java index f9c9278dc..7684e7ec7 100644 --- a/src/net/sourceforge/plantuml/style/ValueNull.java +++ b/src/net/sourceforge/plantuml/style/ValueNull.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.style; import java.awt.Font; -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.HColors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class ValueNull extends ValueAbstract implements Value { diff --git a/src/net/sourceforge/plantuml/style/parser/StyleParserLegacy.java b/src/net/sourceforge/plantuml/style/parser/StyleParserLegacy.java index 37d4e0d7d..169d244c7 100644 --- a/src/net/sourceforge/plantuml/style/parser/StyleParserLegacy.java +++ b/src/net/sourceforge/plantuml/style/parser/StyleParserLegacy.java @@ -42,9 +42,9 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.style.AutomaticCounter; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; @@ -53,8 +53,8 @@ import net.sourceforge.plantuml.style.StyleScheme; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Value; import net.sourceforge.plantuml.style.ValueImpl; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringLocated; public class StyleParserLegacy { diff --git a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java index 3c390b49b..4378d45b1 100644 --- a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java @@ -51,18 +51,18 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.eps.EpsStrategy; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.svg.LengthAdjust; -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.ColorMapper; -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; diff --git a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java index 78c21a20a..70e174cf9 100644 --- a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java +++ b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.sudoku; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; public class PSystemSudokuFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java b/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java index 9884c6296..f48e4b48a 100644 --- a/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java @@ -41,8 +41,8 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; public abstract class AbstractEntityImage extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java b/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java index fbb81eb85..6348af2a6 100644 --- a/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java +++ b/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.extremity.ExtremityFactory; public abstract class AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/Bibliotekon.java b/src/net/sourceforge/plantuml/svek/Bibliotekon.java index 77d0065b6..b10a297d1 100644 --- a/src/net/sourceforge/plantuml/svek/Bibliotekon.java +++ b/src/net/sourceforge/plantuml/svek/Bibliotekon.java @@ -45,7 +45,7 @@ import java.util.Map; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class Bibliotekon { diff --git a/src/net/sourceforge/plantuml/svek/Boundary.java b/src/net/sourceforge/plantuml/svek/Boundary.java index d2b20f340..8696f2fb0 100644 --- a/src/net/sourceforge/plantuml/svek/Boundary.java +++ b/src/net/sourceforge/plantuml/svek/Boundary.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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.HColors; public class Boundary extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/svek/CircleAndArrow.java b/src/net/sourceforge/plantuml/svek/CircleAndArrow.java index 4279c00e5..2c688057c 100644 --- a/src/net/sourceforge/plantuml/svek/CircleAndArrow.java +++ b/src/net/sourceforge/plantuml/svek/CircleAndArrow.java @@ -39,10 +39,10 @@ import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; class CircleAndArrow implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/CircleInterface2.java b/src/net/sourceforge/plantuml/svek/CircleInterface2.java index 7dbee4a45..42455a26b 100644 --- a/src/net/sourceforge/plantuml/svek/CircleInterface2.java +++ b/src/net/sourceforge/plantuml/svek/CircleInterface2.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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; public class CircleInterface2 extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java index c10e73c4c..ca961d407 100644 --- a/src/net/sourceforge/plantuml/svek/Cluster.java +++ b/src/net/sourceforge/plantuml/svek/Cluster.java @@ -52,7 +52,6 @@ import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.UmlDiagramType; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -63,13 +62,22 @@ import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.Together; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersion; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.posimo.Moveable; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.Moveable; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -78,15 +86,8 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.EntityImageNoteLink; import net.sourceforge.plantuml.svek.image.EntityImageState; import net.sourceforge.plantuml.svek.image.EntityImageStateCommon; -import net.sourceforge.plantuml.ugraphic.UComment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -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.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.url.Url; public class Cluster implements Moveable { diff --git a/src/net/sourceforge/plantuml/svek/ClusterDecoration.java b/src/net/sourceforge/plantuml/svek/ClusterDecoration.java index 3ecc40218..4159ea2d6 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDecoration.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDecoration.java @@ -36,13 +36,14 @@ */ package net.sourceforge.plantuml.svek; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ClusterDecoration { diff --git a/src/net/sourceforge/plantuml/svek/ClusterDotString.java b/src/net/sourceforge/plantuml/svek/ClusterDotString.java index 4cfad196a..a24723e66 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDotString.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDotString.java @@ -50,9 +50,9 @@ import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersion; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.USymbols; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class ClusterDotString { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java b/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java index 2d4b20831..2f51e49ab 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java @@ -50,10 +50,10 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersion; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbols; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; public class ClusterDotStringKermor { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/svek/ClusterHeader.java b/src/net/sourceforge/plantuml/svek/ClusterHeader.java index 9a93cbcef..5e60c79ce 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterHeader.java +++ b/src/net/sourceforge/plantuml/svek/ClusterHeader.java @@ -49,12 +49,12 @@ import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; diff --git a/src/net/sourceforge/plantuml/svek/Control.java b/src/net/sourceforge/plantuml/svek/Control.java index ee81e5508..15625e12e 100644 --- a/src/net/sourceforge/plantuml/svek/Control.java +++ b/src/net/sourceforge/plantuml/svek/Control.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class Control extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java index a2c4bb7b8..588ddc12f 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.dot.CucaDiagramSimplifierActivity; import net.sourceforge.plantuml.cucadiagram.dot.CucaDiagramSimplifierState; import net.sourceforge.plantuml.cucadiagram.dot.DotData; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.log.Logme; public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java index 25e92a690..aff827168 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java @@ -41,16 +41,16 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColor; public final class CucaDiagramFileMakerSvek2InternalImage extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java index 1d7e96219..3a27fb063 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java @@ -39,14 +39,14 @@ import java.util.Objects; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class DecorateEntityImage extends AbstractTextBlock implements TextBlockBackcolored { diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java index f8530f868..fae560114 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class DecorateEntityImage3 extends AbstractTextBlock implements TextBlockBackcolored { diff --git a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java index 1d2ad1a0c..5bd1e7605 100644 --- a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java +++ b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.utils.Direction; diff --git a/src/net/sourceforge/plantuml/svek/DotStringFactory.java b/src/net/sourceforge/plantuml/svek/DotStringFactory.java index 6d5e4af83..f2899c9ee 100644 --- a/src/net/sourceforge/plantuml/svek/DotStringFactory.java +++ b/src/net/sourceforge/plantuml/svek/DotStringFactory.java @@ -54,7 +54,6 @@ import net.sourceforge.plantuml.baraye.EntityFactory; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.cucadiagram.dot.DotData; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; import net.sourceforge.plantuml.cucadiagram.dot.Graphviz; @@ -62,8 +61,9 @@ import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersion; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersions; import net.sourceforge.plantuml.cucadiagram.dot.ProcessState; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.Moveable; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.Moveable; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.vizjs.GraphvizJs; import net.sourceforge.plantuml.vizjs.GraphvizJsRuntimeException; diff --git a/src/net/sourceforge/plantuml/svek/EntityDomain.java b/src/net/sourceforge/plantuml/svek/EntityDomain.java index fff1195a5..be3c87311 100644 --- a/src/net/sourceforge/plantuml/svek/EntityDomain.java +++ b/src/net/sourceforge/plantuml/svek/EntityDomain.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class EntityDomain extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java index 1d1146070..7bbf629e9 100644 --- a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java +++ b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java @@ -38,12 +38,12 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageDegenerated implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java index 2eb42556e..5adacbabc 100644 --- a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java +++ b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java @@ -40,10 +40,10 @@ import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.cucadiagram.dot.Neighborhood; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageProtected extends AbstractTextBlock implements IEntityImage, Untranslated, WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/FrontierCalculator.java b/src/net/sourceforge/plantuml/svek/FrontierCalculator.java index 23d7c60f8..6d658a6c6 100644 --- a/src/net/sourceforge/plantuml/svek/FrontierCalculator.java +++ b/src/net/sourceforge/plantuml/svek/FrontierCalculator.java @@ -39,6 +39,7 @@ import java.util.Collection; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.EntityPosition; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; public class FrontierCalculator { diff --git a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java index fda515b13..51b99637c 100644 --- a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java +++ b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java @@ -47,7 +47,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.BaseFile; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.OptionFlags; @@ -76,12 +75,15 @@ import net.sourceforge.plantuml.descdiagram.EntityImageDesignedDomain; import net.sourceforge.plantuml.descdiagram.EntityImageDomain; import net.sourceforge.plantuml.descdiagram.EntityImageMachine; import net.sourceforge.plantuml.descdiagram.EntityImageRequirement; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.USymbolHexagon; import net.sourceforge.plantuml.graphic.USymbolInterface; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; @@ -118,10 +120,8 @@ import net.sourceforge.plantuml.svek.image.EntityImageStateEmptyDescription; import net.sourceforge.plantuml.svek.image.EntityImageSynchroBar; import net.sourceforge.plantuml.svek.image.EntityImageTips; import net.sourceforge.plantuml.svek.image.EntityImageUseCase; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Log; public final class GeneralImageBuilder { diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java index 86d6749a7..7aaabe62f 100644 --- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java +++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java @@ -40,7 +40,6 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.OptionPrint; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -51,17 +50,18 @@ import net.sourceforge.plantuml.fun.IconLoader; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.GraphicPosition; import net.sourceforge.plantuml.graphic.GraphicStrings; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.QuoteUtils; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.ugraphic.AffineTransformType; 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.HColors; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java index ff984d848..9cfc3fda5 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java @@ -50,15 +50,15 @@ import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotData; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; 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; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.EntityImageState; -import net.sourceforge.plantuml.ugraphic.color.HColor; public final class GroupPngMakerActivity { diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java index bdc251dcb..046c76a45 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java @@ -50,18 +50,18 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotData; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.image.EntityImageState; import net.sourceforge.plantuml.svek.image.EntityImageStateCommon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public final class GroupPngMakerState { diff --git a/src/net/sourceforge/plantuml/svek/HeaderLayout.java b/src/net/sourceforge/plantuml/svek/HeaderLayout.java index 886eb6728..c9528d704 100644 --- a/src/net/sourceforge/plantuml/svek/HeaderLayout.java +++ b/src/net/sourceforge/plantuml/svek/HeaderLayout.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.MathUtils; public class HeaderLayout { diff --git a/src/net/sourceforge/plantuml/svek/IEntityImage.java b/src/net/sourceforge/plantuml/svek/IEntityImage.java index d1520a476..16d4346f8 100644 --- a/src/net/sourceforge/plantuml/svek/IEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/IEntityImage.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.Hideable; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface IEntityImage extends Hideable, TextBlockBackcolored { diff --git a/src/net/sourceforge/plantuml/svek/InnerActivity.java b/src/net/sourceforge/plantuml/svek/InnerActivity.java index dd25bf97e..fc9c6da56 100644 --- a/src/net/sourceforge/plantuml/svek/InnerActivity.java +++ b/src/net/sourceforge/plantuml/svek/InnerActivity.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public final class InnerActivity extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java index 22b06f708..2f1abe6e7 100644 --- a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java +++ b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java @@ -35,16 +35,16 @@ */ package net.sourceforge.plantuml.svek; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.image.EntityImageState; 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.url.Url; public final class InnerStateAutonom extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/Kal.java b/src/net/sourceforge/plantuml/svek/Kal.java index 2c453f2fb..3630c985f 100644 --- a/src/net/sourceforge/plantuml/svek/Kal.java +++ b/src/net/sourceforge/plantuml/svek/Kal.java @@ -41,17 +41,17 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.extremity.Extremity; 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.HColors; import net.sourceforge.plantuml.utils.Direction; public class Kal implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/PackageStyle.java b/src/net/sourceforge/plantuml/svek/PackageStyle.java index a659a2a3e..db0f79f49 100644 --- a/src/net/sourceforge/plantuml/svek/PackageStyle.java +++ b/src/net/sourceforge/plantuml/svek/PackageStyle.java @@ -41,13 +41,13 @@ import java.util.EnumSet; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; public enum PackageStyle { diff --git a/src/net/sourceforge/plantuml/svek/RoundedContainer.java b/src/net/sourceforge/plantuml/svek/RoundedContainer.java index b3b7477f7..eda772d52 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedContainer.java +++ b/src/net/sourceforge/plantuml/svek/RoundedContainer.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColors; public final class RoundedContainer { diff --git a/src/net/sourceforge/plantuml/svek/RoundedNorth.java b/src/net/sourceforge/plantuml/svek/RoundedNorth.java index b37e8bc66..bf9b8e5c9 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedNorth.java +++ b/src/net/sourceforge/plantuml/svek/RoundedNorth.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; 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.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public final class RoundedNorth implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/RoundedSouth.java b/src/net/sourceforge/plantuml/svek/RoundedSouth.java index 0ec351a14..388572af4 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedSouth.java +++ b/src/net/sourceforge/plantuml/svek/RoundedSouth.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; 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.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public final class RoundedSouth implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java index d286f5e95..923733c2c 100644 --- a/src/net/sourceforge/plantuml/svek/SvekLine.java +++ b/src/net/sourceforge/plantuml/svek/SvekLine.java @@ -51,7 +51,6 @@ import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.Pragma; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -71,22 +70,31 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizVersion; import net.sourceforge.plantuml.descdiagram.command.StringWithArrow; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.USymbolFolder; import net.sourceforge.plantuml.graphic.VerticalAlignment; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.posimo.BezierUtils; -import net.sourceforge.plantuml.posimo.DotPath; -import net.sourceforge.plantuml.posimo.Moveable; -import net.sourceforge.plantuml.posimo.Positionable; -import net.sourceforge.plantuml.posimo.PositionableUtils; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.BezierUtils; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Moveable; +import net.sourceforge.plantuml.klimt.geom.PointAndAngle; +import net.sourceforge.plantuml.klimt.geom.Positionable; +import net.sourceforge.plantuml.klimt.geom.PositionableUtils; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.StyleBuilder; @@ -97,13 +105,7 @@ import net.sourceforge.plantuml.svek.extremity.ExtremityFactoryExtends; import net.sourceforge.plantuml.svek.extremity.ExtremityOther; import net.sourceforge.plantuml.svek.image.EntityImageNoteLink; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.Log; @@ -552,10 +554,10 @@ public class SvekLine implements Moveable, Hideable, GuideLine { final int end = fullSvg.indexOf("\"", idx + 3); final SvgResult path = fullSvg.substring(idx + 3, end); - if (DotPath.isPathConsistent(path.getSvg()) == false) + if (path.isPathConsistent() == false) return; - dotPath = new DotPath(path); + dotPath = path.toDotPath(); if (projectionCluster != null) { // System.err.println("Line::solveLine1 projectionCluster=" + @@ -568,7 +570,8 @@ public class SvekLine implements Moveable, Hideable, GuideLine { // if (ltail != null) // System.err.println("Line::solveLine ltail=" + ltail.getClusterPosition()); } - dotPath = dotPath.simulateCompound(lhead, ltail); + dotPath = dotPath.simulateCompound(lhead == null ? null : lhead.getClusterPosition(), + ltail == null ? null : ltail.getClusterPosition()); final SvgResult lineSvg = fullSvg.substring(end); PointListIterator pointListIterator = lineSvg.getPointsWithThisColor(lineColor); diff --git a/src/net/sourceforge/plantuml/svek/SvekNode.java b/src/net/sourceforge/plantuml/svek/SvekNode.java index 83e92eaf9..02dbd1a38 100644 --- a/src/net/sourceforge/plantuml/svek/SvekNode.java +++ b/src/net/sourceforge/plantuml/svek/SvekNode.java @@ -44,15 +44,16 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.cucadiagram.Together; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.Positionable; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.Positionable; import net.sourceforge.plantuml.svek.image.EntityImageDescription; import net.sourceforge.plantuml.svek.image.EntityImageLollipopInterface; import net.sourceforge.plantuml.svek.image.EntityImagePort; import net.sourceforge.plantuml.svek.image.EntityImageStateBorder; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.utils.Direction; public class SvekNode implements Positionable, Hideable { diff --git a/src/net/sourceforge/plantuml/svek/SvekResult.java b/src/net/sourceforge/plantuml/svek/SvekResult.java index 7cc9a75a4..f59748784 100644 --- a/src/net/sourceforge/plantuml/svek/SvekResult.java +++ b/src/net/sourceforge/plantuml/svek/SvekResult.java @@ -43,20 +43,20 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotData; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.Rainbow; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UHidden; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; 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.ugraphic.MinMax; 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.HColors; public final class SvekResult extends AbstractTextBlock implements IEntityImage { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/svek/SvgResult.java b/src/net/sourceforge/plantuml/svek/SvgResult.java index 4bd42aa10..a309d3ab5 100644 --- a/src/net/sourceforge/plantuml/svek/SvgResult.java +++ b/src/net/sourceforge/plantuml/svek/SvgResult.java @@ -37,11 +37,14 @@ package net.sourceforge.plantuml.svek; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.DotPath; public class SvgResult { @@ -133,4 +136,43 @@ public class SvgResult { public final String getSvg() { return svg; } + + public DotPath toDotPath() { + if (isPathConsistent() == false) + throw new IllegalArgumentException(); + + final List beziers = new ArrayList<>(); + + final int posC = this.indexOf("C", 0); + if (posC == -1) + throw new IllegalArgumentException(); + + final XPoint2D start = this.substring(1, posC).getNextPoint(); + + final List triPoints = new ArrayList<>(); + for (Iterator it = this.substring(posC + 1).getPoints(" ").iterator(); it.hasNext();) { + final XPoint2D p1 = it.next(); + final XPoint2D p2 = it.next(); + final XPoint2D p = it.next(); + triPoints.add(new DotPath.TriPoints(p1, p2, p)); + } + double x = start.getX(); + double y = start.getY(); + for (DotPath.TriPoints p : triPoints) { + final XCubicCurve2D bezier = new XCubicCurve2D(x, y, p.x1, p.y1, p.x2, p.y2, p.x, p.y); + beziers.add(bezier); + x = p.x; + y = p.y; + } + + return DotPath.fromBeziers(beziers); + } + + public boolean isPathConsistent() { + if (this.getSvg().startsWith("M") == false) + return false; + + return true; + } + } diff --git a/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java b/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java index dd867b093..7984b6907 100644 --- a/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java +++ b/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public interface TextBlockBackcolored extends TextBlock { diff --git a/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java b/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java index b30311e4c..1546183af 100644 --- a/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java +++ b/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java @@ -40,10 +40,10 @@ import java.util.List; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class UGraphicForSnake extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/svek/WithPorts.java b/src/net/sourceforge/plantuml/svek/WithPorts.java index 02286c3d7..7b732287a 100644 --- a/src/net/sourceforge/plantuml/svek/WithPorts.java +++ b/src/net/sourceforge/plantuml/svek/WithPorts.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; public interface WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/extremity/Extremity.java b/src/net/sourceforge/plantuml/svek/extremity/Extremity.java index c2ddbdeff..64399efb6 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/Extremity.java +++ b/src/net/sourceforge/plantuml/svek/extremity/Extremity.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public abstract class Extremity implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java index 088c49937..ced8c040d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; public class ExtremityArrow extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java index a75faf956..3f9af5c53 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityArrowAndCircle extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java index 930e65fdd..1e1c21c0f 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityCircle extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java index ce99edba7..624672c9e 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; 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.HColor; class ExtremityCircleConnect extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java index 61a2c2961..d5e380a85 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColor; class ExtremityCircleCross extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCrowfoot.java index f7fcbf34d..d68861568 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCrowfoot.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityCircleCrowfoot extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleLine.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleLine.java index 4fbe45426..beafde5dc 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleLine.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleLine.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityCircleLine extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCrowfoot.java index ebf53728b..2e10a6b2e 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCrowfoot.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.svek.Side; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityCrowfoot extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java index 7fdfead80..9ef6f161c 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityDiamond extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDoubleLine.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDoubleLine.java index a83ae6e59..0f2374149 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDoubleLine.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDoubleLine.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityDoubleLine extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtends.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtends.java index 0115cafe5..df9788429 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtends.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtends.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.HColor; class ExtremityExtends extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtendsLike.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtendsLike.java index 2692d11e7..42b2b5c67 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtendsLike.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityExtendsLike.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UBackground; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColor; abstract class ExtremityExtendsLike extends Extremity { private static final double XLEN = -19;// 8 * 2.4; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java index 36ecfb299..63b412e2e 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.svek.Side; +import net.sourceforge.plantuml.klimt.geom.Side; public interface ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java index eee82e191..ae4cfbb3a 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryArrow extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java index 73a828676..d4fbe0b62 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryArrowAndCircle extends AbstractExtremityFactory implements ExtremityFactory { private final HColor backgroundColor; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java index 67dde972f..f07dd2d09 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryCircle extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java index 24c573570..b8502c354 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryCircleConnect extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java index a1e999bb6..bf831c149 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryCircleCross extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCrowfoot.java index d4d0dc2ea..1b1e73586 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCrowfoot.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryCircleCrowfoot extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleLine.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleLine.java index 8163df61b..5f386a7e9 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleLine.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleLine.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryCircleLine extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCrowfoot.java index 6506f749e..d35cfefd5 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCrowfoot.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryCrowfoot extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java index cbad59416..3df2c9e4b 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryDiamond extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDoubleLine.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDoubleLine.java index e7ed5458a..b11b7180d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDoubleLine.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDoubleLine.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryDoubleLine extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtends.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtends.java index 0d254d861..edb8e9d52 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtends.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtends.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryExtends extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtendsLike.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtendsLike.java index a313bcc2f..217e33cee 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtendsLike.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryExtendsLike.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryExtendsLike extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryHalfArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryHalfArrow.java index 699af88a3..a2eb32968 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryHalfArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryHalfArrow.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryHalfArrow extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryLineCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryLineCrowfoot.java index 32d597507..df9c345e7 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryLineCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryLineCrowfoot.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryLineCrowfoot extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryNotNavigable.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryNotNavigable.java index 18cb6fc0e..151c206f1 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryNotNavigable.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryNotNavigable.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryNotNavigable extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java index a3b412e13..c655c645e 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; public class ExtremityFactoryParenthesis extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java index 87db49b65..ff604861a 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryPlus extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquare.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquare.java index 68d2a16e5..572f40ab3 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquare.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquare.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactorySquare extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java index a373af941..df1dd728b 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.geom.Side; import net.sourceforge.plantuml.svek.AbstractExtremityFactory; -import net.sourceforge.plantuml.svek.Side; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ExtremityFactoryTriangle extends AbstractExtremityFactory implements ExtremityFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java index 65e7c3cdd..728f7e191 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityHalfArrow.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; class ExtremityHalfArrow extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityLineCrowfoot.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityLineCrowfoot.java index cd2bdbbbe..84e4e854d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityLineCrowfoot.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityLineCrowfoot.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.svek.extremity; import java.awt.geom.AffineTransform; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityLineCrowfoot extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityNotNavigable.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityNotNavigable.java index 3448ef4df..a0b74615a 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityNotNavigable.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityNotNavigable.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPath; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; class ExtremityNotNavigable extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityOther.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityOther.java index 1e47509bc..f9965072a 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityOther.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityOther.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; public class ExtremityOther extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java index 2d7c5538d..df9ff06fc 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityParenthesis extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java index ed08b1be6..2d7aac7f3 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.svek.image.EntityImageLollipopInterfaceEye2; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ExtremityParenthesis2 extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java index dd1365df2..2f8c72926 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UEllipse; 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; class ExtremityPlus extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquare.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquare.java index c19a36cb0..4d3de58d3 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquare.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquare.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; 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.HColor; class ExtremitySquare extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java index 77e9ad963..59a493bcd 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColors; class ExtremityStateLine1 extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java index b53a8ef81..90af8427f 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; class ExtremityStateLine2 extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java index 2d3610b1e..e2f337ca7 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColors; class ExtremityTriangle extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java index 0251949f3..2283d8f89 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; 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.HColor; class MiddleCircle extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java index a6ebbcfbc..9acfe8729 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; class MiddleCircleCircled extends Extremity { diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java index bbb2cc1ca..242b15a84 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class MiddleFactoryCircle implements MiddleFactory { diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java index a0c4d26d1..3e29b1ed2 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek.extremity; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColor; public class MiddleFactoryCircleCircled implements MiddleFactory { diff --git a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java index d339c5858..b2f450bd8 100644 --- a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java @@ -36,17 +36,17 @@ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.EntityPosition; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; diff --git a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java index 557dbe092..5f9354c74 100644 --- a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java @@ -40,10 +40,10 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class ConnectedCircle implements UDrawable { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java index d49db1b79..675f22605 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java @@ -36,15 +36,19 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -54,12 +58,8 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.SvekNode; -import net.sourceforge.plantuml.ugraphic.Shadowable; 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.HColor; +import net.sourceforge.plantuml.url.Url; public class EntityImageActivity extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java index cef6196bc..80f824633 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java @@ -35,21 +35,21 @@ */ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class EntityImageArcCircle extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java index 9a7404dd0..4afee37d3 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java @@ -38,7 +38,10 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -46,9 +49,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageAssociation extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java index 7d66f21fa..1f52f5e2b 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java @@ -38,7 +38,9 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -48,8 +50,6 @@ import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.CopyForegroundColorToBackgroundColor; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageAssociationPoint extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java index 86526c720..48e0d3832 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java @@ -41,7 +41,11 @@ import java.util.Map; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -49,10 +53,6 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageBranch extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java index 22beb459c..4fe32cbde 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java @@ -38,8 +38,12 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -48,10 +52,6 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; 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.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class EntityImageCircleEnd extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java index 9904348fa..6d2119cd0 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java @@ -38,8 +38,10 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -48,8 +50,6 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; 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.HColors; public class EntityImageCircleStart extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index 783c640d3..3ea6889af 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -40,7 +40,6 @@ import java.util.Map; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -49,9 +48,17 @@ import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -62,16 +69,9 @@ import net.sourceforge.plantuml.svek.Margins; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.WithPorts; -import net.sourceforge.plantuml.ugraphic.Shadowable; -import net.sourceforge.plantuml.ugraphic.UComment; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UGroupType; -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.HColors; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; public class EntityImageClass extends AbstractEntityImage implements Stencil, WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java index a2449484b..8b2ac9234 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -48,13 +46,16 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.CircledCharacter; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockGeneric; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.PName; @@ -64,9 +65,8 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.HeaderLayout; import net.sourceforge.plantuml.svek.ShapeType; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageClassHeader extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java index 41d1a3369..46d1cc3ac 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java @@ -43,9 +43,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.BodyFactory; @@ -54,16 +52,22 @@ import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.USymbols; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -73,14 +77,10 @@ import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.Margins; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.SvekNode; -import net.sourceforge.plantuml.ugraphic.Shadowable; -import net.sourceforge.plantuml.ugraphic.UComment; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.MathUtils; public class EntityImageDescription extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java index 399d978f2..ae0173ac3 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java @@ -36,10 +36,7 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.AlignmentParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -48,24 +45,27 @@ import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.ClusterPosition; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ClusterDecoration; -import net.sourceforge.plantuml.svek.ClusterPosition; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class EntityImageEmptyPackage extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java index 12e9a4abf..30b62ec73 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java b/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java index a8c872d1b..f0064f81d 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java @@ -36,11 +36,8 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.CornerParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.Stencil; @@ -50,12 +47,18 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.TextBlockCucaJSon; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -64,15 +67,12 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.WithPorts; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageJson extends AbstractEntityImage implements Stencil, WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java index 72e468a5c..eb2bf760c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java @@ -39,14 +39,17 @@ import java.util.EnumMap; import java.util.Map; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.LeafType; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -56,10 +59,7 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class EntityImageLollipopInterface extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java index 0aef0581c..eb945245f 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java @@ -38,27 +38,27 @@ package net.sourceforge.plantuml.svek.image; import java.util.List; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.SvekLine; 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.HColors; +import net.sourceforge.plantuml.url.Url; public class EntityImageLollipopInterfaceEye1 extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java index f93bd51b2..f2c52498c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java @@ -35,32 +35,32 @@ */ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.color.ColorType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.url.Url; public class EntityImageLollipopInterfaceEye2 extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java index a19ec6669..b23182400 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java @@ -39,11 +39,8 @@ import java.util.EnumMap; import java.util.Map; import net.sourceforge.plantuml.CornerParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.Stencil; @@ -53,12 +50,19 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.TextBlockMap; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -67,16 +71,12 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.WithPorts; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UGroupType; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageMap extends AbstractEntityImage implements Stencil, WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java index 8730505be..5ae5a5601 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java @@ -44,7 +44,6 @@ import net.sourceforge.plantuml.CornerParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.UmlDiagramType; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; @@ -53,14 +52,19 @@ import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -73,11 +77,7 @@ import net.sourceforge.plantuml.svek.SvekLine; import net.sourceforge.plantuml.svek.SvekNode; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; public class EntityImageNote extends AbstractEntityImage implements Stencil { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java index ed3b69d1c..673af820d 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java @@ -39,8 +39,9 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Component; import net.sourceforge.plantuml.skin.ComponentType; @@ -52,7 +53,6 @@ import net.sourceforge.plantuml.svek.IEntityImage; import net.sourceforge.plantuml.svek.Margins; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class EntityImageNoteLink extends AbstractTextBlock implements IEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java index e666047d3..b49a01b60 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java @@ -39,11 +39,8 @@ import java.util.EnumMap; import java.util.Map; import net.sourceforge.plantuml.CornerParam; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -52,15 +49,22 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; import net.sourceforge.plantuml.graphic.TextBlockLineBefore; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -69,16 +73,12 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.Ports; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.WithPorts; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.PlacementStrategyY1Y2; -import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicStencil; -import net.sourceforge.plantuml.ugraphic.UGroupType; import net.sourceforge.plantuml.ugraphic.ULayoutGroup; -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.url.Url; public class EntityImageObject extends AbstractEntityImage implements Stencil, WithPorts { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java index fa7858a54..0b0ad9a34 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java @@ -36,15 +36,20 @@ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.EntityPosition; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -53,12 +58,7 @@ import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.Cluster; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.SvekNode; -import net.sourceforge.plantuml.ugraphic.Shadowable; 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.HColor; public class EntityImagePort extends AbstractEntityImageBorder { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java index 4dc07f7a0..c641e8e3b 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java @@ -35,16 +35,19 @@ */ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -53,9 +56,6 @@ import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; 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.HColor; public class EntityImagePseudoState extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java index 5ae41f596..8f77a2cf2 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java @@ -43,16 +43,16 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class EntityImageState extends EntityImageStateCommon { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java index 622f5b5c0..03e4f92ee 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java @@ -36,24 +36,24 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.USymbols; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.url.Url; public class EntityImageState2 extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java index 5bef48509..e02343817 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java @@ -35,15 +35,18 @@ */ package net.sourceforge.plantuml.svek.image; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.cucadiagram.EntityPosition; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -52,9 +55,6 @@ import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.Cluster; import net.sourceforge.plantuml.svek.SvekNode; 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; public class EntityImageStateBorder extends AbstractEntityImageBorder { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java index 9cb63ff72..178cfb9a4 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java @@ -37,14 +37,15 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.creole.CreoleMode; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -52,8 +53,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public abstract class EntityImageStateCommon extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java index 329fc207f..fa28b6eeb 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class EntityImageStateEmptyDescription extends EntityImageStateCommon { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java index ddec1455f..1a02bfa6a 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java @@ -38,19 +38,19 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; -import net.sourceforge.plantuml.cucadiagram.Rankdir; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; -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.HColors; public class EntityImageSynchroBar extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java index b162e281c..d489e865a 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java @@ -46,12 +46,15 @@ import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.BodyFactory; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -62,9 +65,6 @@ import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.ShapeType; import net.sourceforge.plantuml.svek.SvekNode; 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.utils.Direction; public class EntityImageTips extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java index 95d20a3e7..29d9a8105 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java @@ -38,10 +38,7 @@ package net.sourceforge.plantuml.svek.image; import java.util.EnumMap; import java.util.Map; -import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -52,13 +49,19 @@ import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.PortionShower; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -66,16 +69,13 @@ import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.AbstractEntityImage; import net.sourceforge.plantuml.svek.ShapeType; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.ugraphic.AbstractUGraphicHorizontalLine; import net.sourceforge.plantuml.ugraphic.TextBlockInEllipse; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGroupType; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; -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.url.Url; public class EntityImageUseCase extends AbstractEntityImage { diff --git a/src/net/sourceforge/plantuml/svek/image/Footprint.java b/src/net/sourceforge/plantuml/svek/image/Footprint.java index 8038d54b4..d046cfcf6 100644 --- a/src/net/sourceforge/plantuml/svek/image/Footprint.java +++ b/src/net/sourceforge/plantuml/svek/image/Footprint.java @@ -42,25 +42,25 @@ import java.util.List; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicNo; import net.sourceforge.plantuml.ugraphic.UHorizontalLine; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class Footprint { diff --git a/src/net/sourceforge/plantuml/svek/image/Opale.java b/src/net/sourceforge/plantuml/svek/image/Opale.java index cac51a48d..5c4d5cef8 100644 --- a/src/net/sourceforge/plantuml/svek/image/Opale.java +++ b/src/net/sourceforge/plantuml/svek/image/Opale.java @@ -38,13 +38,13 @@ package net.sourceforge.plantuml.svek.image; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.MathUtils; diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java index 50400c236..d7b8581c4 100644 --- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java +++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java @@ -69,18 +69,18 @@ import net.sourceforge.plantuml.FileUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.code.Base64Coder; import net.sourceforge.plantuml.code.TranscoderUtil; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; -import net.sourceforge.plantuml.ugraphic.UGroupType; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.UPath; -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.HColorGradient; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.xml.XmlFactories; diff --git a/src/net/sourceforge/plantuml/swing/AboutWindow.java b/src/net/sourceforge/plantuml/swing/AboutWindow.java index 960032a77..793edd31e 100644 --- a/src/net/sourceforge/plantuml/swing/AboutWindow.java +++ b/src/net/sourceforge/plantuml/swing/AboutWindow.java @@ -56,7 +56,7 @@ import javax.swing.border.BevelBorder; import javax.swing.border.CompoundBorder; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index 183b604a4..88af39782 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.TreeSet; import net.sourceforge.plantuml.SkinParam; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.utils.Cypher; public class LanguageDescriptor { diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java index 5ea17fcad..f1f846aa0 100644 --- a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java +++ b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.syntax; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.BlockUml; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.OptionFlags; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.preproc.Defines; +import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.LineLocationImpl; diff --git a/src/net/sourceforge/plantuml/BackSlash.java b/src/net/sourceforge/plantuml/text/BackSlash.java similarity index 97% rename from src/net/sourceforge/plantuml/BackSlash.java rename to src/net/sourceforge/plantuml/text/BackSlash.java index 36c2bcf13..6a12aaa49 100644 --- a/src/net/sourceforge/plantuml/BackSlash.java +++ b/src/net/sourceforge/plantuml/text/BackSlash.java @@ -33,13 +33,15 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.text; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.StringUtils; + public class BackSlash { public static final String BS_BS_N = "\\n"; diff --git a/src/net/sourceforge/plantuml/command/regex/FoxSignature.java b/src/net/sourceforge/plantuml/text/FoxSignature.java similarity index 98% rename from src/net/sourceforge/plantuml/command/regex/FoxSignature.java rename to src/net/sourceforge/plantuml/text/FoxSignature.java index ef4f70d4c..083b30339 100644 --- a/src/net/sourceforge/plantuml/command/regex/FoxSignature.java +++ b/src/net/sourceforge/plantuml/text/FoxSignature.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.command.regex; +package net.sourceforge.plantuml.text; public class FoxSignature { diff --git a/src/net/sourceforge/plantuml/Guillemet.java b/src/net/sourceforge/plantuml/text/Guillemet.java similarity index 98% rename from src/net/sourceforge/plantuml/Guillemet.java rename to src/net/sourceforge/plantuml/text/Guillemet.java index 27f5fb26f..4bfaf6cfa 100644 --- a/src/net/sourceforge/plantuml/Guillemet.java +++ b/src/net/sourceforge/plantuml/text/Guillemet.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.text; import java.util.StringTokenizer; import java.util.regex.Matcher; diff --git a/src/net/sourceforge/plantuml/text/RichText.java b/src/net/sourceforge/plantuml/text/RichText.java index 95bf16253..56b3f9d92 100644 --- a/src/net/sourceforge/plantuml/text/RichText.java +++ b/src/net/sourceforge/plantuml/text/RichText.java @@ -40,12 +40,12 @@ import net.sourceforge.plantuml.StringUtils; public class RichText { public static boolean isRich(String text) { - if (text.indexOf(StringUtils.BOLD_START) != -1) { + if (text.indexOf(StringUtils.BOLD_START) != -1) return true; - } - if (text.indexOf(StringUtils.BOLD_END) != -1) { + + if (text.indexOf(StringUtils.BOLD_END) != -1) return true; - } + return false; } diff --git a/src/net/sourceforge/plantuml/utils/StringLocated.java b/src/net/sourceforge/plantuml/text/StringLocated.java similarity index 95% rename from src/net/sourceforge/plantuml/utils/StringLocated.java rename to src/net/sourceforge/plantuml/text/StringLocated.java index 1ded0600d..9708e94a6 100644 --- a/src/net/sourceforge/plantuml/utils/StringLocated.java +++ b/src/net/sourceforge/plantuml/text/StringLocated.java @@ -33,14 +33,12 @@ * * */ -package net.sourceforge.plantuml.utils; +package net.sourceforge.plantuml.text; import java.util.Objects; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.command.regex.FoxSignature; -import net.sourceforge.plantuml.tim.TLineType; +import net.sourceforge.plantuml.utils.LineLocation; final public class StringLocated { @@ -52,7 +50,7 @@ final public class StringLocated { private long fox = -1; private TLineType type; - @HaxeIgnored + public StringLocated(String s, LineLocation location) { this(s, location, null); } diff --git a/src/net/sourceforge/plantuml/SvgCharSizeHack.java b/src/net/sourceforge/plantuml/text/SvgCharSizeHack.java similarity index 97% rename from src/net/sourceforge/plantuml/SvgCharSizeHack.java rename to src/net/sourceforge/plantuml/text/SvgCharSizeHack.java index a09c83080..cdbe7f6f8 100644 --- a/src/net/sourceforge/plantuml/SvgCharSizeHack.java +++ b/src/net/sourceforge/plantuml/text/SvgCharSizeHack.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.text; public interface SvgCharSizeHack { diff --git a/src/net/sourceforge/plantuml/tim/TLineType.java b/src/net/sourceforge/plantuml/text/TLineType.java similarity index 99% rename from src/net/sourceforge/plantuml/tim/TLineType.java rename to src/net/sourceforge/plantuml/text/TLineType.java index 5012c8f3f..f396b8b82 100644 --- a/src/net/sourceforge/plantuml/tim/TLineType.java +++ b/src/net/sourceforge/plantuml/text/TLineType.java @@ -32,7 +32,7 @@ * Original Author: Arnaud Roques * */ -package net.sourceforge.plantuml.tim; +package net.sourceforge.plantuml.text; public enum TLineType { diff --git a/src/net/sourceforge/plantuml/theme/ThemeUtils.java b/src/net/sourceforge/plantuml/theme/ThemeUtils.java index 8e4796ced..595224363 100644 --- a/src/net/sourceforge/plantuml/theme/ThemeUtils.java +++ b/src/net/sourceforge/plantuml/theme/ThemeUtils.java @@ -50,6 +50,12 @@ import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.sprite.ResourcesUtils; import net.sourceforge.plantuml.utils.Log; +// ::uncomment when WASM +//import com.plantuml.wasm.RunInit; +//import java.io.FileInputStream; +//import java.io.FileNotFoundException; +// ::done + public class ThemeUtils { private static final String THEME_FILE_PREFIX = "puml-theme-"; @@ -58,6 +64,31 @@ public class ThemeUtils { private static final String THEME_PATH = "themes"; + // ::uncomment when WASM +// public static ReadLine getReaderTheme(String filename) throws FileNotFoundException { +// Log.info("Loading theme " + filename); +// final String fullpath = RunInit.cheerpjPath + THEME_PATH + "/" + THEME_FILE_PREFIX + filename +// + THEME_FILE_SUFFIX; +// +// final String res = "/" + THEME_PATH + "/" + THEME_FILE_PREFIX + filename + THEME_FILE_SUFFIX; +// final String description = "<" + res + ">"; +// final InputStream is = new FileInputStream(fullpath); +// return ReadLineReader.create(new InputStreamReader(is), description); +//} + // ::done + + // ::comment when WASM + public static ReadLine getReaderTheme(String filename) { + Log.info("Loading theme " + filename); + final String res = "/" + THEME_PATH + "/" + THEME_FILE_PREFIX + filename + THEME_FILE_SUFFIX; + final String description = "<" + res + ">"; + final InputStream is = Stdlib.class.getResourceAsStream(res); + if (is == null) + return null; + + return ReadLineReader.create(new InputStreamReader(is), description); + } + public static List getAllThemeNames() throws IOException { final Collection filenames = Objects.requireNonNull(ResourcesUtils.getJarFile(THEME_PATH, false)); final List result = new ArrayList<>(); @@ -69,17 +100,7 @@ public class ThemeUtils { Collections.sort(result); return result; } - - public static ReadLine getReaderTheme(String filename) { - Log.info("Loading theme " + filename); - final String res = "/" + THEME_PATH + "/" + THEME_FILE_PREFIX + filename + THEME_FILE_SUFFIX; - final String description = "<" + res + ">"; - final InputStream is = Stdlib.class.getResourceAsStream(res); - if (is == null) { - return null; - } - return ReadLineReader.create(new InputStreamReader(is), description); - } + // ::done public static String getFullPath(String from, String filename) { final StringBuilder sb = new StringBuilder(from); diff --git a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java index 69f5f4e3f..0475d7ed9 100644 --- a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java +++ b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java @@ -49,14 +49,14 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.eps.EpsGraphics; -import net.sourceforge.plantuml.ugraphic.UPath; -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.HColors; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; +import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 8bee9516c..21272ae40 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -39,12 +39,13 @@ import java.util.List; import net.sourceforge.plantuml.json.Json; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.expression.Token; import net.sourceforge.plantuml.tim.expression.TokenStack; import net.sourceforge.plantuml.tim.expression.TokenType; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public abstract class Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectation.java b/src/net/sourceforge/plantuml/tim/EaterAffectation.java index 22888fd3c..3554fd44f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectation.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectation.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterAffectation extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java index 309529bee..de7e63c91 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterAffectationDefine extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterAssert.java b/src/net/sourceforge/plantuml/tim/EaterAssert.java index a2bc3590d..e946463b1 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAssert.java +++ b/src/net/sourceforge/plantuml/tim/EaterAssert.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterAssert extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java index bb7ea2c77..03b6841c2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterDeclareProcedure extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java index 4914c6d78..79ce337ab 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterDeclareReturnFunction extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java index 769df7eed..ff366d953 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java +++ b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterDumpMemory extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterElseIf.java b/src/net/sourceforge/plantuml/tim/EaterElseIf.java index 58661ef45..a539685e0 100644 --- a/src/net/sourceforge/plantuml/tim/EaterElseIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterElseIf.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterElseIf extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterException.java b/src/net/sourceforge/plantuml/tim/EaterException.java index 66d04eea0..05cb46bc5 100644 --- a/src/net/sourceforge/plantuml/tim/EaterException.java +++ b/src/net/sourceforge/plantuml/tim/EaterException.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterException extends Exception { diff --git a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java b/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java index bfbf0962f..dd7cd11a8 100644 --- a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java +++ b/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.tim; import java.util.Objects; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterExceptionLocated extends Exception { diff --git a/src/net/sourceforge/plantuml/tim/EaterForeach.java b/src/net/sourceforge/plantuml/tim/EaterForeach.java index 618781d0d..ddac70db0 100644 --- a/src/net/sourceforge/plantuml/tim/EaterForeach.java +++ b/src/net/sourceforge/plantuml/tim/EaterForeach.java @@ -35,8 +35,8 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.json.JsonArray; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterForeach extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java index 8c55b4e45..390894aa7 100644 --- a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java +++ b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java @@ -40,9 +40,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.expression.TokenStack; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterFunctionCall extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterIf.java b/src/net/sourceforge/plantuml/tim/EaterIf.java index 3606f002e..28a607906 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterIf.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterIf extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterIfdef.java b/src/net/sourceforge/plantuml/tim/EaterIfdef.java index 6dd66f36d..a1073fa18 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfdef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfdef.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.preproc.EvalBoolean; import net.sourceforge.plantuml.preproc.Truth; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterIfdef extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterIfndef.java b/src/net/sourceforge/plantuml/tim/EaterIfndef.java index 8ee7a20f2..d72b8efdf 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfndef.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterIfndef extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterImport.java b/src/net/sourceforge/plantuml/tim/EaterImport.java index a1a8e3bc3..ee1b984de 100644 --- a/src/net/sourceforge/plantuml/tim/EaterImport.java +++ b/src/net/sourceforge/plantuml/tim/EaterImport.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterImport extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterInclude.java b/src/net/sourceforge/plantuml/tim/EaterInclude.java index 929c938f6..776dc6c4e 100644 --- a/src/net/sourceforge/plantuml/tim/EaterInclude.java +++ b/src/net/sourceforge/plantuml/tim/EaterInclude.java @@ -35,7 +35,7 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.preproc2.PreprocessorIncludeStrategy; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterInclude extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java index 519dedd09..9f4f7a0fc 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterIncludeDef extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java index 816a8a0c7..dd4a8d172 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterIncludesub extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java index 635ff3171..1ed5347d2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterLegacyDefine extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java index 34baae0d1..b8af452bd 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterLegacyDefineLong extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterLog.java b/src/net/sourceforge/plantuml/tim/EaterLog.java index fb8bed1fe..f07490a7e 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLog.java +++ b/src/net/sourceforge/plantuml/tim/EaterLog.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterLog extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterReturn.java b/src/net/sourceforge/plantuml/tim/EaterReturn.java index 48897fb66..4c2bcc6bb 100644 --- a/src/net/sourceforge/plantuml/tim/EaterReturn.java +++ b/src/net/sourceforge/plantuml/tim/EaterReturn.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterReturn extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterStartsub.java b/src/net/sourceforge/plantuml/tim/EaterStartsub.java index 6ce74a50b..d2cf34ec0 100644 --- a/src/net/sourceforge/plantuml/tim/EaterStartsub.java +++ b/src/net/sourceforge/plantuml/tim/EaterStartsub.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterStartsub extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterTheme.java b/src/net/sourceforge/plantuml/tim/EaterTheme.java index 8ba5c2b22..5ca22516e 100644 --- a/src/net/sourceforge/plantuml/tim/EaterTheme.java +++ b/src/net/sourceforge/plantuml/tim/EaterTheme.java @@ -49,8 +49,8 @@ import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineReader; import net.sourceforge.plantuml.preproc2.PreprocessorUtils; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.theme.ThemeUtils; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterTheme extends Eater { @@ -85,11 +85,11 @@ public class EaterTheme extends Eater { public final ReadLine getTheme() throws EaterException { if (from == null) { - final ReadLine reader = ThemeUtils.getReaderTheme(realName); - if (reader != null) - return reader; - try { + final ReadLine reader = ThemeUtils.getReaderTheme(realName); + if (reader != null) + return reader; + final AFile localFile = importedFiles.getAFile(ThemeUtils.getFilename(realName)); if (localFile != null && localFile.isOk()) { final BufferedReader br = localFile.getUnderlyingFile().openBufferedReader(); diff --git a/src/net/sourceforge/plantuml/tim/EaterUndef.java b/src/net/sourceforge/plantuml/tim/EaterUndef.java index 9a6bc9034..b8fa7bf6b 100644 --- a/src/net/sourceforge/plantuml/tim/EaterUndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterUndef.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.tim; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class EaterUndef extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/EaterWhile.java b/src/net/sourceforge/plantuml/tim/EaterWhile.java index c8cd4535d..d216906d3 100644 --- a/src/net/sourceforge/plantuml/tim/EaterWhile.java +++ b/src/net/sourceforge/plantuml/tim/EaterWhile.java @@ -34,8 +34,8 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TokenStack; -import net.sourceforge.plantuml.utils.StringLocated; public class EaterWhile extends Eater { diff --git a/src/net/sourceforge/plantuml/tim/FunctionsSet.java b/src/net/sourceforge/plantuml/tim/FunctionsSet.java index 6a17be0ed..879515e8f 100644 --- a/src/net/sourceforge/plantuml/tim/FunctionsSet.java +++ b/src/net/sourceforge/plantuml/tim/FunctionsSet.java @@ -40,7 +40,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class FunctionsSet { diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index a7ed57f94..52d224c52 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -66,6 +66,8 @@ import net.sourceforge.plantuml.preproc2.PreprocessorIncludeStrategy; import net.sourceforge.plantuml.preproc2.PreprocessorUtils; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.theme.ThemeUtils; import net.sourceforge.plantuml.tim.expression.Knowledge; import net.sourceforge.plantuml.tim.expression.TValue; @@ -132,7 +134,6 @@ import net.sourceforge.plantuml.tim.stdlib.Substr; import net.sourceforge.plantuml.tim.stdlib.Upper; import net.sourceforge.plantuml.tim.stdlib.VariableExists; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class TContext { diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index fac47dc68..4cf4220e4 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -42,9 +42,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringLocated; public class TFunctionImpl implements TFunction { diff --git a/src/net/sourceforge/plantuml/tim/TimLoader.java b/src/net/sourceforge/plantuml/tim/TimLoader.java index 5042ee09d..3f8140bbc 100644 --- a/src/net/sourceforge/plantuml/tim/TimLoader.java +++ b/src/net/sourceforge/plantuml/tim/TimLoader.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.preproc.FileWithSuffix; import net.sourceforge.plantuml.preproc.ImportedFiles; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class TimLoader { diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index 1aa1911e5..7ae832f37 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenType.java b/src/net/sourceforge/plantuml/tim/expression/TokenType.java index ab399bb23..024066c6a 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenType.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenType.java @@ -34,9 +34,9 @@ */ package net.sourceforge.plantuml.tim.expression; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.Eater; import net.sourceforge.plantuml.tim.EaterException; -import net.sourceforge.plantuml.tim.TLineType; public enum TokenType { QUOTED_STRING, JSON_DATA, OPERATOR, OPEN_PAREN_MATH, COMMA, CLOSE_PAREN_MATH, NUMBER, PLAIN_TEXT, SPACES, diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java index 201d35156..30821dead 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java @@ -34,9 +34,9 @@ */ package net.sourceforge.plantuml.tim.iterator; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.utils.StringLocated; public interface CodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java index 83c439267..99fa78a3b 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; import net.sourceforge.plantuml.json.ParseException; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterAffectation; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorAffectation extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java index 507f293d6..2a7fa291a 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterForeach; import net.sourceforge.plantuml.tim.ExecutionContextForeach; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorForeach extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java index 7ae93591c..c0ea0e8fd 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java @@ -36,6 +36,8 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterElseIf; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; @@ -44,9 +46,7 @@ import net.sourceforge.plantuml.tim.EaterIfdef; import net.sourceforge.plantuml.tim.EaterIfndef; import net.sourceforge.plantuml.tim.ExecutionContextIf; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorIf extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java index 0aecaef52..a3cecd0ee 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorImpl implements CodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java index f8beac5fb..c297ce297 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java @@ -34,9 +34,9 @@ */ package net.sourceforge.plantuml.tim.iterator; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorInnerComment extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java index 41d21f88d..3d250b1e2 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorLegacyDefine extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java index e0b0e44b7..4ea7ec80e 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.tim.TLineType; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorLongComment extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java index 4716d42ef..9e16b8741 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionType; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorProcedure extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java index de81a55a0..885dc0934 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionType; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorReturnFunction extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java index f40377293..b1585ae88 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.tim.TLineType; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorShortComment extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java index 0502430f1..76e5c1db0 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java @@ -38,13 +38,13 @@ import java.util.Collections; import java.util.Map; import net.sourceforge.plantuml.preproc.Sub; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorSub extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java index de5b6f7f7..c4d30bd46 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java @@ -36,16 +36,16 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; +import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterWhile; import net.sourceforge.plantuml.tim.ExecutionContextWhile; import net.sourceforge.plantuml.tim.TContext; -import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.expression.TokenStack; -import net.sourceforge.plantuml.utils.StringLocated; public class CodeIteratorWhile extends AbstractCodeIterator { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index d1db80418..7864c9487 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class Darken extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java index bcb80ba9a..ac52f57ce 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java @@ -60,17 +60,22 @@ public class Getenv extends SimpleReturnFunction { public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { - if (OptionFlags.ALLOW_INCLUDE == false) { + // ::comment when WASM + if (OptionFlags.ALLOW_INCLUDE == false) + // ::done return TValue.fromString(""); - } + // ::comment when WASM + final String name = values.get(0).toString(); final String value = getenv(name); if (value == null) return TValue.fromString(""); return TValue.fromString(value); + // ::done } + // ::comment when WASM private String getenv(String name) { // Check, if the script requests secret information. // A plantuml server should have an own SecurityManager to @@ -84,4 +89,5 @@ public class Getenv extends SimpleReturnFunction { return System.getenv(name); } + // ::done } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java index f415ab738..f36737bb5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java @@ -39,14 +39,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.color.HSLColor; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColors; -import net.sourceforge.plantuml.ugraphic.color.HSLColor; import net.sourceforge.plantuml.utils.LineLocation; public class HslColor extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index fa173e7e2..b928c44e3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class IsDark extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index f591f3d4c..d44bf6c55 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class IsLight extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index a34df904f..243aabc57 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class Lighten extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index e262cac88..222d36222 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class ReverseColor extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index b69941ed9..24ebcea33 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -38,15 +38,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class ReverseHsluvColor extends SimpleReturnFunction { diff --git a/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java b/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java index 654ca5c73..ac379f323 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java +++ b/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java @@ -40,12 +40,12 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.SymbolContext; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class ChangeState implements Comparable { diff --git a/src/net/sourceforge/plantuml/timingdiagram/Highlight.java b/src/net/sourceforge/plantuml/timingdiagram/Highlight.java index 36ac80102..3127878fd 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/Highlight.java +++ b/src/net/sourceforge/plantuml/timingdiagram/Highlight.java @@ -34,25 +34,25 @@ */ package net.sourceforge.plantuml.timingdiagram; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColors; public class Highlight { diff --git a/src/net/sourceforge/plantuml/timingdiagram/Player.java b/src/net/sourceforge/plantuml/timingdiagram/Player.java index aa3317654..61d53ab4c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/Player.java +++ b/src/net/sourceforge/plantuml/timingdiagram/Player.java @@ -38,21 +38,21 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; public abstract class Player implements TimeProjected { diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java index 19c4b8ab1..0aafcd586 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java @@ -48,11 +48,13 @@ import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.SName; @@ -60,8 +62,6 @@ import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PlayerAnalog extends Player { diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java index 351e2a5cb..86e746768 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java @@ -48,20 +48,20 @@ import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PlayerBinary extends Player { diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java index 9751e5b8c..c469cd7c7 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java @@ -41,19 +41,19 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint; import net.sourceforge.plantuml.timingdiagram.graphic.PlayerFrame; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PlayerClock extends Player { diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java index 98928b762..4575432da 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java @@ -47,10 +47,11 @@ import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -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.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -62,7 +63,6 @@ import net.sourceforge.plantuml.timingdiagram.graphic.PDrawing; import net.sourceforge.plantuml.timingdiagram.graphic.PlayerFrame; import net.sourceforge.plantuml.timingdiagram.graphic.Ribbon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; public final class PlayerRobustConcise extends Player { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java index 264fc07cc..fa7536055 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java @@ -41,10 +41,15 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -52,11 +57,6 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -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.HColor; import net.sourceforge.plantuml.utils.Direction; public class TimeConstraint { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java b/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java index d46c748ba..61b906e48 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimeMessage.java @@ -39,14 +39,14 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.cucadiagram.WithLinkType; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; 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.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class TimeMessage extends WithLinkType { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeProjected.java b/src/net/sourceforge/plantuml/timingdiagram/TimeProjected.java index e0efa2ab5..76e4d3088 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimeProjected.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimeProjected.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint; public interface TimeProjected { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java index 9fbd31986..5f1e3c800 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java @@ -57,9 +57,14 @@ import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -67,12 +72,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint; import net.sourceforge.plantuml.timingdiagram.graphic.TimeArrow; -import net.sourceforge.plantuml.ugraphic.MinMax; 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.HColor; public class TimingDiagram extends UmlDiagram implements Clocks { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingNote.java b/src/net/sourceforge/plantuml/timingdiagram/TimingNote.java index 76f4a7c5c..f3ad10e3d 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingNote.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingNote.java @@ -41,16 +41,16 @@ import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.image.Opale; 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; public class TimingNote { diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java index cf58efe18..23c14ef01 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java @@ -46,19 +46,19 @@ import java.util.TreeSet; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; 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.HColor; public class TimingRuler { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java index 5e65ec8e6..24b719d6c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.PlayerAnalog; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtPlayer.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtPlayer.java index cd0d8c253..bad822a3b 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtPlayer.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtPlayer.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtTime.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtTime.java index adaa47bf2..be8e9321b 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtTime.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAtTime.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java index bd19742c2..f70bbaf73 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeState.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeState.java index 29c4ec8a6..56aa0c797 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeState.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeState.java @@ -37,17 +37,17 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; abstract class CommandChangeState extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByPlayerCode.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByPlayerCode.java index 115140435..394eb7686 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByPlayerCode.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByPlayerCode.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandChangeStateByPlayerCode extends CommandChangeState { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByTime.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByTime.java index c548fcf24..b8f8c2271 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByTime.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandChangeStateByTime.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandChangeStateByTime extends CommandChangeState { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandClock.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandClock.java index 52accce8d..f9d181f6c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandClock.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandClock.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java index 2fbedd0bb..7b596c15d 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java @@ -37,17 +37,17 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.command.CommandArrow; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandConstraint extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateLong.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateLong.java index 996d7d66d..b0e8e83a1 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateLong.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateLong.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java index cf14ceb88..f5c3ebb4c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java @@ -39,10 +39,10 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandHideTimeAxis.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandHideTimeAxis.java index 4768a8206..ea778af9a 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandHideTimeAxis.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandHideTimeAxis.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimeAxisStategy; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandHighlight.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandHighlight.java index 06a3d384e..c0f1a17d0 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandHighlight.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandHighlight.java @@ -37,18 +37,18 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; public class CommandHighlight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandModeCompact.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandModeCompact.java index d996abba8..e1b903cdf 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandModeCompact.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandModeCompact.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandNote.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandNote.java index b5eb7a5d0..f8c7ac65c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandNote.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandNote.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandNoteLong.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandNoteLong.java index 55d28b53e..1b2164bc0 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandNoteLong.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandNoteLong.java @@ -40,15 +40,15 @@ import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteLong extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandPixelHeight.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandPixelHeight.java index bfaf09d82..2c939647b 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandPixelHeight.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandPixelHeight.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java index cbddafce8..d740a9bdc 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Stereotype; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.timingdiagram.TimingStyle; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandScalePixel.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandScalePixel.java index 0d76b8e08..6bf2e8e4f 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandScalePixel.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandScalePixel.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandTicks.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandTicks.java index 4b2616412..4a738f289 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandTicks.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandTicks.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.PlayerAnalog; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandTimeMessage.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandTimeMessage.java index 1bd4b74aa..943651a74 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandTimeMessage.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandTimeMessage.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Player; import net.sourceforge.plantuml.timingdiagram.TimeMessage; import net.sourceforge.plantuml.timingdiagram.TimeTick; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandUseDateFormat.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandUseDateFormat.java index ea9b5b03b..a4130c5ed 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandUseDateFormat.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandUseDateFormat.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/TimeTickBuilder.java b/src/net/sourceforge/plantuml/timingdiagram/command/TimeTickBuilder.java index 2ebeaa5cc..82f9e22f5 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/TimeTickBuilder.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/TimeTickBuilder.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.timingdiagram.command; import java.math.BigDecimal; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexOr; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.timingdiagram.Clocks; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingFormat; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/HexaShape.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/HexaShape.java index 23a310e59..949feaf75 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/HexaShape.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/HexaShape.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.timingdiagram.graphic; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPolygon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPolygon; public class HexaShape implements UDrawable { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java index e69d71f42..c05432546 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java @@ -45,13 +45,18 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.timingdiagram.ChangeState; @@ -59,11 +64,6 @@ import net.sourceforge.plantuml.timingdiagram.TimeConstraint; import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingRuler; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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; public class Histogram implements PDrawing { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/IntricatedPoint.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/IntricatedPoint.java index a212c8dae..6d76c3353 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/IntricatedPoint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/IntricatedPoint.java @@ -35,7 +35,7 @@ package net.sourceforge.plantuml.timingdiagram.graphic; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class IntricatedPoint { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PDrawing.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PDrawing.java index 5d3e590ba..3042b5570 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PDrawing.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PDrawing.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -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.klimt.font.StringBounder; import net.sourceforge.plantuml.timingdiagram.ChangeState; import net.sourceforge.plantuml.timingdiagram.TimeConstraint; import net.sourceforge.plantuml.timingdiagram.TimeProjected; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaAShape.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaAShape.java index a649fff33..837f7450c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaAShape.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaAShape.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.timingdiagram.graphic; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; public class PentaAShape implements UDrawable { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaBShape.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaBShape.java index 21912f6fa..05acf59a4 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaBShape.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PentaBShape.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.timingdiagram.graphic; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; public class PentaBShape implements UDrawable { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java index f44ddc1ff..d6fe42ac9 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.timingdiagram.graphic; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; 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.HColor; public class PlayerFrame { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java index f2c70dc6e..9d8bd0234 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java @@ -43,15 +43,19 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -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.UDrawable; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.timingdiagram.ChangeState; @@ -60,10 +64,6 @@ import net.sourceforge.plantuml.timingdiagram.TimeTick; import net.sourceforge.plantuml.timingdiagram.TimingNote; import net.sourceforge.plantuml.timingdiagram.TimingRuler; import net.sourceforge.plantuml.ugraphic.UGraphic; -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; public class Ribbon implements PDrawing { diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java index 072db08bc..2dd527a14 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java @@ -34,21 +34,21 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -import net.sourceforge.plantuml.ISkinSimple; +import net.atmp.ISkinSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.WithLinkType; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -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; public class TimeArrow implements UDrawable { diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java b/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java index 944d75e8e..73661f522 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java @@ -38,11 +38,20 @@ package net.sourceforge.plantuml.ugraphic; import java.util.Map; import java.util.Objects; -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.HColors; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UHidden; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPattern; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.url.Url; public abstract class AbstractCommonUGraphic implements UGraphic { diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java index ca168699c..71654763e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java @@ -40,8 +40,8 @@ import java.util.LinkedHashMap; import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public abstract class AbstractPlacementStrategy implements PlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java index 6ecdb2ef1..e3f2dbaef 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java @@ -39,10 +39,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.graphic.SpecialText; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.atmp.SpecialText; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; public abstract class AbstractUGraphic extends AbstractCommonUGraphic { diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java index f94f47bbe..eb04273bc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java @@ -36,6 +36,10 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.graphic.UGraphicDelegator; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; public abstract class AbstractUGraphicHorizontalLine extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java b/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java index 9dc468448..d1fbdee20 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java +++ b/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java @@ -34,6 +34,8 @@ */ package net.sourceforge.plantuml.ugraphic; +import net.sourceforge.plantuml.klimt.UClip; + public interface ClipContainer { public UClip getClip(); } diff --git a/src/net/sourceforge/plantuml/ugraphic/CopyForegroundColorToBackgroundColor.java b/src/net/sourceforge/plantuml/ugraphic/CopyForegroundColorToBackgroundColor.java index 019c7ec1c..c49b246ff 100644 --- a/src/net/sourceforge/plantuml/ugraphic/CopyForegroundColorToBackgroundColor.java +++ b/src/net/sourceforge/plantuml/ugraphic/CopyForegroundColorToBackgroundColor.java @@ -35,6 +35,8 @@ */ package net.sourceforge.plantuml.ugraphic; +import net.sourceforge.plantuml.klimt.UChange; + public class CopyForegroundColorToBackgroundColor implements UChange { } diff --git a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java index 52625a4dd..6c155de1c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java +++ b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java @@ -54,13 +54,17 @@ import java.util.Set; import javax.xml.transform.TransformerException; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.svg.LengthAdjust; import net.sourceforge.plantuml.svg.SvgGraphics; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class FontChecker { diff --git a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java index 26d7b0f59..298287e3a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java @@ -53,7 +53,6 @@ import javax.swing.ImageIcon; import net.sourceforge.plantuml.AnimatedGifEncoder; import net.sourceforge.plantuml.AnnotatedBuilder; import net.sourceforge.plantuml.AnnotatedWorker; -import net.sourceforge.plantuml.CMapData; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.CornerParam; import net.sourceforge.plantuml.EmptyImageBuilder; @@ -65,9 +64,7 @@ import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.Pragma; import net.sourceforge.plantuml.Scale; -import net.sourceforge.plantuml.SvgCharSizeHack; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.anim.AffineTransformation; import net.sourceforge.plantuml.anim.Animation; import net.sourceforge.plantuml.api.ImageDataComplex; @@ -76,9 +73,18 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.braille.UGraphicBraille; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.eps.EpsStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.mjpeg.MJPEGGenerator; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; @@ -90,11 +96,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.svg.LengthAdjust; -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.HColors; +import net.sourceforge.plantuml.text.SvgCharSizeHack; import net.sourceforge.plantuml.ugraphic.debug.UGraphicDebug; import net.sourceforge.plantuml.ugraphic.eps.UGraphicEps; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; @@ -104,6 +106,8 @@ import net.sourceforge.plantuml.ugraphic.svg.UGraphicSvg; import net.sourceforge.plantuml.ugraphic.tikz.UGraphicTikz; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; import net.sourceforge.plantuml.ugraphic.visio.UGraphicVdx; +import net.sourceforge.plantuml.url.CMapData; +import net.sourceforge.plantuml.url.Url; public class ImageBuilder { diff --git a/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java b/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java deleted file mode 100644 index 20cdc74fa..000000000 --- a/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java +++ /dev/null @@ -1,69 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2023, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * If you like this project or if you find it useful, you can support us at: - * - * http://plantuml.com/patreon (only 1$ per month!) - * http://plantuml.com/paypal - * - * This file is part of PlantUML. - * - * PlantUML is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * PlantUML distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - * License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. - * - * - * Original Author: Arnaud Roques - * - * - */ -package net.sourceforge.plantuml.ugraphic; - -import java.util.ArrayList; -import java.util.List; - -public class InflaterSet { - - static class Inflater { - private final double start; - private final double size; - - private Inflater(double start, double size) { - this.start = start; - this.size = size; - } - } - - private final List all = new ArrayList<>(); - - public void addInflater(double start, double size) { - all.add(new Inflater(start, size)); - } - - public double inflate(double v) { - double result = v; - for (Inflater in : all) { - if (v > in.start) { - result += in.size; - } - } - return result; - } - -} diff --git a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java index ce283ed6d..f3d0d6e06 100644 --- a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java @@ -37,15 +37,32 @@ package net.sourceforge.plantuml.ugraphic; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import net.sourceforge.plantuml.FileFormat; +import net.atmp.SpecialText; import net.sourceforge.plantuml.activitydiagram3.ftile.CenteredText; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.SpecialText; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.posimo.DotPath; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UAntiAliasing; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UHidden; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.MinMaxMutable; public class LimitFinder extends UGraphicNo { @@ -63,7 +80,6 @@ public class LimitFinder extends UGraphicNo { private final MinMaxMutable minmax; private UClip clip; - private final FileFormat format; public static LimitFinder create(StringBounder stringBounder, boolean initToZero) { final LimitFinder result = new LimitFinder(stringBounder, new UTranslate(), MinMaxMutable.getEmpty(initToZero)); @@ -74,7 +90,6 @@ public class LimitFinder extends UGraphicNo { private LimitFinder(StringBounder stringBounder, UTranslate translate, MinMaxMutable minmax) { super(stringBounder, translate); this.minmax = minmax; - this.format = stringBounder.getNativeFormat(); } private void addPoint(double x, double y) { diff --git a/src/net/sourceforge/plantuml/ugraphic/PixelImage.java b/src/net/sourceforge/plantuml/ugraphic/PixelImage.java index 785aab475..4e8fa8df3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PixelImage.java +++ b/src/net/sourceforge/plantuml/ugraphic/PixelImage.java @@ -41,7 +41,8 @@ import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; import java.util.Objects; -import net.sourceforge.plantuml.ugraphic.color.ColorUtils; +import net.sourceforge.plantuml.klimt.MutableImage; +import net.sourceforge.plantuml.klimt.color.ColorUtils; public class PixelImage implements MutableImage { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java index a3e70bab6..923c080ab 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java @@ -41,8 +41,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyVisibility extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java index 87572393b..e4a14f216 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java @@ -40,8 +40,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyX1X2 extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java index bd7b4f842..2383f4f0c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java @@ -41,8 +41,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyX1Y2Y3 extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java index 4509e535d..68c25b53b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java @@ -40,8 +40,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyY1Y2 extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java index fa7dde3f0..9e9561270 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java @@ -40,8 +40,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyY1Y2Center extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java index acbd67683..f20b2593d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java @@ -40,8 +40,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyY1Y2Left extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java index 11c0b6420..5e56c717b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java @@ -40,8 +40,8 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class PlacementStrategyY1Y2Right extends AbstractPlacementStrategy { diff --git a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java index 29d165c59..83fc75b29 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java @@ -38,8 +38,9 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svek.image.ContainingEllipse; import net.sourceforge.plantuml.svek.image.Footprint; diff --git a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java index 5c0252df0..2dd844832 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java @@ -38,8 +38,15 @@ package net.sourceforge.plantuml.ugraphic; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMaxMutable; public class TextLimitFinder extends UGraphicNo { diff --git a/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java b/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java index 539283554..83e10d26a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java +++ b/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java @@ -35,6 +35,9 @@ */ package net.sourceforge.plantuml.ugraphic; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.font.UFont; + public class UCenteredCharacter implements UShape { private final char c; diff --git a/src/net/sourceforge/plantuml/ugraphic/UDriver.java b/src/net/sourceforge/plantuml/ugraphic/UDriver.java index 856efbf8c..48a48e381 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UDriver.java +++ b/src/net/sourceforge/plantuml/ugraphic/UDriver.java @@ -35,7 +35,9 @@ */ package net.sourceforge.plantuml.ugraphic; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.ColorMapper; public interface UDriver { public void draw(SHAPE shape, double x, double y, ColorMapper mapper, UParam param, O object); diff --git a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java index 510945591..8efbdbdec 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java @@ -37,6 +37,8 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.AbstractShadowable; +import net.sourceforge.plantuml.klimt.UShapeSized; public class UEllipse extends AbstractShadowable implements UShapeSized { diff --git a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java index c61eda29c..a3c17ecf3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java @@ -35,6 +35,7 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.UShape; public class UEmpty implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UFontUser.java b/src/net/sourceforge/plantuml/ugraphic/UFontUser.java deleted file mode 100644 index 1a0e53a7c..000000000 --- a/src/net/sourceforge/plantuml/ugraphic/UFontUser.java +++ /dev/null @@ -1,40 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2023, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * If you like this project or if you find it useful, you can support us at: - * - * http://plantuml.com/patreon (only 1$ per month!) - * http://plantuml.com/paypal - * - * This file is part of PlantUML. - * - * PlantUML is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * PlantUML distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - * License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. - * - * - * Original Author: Arnaud Roques - * - * - */ -package net.sourceforge.plantuml.ugraphic; - -public enum UFontUser { - JAVA, DOT -} diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphic.java b/src/net/sourceforge/plantuml/ugraphic/UGraphic.java index ce75dfee0..d724fe801 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphic.java @@ -39,10 +39,14 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -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.klimt.UChange; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.url.Url; public interface UGraphic { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java index cbf18f259..d97dde871 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java @@ -39,6 +39,8 @@ import java.util.Arrays; import java.util.Collection; import net.sourceforge.plantuml.graphic.UGraphicDelegator; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UShape; public class UGraphicFilter extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java index e4b4c8074..89c4ea3f0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java @@ -39,11 +39,15 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -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.HColors; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UParamNull; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.url.Url; public abstract class UGraphicNo implements UGraphic { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java index 0962b60f1..acea66035 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.ugraphic; import java.io.IOException; import java.io.OutputStream; -import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.FileFormat; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; public class UGraphicNull extends AbstractUGraphic implements EnsureVisible { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java index 2f846a0ad..f92954371 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java @@ -37,7 +37,9 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class UGraphicStencil extends AbstractUGraphicHorizontalLine { diff --git a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java index 05da5d6ed..d85f40bd6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java @@ -37,8 +37,13 @@ package net.sourceforge.plantuml.ugraphic; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Stencil; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class UHorizontalLine implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java index c30a17ffd..988d4032a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java @@ -40,6 +40,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.SignatureUtils; +import net.sourceforge.plantuml.klimt.UShape; public class UImageSvg implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java index 7b02ef76e..279f98fb5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java +++ b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java @@ -42,8 +42,9 @@ import java.util.Set; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class ULayoutGroup { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/CompressionXorYBuilder.java b/src/net/sourceforge/plantuml/ugraphic/comp/CompressionXorYBuilder.java index 537ded39a..f38d1fb0d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/CompressionXorYBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/CompressionXorYBuilder.java @@ -35,8 +35,9 @@ */ package net.sourceforge.plantuml.ugraphic.comp; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.font.StringBounder; public class CompressionXorYBuilder { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java b/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java index 0d8b407d0..643c7107e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java @@ -37,13 +37,14 @@ package net.sourceforge.plantuml.ugraphic.comp; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; 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; public class PiecewiseAffineOnXorYBuilder extends AbstractTextBlock implements TextBlock, TextBlockBackcolored { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/SlotFinder.java b/src/net/sourceforge/plantuml/ugraphic/comp/SlotFinder.java index b718181c5..8327808fd 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/SlotFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/SlotFinder.java @@ -37,24 +37,25 @@ package net.sourceforge.plantuml.ugraphic.comp; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UShapeIgnorableForCompression; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.TextLimitFinder; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphicNo; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UShapeIgnorableForCompression; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class SlotFinder extends UGraphicNo { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/SlotSet.java b/src/net/sourceforge/plantuml/ugraphic/comp/SlotSet.java index 7e63dbc51..aa604ba1a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/SlotSet.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/SlotSet.java @@ -40,9 +40,9 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class SlotSet implements Iterable { diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/UGraphicCompressOnXorY.java b/src/net/sourceforge/plantuml/ugraphic/comp/UGraphicCompressOnXorY.java index b724f2e37..ed06b5c3b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/UGraphicCompressOnXorY.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/UGraphicCompressOnXorY.java @@ -38,15 +38,16 @@ package net.sourceforge.plantuml.ugraphic.comp; import net.sourceforge.plantuml.activitydiagram3.ftile.CenteredText; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.ugraphic.UBackground; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.UBackground; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.comp.CompressionMode; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.URectangle; -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; public class UGraphicCompressOnXorY extends UGraphicDelegator { diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java index 0a50827e9..a2f818b20 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java @@ -36,11 +36,10 @@ package net.sourceforge.plantuml.ugraphic.debug; import java.util.Random; -import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounderRaw; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.font.StringBounderRaw; +import net.sourceforge.plantuml.klimt.font.UFont; public class StringBounderDebug extends StringBounderRaw { // ::remove folder when WASM @@ -63,8 +62,8 @@ public class StringBounderDebug extends StringBounderRaw { } @Override - public FileFormat getNativeFormat() { - return FileFormat.PNG; + public boolean matchesProperty(String propertyName) { + return false; } } diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java index c130790d8..e0b64e211 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java @@ -47,26 +47,26 @@ import java.util.Locale; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorMiddle; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; -import net.sourceforge.plantuml.ugraphic.UComment; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UEmpty; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.USegment; -import net.sourceforge.plantuml.ugraphic.USegmentType; -import net.sourceforge.plantuml.ugraphic.UShape; -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.HColorMiddle; -import net.sourceforge.plantuml.ugraphic.color.HColorSimple; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java index c7006f1a8..5282cc83e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java @@ -40,11 +40,11 @@ import java.awt.font.TextLayout; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.graphic.UnusedSpace; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverCenteredCharacterEps implements UDriver { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java index 55fb60477..84a8e28b0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.ugraphic.eps; import net.sourceforge.plantuml.eps.EpsGraphics; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathEps implements UDriver { @@ -50,7 +50,7 @@ public class DriverDotPathEps implements UDriver { eps.setStrokeColor(param.getColor().toColor(mapper)); eps.setStrokeWidth(param.getStroke().getThickness(), param.getStroke().getDashVisible(), param.getStroke().getDashSpace()); - shape.draw(eps, x, y); + eps.drawBezier(shape.getBeziers(), x, y); } } } diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java index e14f1f13c..aa93cdecd 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java @@ -35,12 +35,12 @@ package net.sourceforge.plantuml.ugraphic.eps; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverEllipseEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java index abd105f03..781ece97a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java @@ -35,12 +35,12 @@ package net.sourceforge.plantuml.ugraphic.eps; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverImageEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java index bd518517e..fdd3eb8f6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.ugraphic.eps; import java.awt.geom.Line2D; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverLineEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java index 2d4dc137c..a099d4569 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java @@ -35,10 +35,10 @@ package net.sourceforge.plantuml.ugraphic.eps; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPathEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java index 9b8771487..c63ac264a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.ugraphic.eps; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverPolygonEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java index 2ac4d96b5..3c9073b9c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.ugraphic.eps; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.eps.EpsGraphics; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverRectangleEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java index 3643d0643..3085caba5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java @@ -46,16 +46,16 @@ import java.util.List; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.eps.EpsGraphicsMacroAndText; import net.sourceforge.plantuml.eps.EpsStrategy; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -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; public class DriverTextEps implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java index 3afed122a..2ba216df3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java @@ -38,25 +38,25 @@ import java.io.IOException; import java.io.OutputStream; import net.sourceforge.plantuml.FileFormat; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.eps.EpsStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class UGraphicEps extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java index 7c0ccf2a6..a57b5008c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.Graphics2D; import net.sourceforge.plantuml.graphic.UnusedSpace; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverCenteredCharacterG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java index bb9bdb04b..61d6d87d6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.Graphics2D; -import net.sourceforge.plantuml.EnsureVisible; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java index 95bcddb99..4efb209cd 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java @@ -42,13 +42,13 @@ import java.awt.Shape; import java.awt.geom.Arc2D; import java.awt.geom.Ellipse2D; -import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverEllipseG2d extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java index c8bc3f04f..abde5e024 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.Graphics2D; import java.awt.geom.AffineTransform; -import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverImageG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java index 18048cadb..2c517a481 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java @@ -40,12 +40,12 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.Line2D; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class DriverLineG2d extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java index 91903b1b2..961cfe26f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java @@ -38,15 +38,15 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.GradientPaint; import java.awt.Graphics2D; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.geom.MinMax; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPath; -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.HColorGradient; public class DriverPathG2d extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java index a61589377..8f3a2fe48 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.Graphics2D; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPixel; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPixelG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java index b0cdcf60a..1bc7cb959 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java @@ -40,14 +40,14 @@ import java.awt.GradientPaint; import java.awt.Graphics2D; import java.awt.geom.GeneralPath; -import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.awt.geom.XPoint2D; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverPolygonG2d extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java index 78c31175b..eb2f15d86 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java @@ -45,16 +45,16 @@ import java.awt.geom.Rectangle2D; import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; -import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPattern; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShapeSized; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.color.HColorSimple; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPattern; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShapeSized; -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; public class DriverRectangleG2d extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java index 88d981448..afde101f7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java @@ -46,17 +46,17 @@ import java.awt.GraphicsEnvironment; import java.awt.font.TextLayout; import java.awt.geom.Rectangle2D; -import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -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.utils.Log; public class DriverTextAsPathG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java index 0c59014d4..d668509a8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java @@ -47,20 +47,20 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.util.List; -import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.text.StyledString; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UStroke; -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; public class DriverTextG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java index e19faf26f..7e483b08e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.geom.PathIterator; -import net.sourceforge.plantuml.ugraphic.USegmentType; +import net.sourceforge.plantuml.klimt.geom.USegmentType; /* diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java index ebd34eb55..612fd8926 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java @@ -49,31 +49,31 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import net.sourceforge.plantuml.EnsureVisible; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.anim.AffineTransformation; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UAntiAliasing; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; import net.sourceforge.plantuml.png.PngIO; -import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; -import net.sourceforge.plantuml.ugraphic.UAntiAliasing; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; -import net.sourceforge.plantuml.ugraphic.UChange; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPixel; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class UGraphicG2d extends AbstractUGraphic implements EnsureVisible { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java b/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java index a7dbbe5c5..3e551395c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java @@ -40,8 +40,8 @@ import java.util.Random; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; public class HandJiggle { private final Collection points = new ArrayList<>(); diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java index 340264e6d..42f15a5d5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.ugraphic.hand; import java.util.Random; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; -import net.sourceforge.plantuml.posimo.DotPath; -import net.sourceforge.plantuml.ugraphic.UPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UPath; public class UDotPathHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java index 6254887dc..e779789d8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.ugraphic.hand; import java.util.Random; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.Shadowable; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPolygon; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UPolygon; public class UEllipseHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java b/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java index 755ccb4f0..c25051ca3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.ugraphic.hand; import java.util.Random; import net.sourceforge.plantuml.graphic.UGraphicDelegator; -import net.sourceforge.plantuml.posimo.DotPath; -import net.sourceforge.plantuml.ugraphic.UChange; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.svg.UGraphicSvg; public class UGraphicHandwritten extends UGraphicDelegator implements UGraphic { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java index 64fff2920..530e37955 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.ugraphic.hand; import java.util.Random; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; public class ULineHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java index ec79b14eb..bc0324e4d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java @@ -38,9 +38,9 @@ import java.util.Random; import net.sourceforge.plantuml.awt.geom.XCubicCurve2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.USegment; -import net.sourceforge.plantuml.ugraphic.USegmentType; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; public class UPathHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java index 62f26b05e..ce8327acd 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Random; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.Shadowable; -import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPolygon; public class UPolygonHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java index 7fc42f57b..d4fc63375 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.ugraphic.hand; import java.util.Random; -import net.sourceforge.plantuml.ugraphic.Shadowable; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; public class URectangleHand { diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java index 9940f40fd..be1a218ca 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.ugraphic.html5; import java.awt.geom.Line2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverLineHtml5 implements UDriver { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java index f2830b2a6..c5ce1aa6b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.ugraphic.html5; import java.awt.geom.Rectangle2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverRectangleHtml5 implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java index a9d0d1f39..219d1bf52 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.ugraphic.html5; import java.io.IOException; import java.io.OutputStream; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class UGraphicHtml5 extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java index 0d428c086..061613815 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java @@ -39,13 +39,13 @@ import static net.sourceforge.plantuml.graphic.TextBlockUtils.createTextLayout; import java.awt.font.TextLayout; import net.sourceforge.plantuml.graphic.UnusedSpace; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class DriverCenteredCharacterSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java index 9f8eabfc9..885dc09e0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java @@ -35,11 +35,11 @@ */ package net.sourceforge.plantuml.ugraphic.svg; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java index c1808f1f7..be68d1946 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.svg; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverEllipseSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java index 81a78514a..3534a2e23 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.ugraphic.svg; import java.io.IOException; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.utils.Log; public class DriverImagePng implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java index bce298e88..473eadb8b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.svg; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverImageSvgSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java index 88b3ba9db..0315f5f7f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.ugraphic.svg; import java.awt.geom.Line2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverLineSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java index 071b21c23..c17a11afc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java @@ -34,14 +34,14 @@ */ package net.sourceforge.plantuml.ugraphic.svg; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.g2d.DriverShadowedG2d; public class DriverPathSvg extends DriverShadowedG2d implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPixelSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPixelSvg.java index 8ac5daa7f..c3481ea22 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPixelSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPixelSvg.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.svg; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPixel; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverPixelSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java index 039137928..a65ee7b40 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.svg; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPolygonSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java index c19bc73c9..5fd96d3a0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java @@ -36,15 +36,15 @@ package net.sourceforge.plantuml.ugraphic.svg; import java.awt.geom.Rectangle2D; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverRectangleSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java index 3ed402805..4df0e0e13 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java @@ -38,13 +38,13 @@ import static net.sourceforge.plantuml.graphic.TextBlockUtils.createTextLayout; import java.awt.font.TextLayout; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverTextAsPathSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java index 44755056f..47b29e7aa 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java @@ -36,20 +36,20 @@ package net.sourceforge.plantuml.ugraphic.svg; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UClip; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.font.UFontContext; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UClip; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UFontContext; -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.HColorGradient; public class DriverTextSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java index 85d474d41..9c0f3f652 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java @@ -40,29 +40,29 @@ import java.util.Map; import javax.xml.transform.TransformerException; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UComment; +import net.sourceforge.plantuml.klimt.UGroupType; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPixel; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.svg.LengthAdjust; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; -import net.sourceforge.plantuml.ugraphic.UComment; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UGroupType; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPixel; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class UGraphicSvg extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java index dbf24f8ee..737945c32 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java @@ -35,14 +35,14 @@ package net.sourceforge.plantuml.ugraphic.tikz; import net.sourceforge.plantuml.creole.legacy.AtomText; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class DriverAtomTextTikz implements UDriver { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java index 85555ac7d..e6093cfa1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java @@ -39,12 +39,12 @@ import static net.sourceforge.plantuml.graphic.TextBlockUtils.createTextLayout; import java.awt.font.TextLayout; import net.sourceforge.plantuml.graphic.UnusedSpace; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverCenteredCharacterTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz2.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz2.java index 4099e63b1..3164b2a77 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz2.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz2.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverCenteredCharacterTikz2 implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java index 0f24778c9..416ae5f91 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java index 355496fbf..56938d98d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverEllipseTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverImageTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverImageTikz.java index 330f042bb..02c1023be 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverImageTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverImageTikz.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverImageTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java index dd395f8e8..cc063bea4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java @@ -34,11 +34,11 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverLineTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPathTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPathTikz.java index 816fda4bb..5b4e07d43 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPathTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPathTikz.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverPathTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java index 7d40cab94..3cf8b720e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorGradient; public class DriverPolygonTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java index 89169810f..55351e7b3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorGradient; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -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.utils.MathUtils; public class DriverRectangleTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverTextTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverTextTikz.java index 0c0642b7d..94247d4c6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverTextTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverTextTikz.java @@ -34,15 +34,15 @@ */ package net.sourceforge.plantuml.ugraphic.tikz; -import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -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; public class DriverTextTikz implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java index 903174443..52bf940bb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java @@ -37,25 +37,25 @@ package net.sourceforge.plantuml.ugraphic.tikz; import java.io.IOException; import java.io.OutputStream; -import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.creole.legacy.AtomText; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.url.Url; public class UGraphicTikz extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java index 247d4e663..7f08cc41e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java +++ b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java @@ -46,14 +46,14 @@ import net.sourceforge.plantuml.asciiart.UmlCharArea; import net.sourceforge.plantuml.asciiart.UmlCharAreaImpl; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.FontStyle; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class UGraphicTxt extends AbstractCommonUGraphic implements ClipContainer { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java index 788fa9114..7d7937a88 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.ugraphic.visio; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverDotPathVdx implements UDriver { // ::remove folder when WASM diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java index 27eea298a..91a40f07e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.ugraphic.visio; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverLineVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPathVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPathVdx.java index ef62f8aea..5331a5869 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPathVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPathVdx.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.ugraphic.visio; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPathVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java index addfbaaab..158743cc8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.ugraphic.visio; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverPolygonVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java index e96d3a8d5..0658075c6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java @@ -34,10 +34,10 @@ */ package net.sourceforge.plantuml.ugraphic.visio; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverRectangleVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java index c5e2c00e0..d77173018 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java @@ -36,14 +36,14 @@ package net.sourceforge.plantuml.ugraphic.visio; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UParam; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.font.UFontContext; import net.sourceforge.plantuml.ugraphic.UDriver; -import net.sourceforge.plantuml.ugraphic.UFont; -import net.sourceforge.plantuml.ugraphic.UFontContext; -import net.sourceforge.plantuml.ugraphic.UParam; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; public class DriverTextVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java index 7aa64317c..be8979be4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java @@ -38,22 +38,22 @@ import java.io.IOException; import java.io.OutputStream; import net.sourceforge.plantuml.creole.legacy.AtomText; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.klimt.DotPath; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UText; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; import net.sourceforge.plantuml.ugraphic.UEllipse; -import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UText; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class UGraphicVdx extends AbstractUGraphic implements ClipContainer { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java index 1d9c9aac3..98b095ef8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java @@ -43,10 +43,10 @@ import java.util.Map; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.golem.MinMaxDouble; -import net.sourceforge.plantuml.ugraphic.UPath; -import net.sourceforge.plantuml.ugraphic.UPolygon; -import net.sourceforge.plantuml.ugraphic.USegment; -import net.sourceforge.plantuml.ugraphic.USegmentType; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UPolygon; +import net.sourceforge.plantuml.klimt.geom.USegment; +import net.sourceforge.plantuml.klimt.geom.USegmentType; import net.sourceforge.plantuml.utils.Log; public class VisioGraphics { diff --git a/src/net/sourceforge/plantuml/CMapData.java b/src/net/sourceforge/plantuml/url/CMapData.java similarity index 96% rename from src/net/sourceforge/plantuml/CMapData.java rename to src/net/sourceforge/plantuml/url/CMapData.java index 87d53cb10..7cefd8783 100644 --- a/src/net/sourceforge/plantuml/CMapData.java +++ b/src/net/sourceforge/plantuml/url/CMapData.java @@ -33,13 +33,15 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.url; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; +import net.sourceforge.plantuml.text.BackSlash; + public class CMapData { private final StringBuilder stringBuilder = new StringBuilder(); diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java b/src/net/sourceforge/plantuml/url/Check.java similarity index 94% rename from src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java rename to src/net/sourceforge/plantuml/url/Check.java index 9f0f5c3cd..61bb4c107 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java +++ b/src/net/sourceforge/plantuml/url/Check.java @@ -33,9 +33,9 @@ * * */ -package net.sourceforge.plantuml.cucadiagram.dot; +package net.sourceforge.plantuml.url; -final public class DotMaker2 { +final public class Check { // ::remove file when WASM private static boolean isJunit = false; diff --git a/src/net/sourceforge/plantuml/Url.java b/src/net/sourceforge/plantuml/url/Url.java similarity index 90% rename from src/net/sourceforge/plantuml/Url.java rename to src/net/sourceforge/plantuml/url/Url.java index 75b9d2af3..ee7c1ff39 100644 --- a/src/net/sourceforge/plantuml/Url.java +++ b/src/net/sourceforge/plantuml/url/Url.java @@ -33,12 +33,14 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.url; import java.util.Comparator; -import net.sourceforge.plantuml.annotation.HaxeIgnored; -import net.sourceforge.plantuml.cucadiagram.dot.DotMaker2; +import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.klimt.geom.BasicEnsureVisible; +import net.sourceforge.plantuml.klimt.geom.EnsureVisible; +import net.sourceforge.plantuml.text.BackSlash; public class Url implements EnsureVisible { @@ -47,7 +49,7 @@ public class Url implements EnsureVisible { private final String label; private boolean member; - @HaxeIgnored + public Url(String url, String tooltip) { this(url, tooltip, null); } @@ -94,7 +96,7 @@ public class Url implements EnsureVisible { public String getCoords(double scale) { // ::comment when WASM - if (DotMaker2.isJunit() && visible.getCoords(1.0).contains("0,0,0,0")) + if (Check.isJunit() && visible.getCoords(1.0).contains("0,0,0,0")) throw new IllegalStateException(toString()); // ::done diff --git a/src/net/sourceforge/plantuml/UrlBuilder.java b/src/net/sourceforge/plantuml/url/UrlBuilder.java similarity index 92% rename from src/net/sourceforge/plantuml/UrlBuilder.java rename to src/net/sourceforge/plantuml/url/UrlBuilder.java index ec0b574b3..8530a1706 100644 --- a/src/net/sourceforge/plantuml/UrlBuilder.java +++ b/src/net/sourceforge/plantuml/url/UrlBuilder.java @@ -33,14 +33,14 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.url; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; public class UrlBuilder { diff --git a/src/net/sourceforge/plantuml/UrlMode.java b/src/net/sourceforge/plantuml/url/UrlMode.java similarity index 97% rename from src/net/sourceforge/plantuml/UrlMode.java rename to src/net/sourceforge/plantuml/url/UrlMode.java index 2c16bd23a..067683c5b 100644 --- a/src/net/sourceforge/plantuml/UrlMode.java +++ b/src/net/sourceforge/plantuml/url/UrlMode.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml; +package net.sourceforge.plantuml.url; public enum UrlMode { STRICT, ANYWHERE diff --git a/src/net/sourceforge/plantuml/utils/BlocLines.java b/src/net/sourceforge/plantuml/utils/BlocLines.java index 7d22540d7..d74176f74 100644 --- a/src/net/sourceforge/plantuml/utils/BlocLines.java +++ b/src/net/sourceforge/plantuml/utils/BlocLines.java @@ -44,11 +44,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.security.SFile; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.text.StringLocated; public class BlocLines implements Iterable { diff --git a/src/net/sourceforge/plantuml/utils/LineLocationImpl.java b/src/net/sourceforge/plantuml/utils/LineLocationImpl.java index 85e25dc78..e34b59e24 100644 --- a/src/net/sourceforge/plantuml/utils/LineLocationImpl.java +++ b/src/net/sourceforge/plantuml/utils/LineLocationImpl.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.utils; import java.util.Objects; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + public class LineLocationImpl implements LineLocation { @@ -54,7 +54,7 @@ public class LineLocationImpl implements LineLocation { this(desc, parent, -1); } - @HaxeIgnored + private LineLocationImpl(String desc, LineLocation parent, int position) { this.parent = parent; this.desc = Objects.requireNonNull(desc); diff --git a/src/net/sourceforge/plantuml/utils/MTRandom.java b/src/net/sourceforge/plantuml/utils/MTRandom.java index f38b428d5..f14090dd7 100644 --- a/src/net/sourceforge/plantuml/utils/MTRandom.java +++ b/src/net/sourceforge/plantuml/utils/MTRandom.java @@ -29,7 +29,7 @@ package net.sourceforge.plantuml.utils; import java.util.Random; -import net.sourceforge.plantuml.annotation.HaxeIgnored; + /** * @version 1.0 @@ -83,7 +83,7 @@ import net.sourceforge.plantuml.annotation.HaxeIgnored; * --> * */ -@HaxeIgnored + public class MTRandom extends Random { /** diff --git a/src/net/sourceforge/plantuml/utils/StartUtils.java b/src/net/sourceforge/plantuml/utils/StartUtils.java index 8662ae6a6..1102592a7 100644 --- a/src/net/sourceforge/plantuml/utils/StartUtils.java +++ b/src/net/sourceforge/plantuml/utils/StartUtils.java @@ -36,10 +36,11 @@ package net.sourceforge.plantuml.utils; import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.DiagramType; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; +import net.sourceforge.plantuml.text.StringLocated; public class StartUtils { diff --git a/src/net/sourceforge/plantuml/version/IteratorCounter2.java b/src/net/sourceforge/plantuml/version/IteratorCounter2.java index 228271f67..5b1394ec7 100644 --- a/src/net/sourceforge/plantuml/version/IteratorCounter2.java +++ b/src/net/sourceforge/plantuml/version/IteratorCounter2.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.version; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public interface IteratorCounter2 extends Iterator { diff --git a/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java b/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java index f59202c00..f8b1b996b 100644 --- a/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java +++ b/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; public class IteratorCounter2Impl implements IteratorCounter2 { diff --git a/src/net/sourceforge/plantuml/version/PSystemKeycheck.java b/src/net/sourceforge/plantuml/version/PSystemKeycheck.java index a691d38de..79850af3d 100644 --- a/src/net/sourceforge/plantuml/version/PSystemKeycheck.java +++ b/src/net/sourceforge/plantuml/version/PSystemKeycheck.java @@ -52,12 +52,12 @@ import net.sourceforge.plantuml.flashcode.FlashCodeUtils; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PSystemKeycheck extends PlainDiagram { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/version/PSystemKeygen.java b/src/net/sourceforge/plantuml/version/PSystemKeygen.java index de9fa4fbe..b6486067a 100644 --- a/src/net/sourceforge/plantuml/version/PSystemKeygen.java +++ b/src/net/sourceforge/plantuml/version/PSystemKeygen.java @@ -51,13 +51,13 @@ import net.sourceforge.plantuml.flashcode.FlashCodeUtils; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PSystemKeygen extends PlainDiagram { // ::remove file when WASM diff --git a/src/net/sourceforge/plantuml/version/PSystemLicense.java b/src/net/sourceforge/plantuml/version/PSystemLicense.java index 088861c9d..70d586d37 100644 --- a/src/net/sourceforge/plantuml/version/PSystemLicense.java +++ b/src/net/sourceforge/plantuml/version/PSystemLicense.java @@ -45,12 +45,12 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UImage; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UImage; -import net.sourceforge.plantuml.ugraphic.UTranslate; public class PSystemLicense extends PlainDiagram implements UDrawable { diff --git a/src/net/sourceforge/plantuml/version/PSystemVersion.java b/src/net/sourceforge/plantuml/version/PSystemVersion.java index 8a7e5916f..03191712a 100644 --- a/src/net/sourceforge/plantuml/version/PSystemVersion.java +++ b/src/net/sourceforge/plantuml/version/PSystemVersion.java @@ -97,6 +97,7 @@ public class PSystemVersion extends PlainStringsDiagram { return getImage("favicon.png"); } + // ::comment when WASM public static BufferedImage getArecibo() { return getImage("arecibo.png"); } @@ -112,6 +113,7 @@ public class PSystemVersion extends PlainStringsDiagram { public static BufferedImage getApple2Image() { return getImageWebp("apple2.png"); } + // ::done private static BufferedImage getImage(final String name) { try { @@ -125,6 +127,7 @@ public class PSystemVersion extends PlainStringsDiagram { return new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); } + // ::comment when WASM private static BufferedImage getImageWebp(final String name) { try (InputStream is = PSystemVersion.class.getResourceAsStream(name)) { return SFile.getBufferedImageFromWebpButHeader(is); @@ -133,6 +136,7 @@ public class PSystemVersion extends PlainStringsDiagram { } return new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); } + // ::done private static BufferedImage transparentIcon; diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index d08673f27..c4bcd0a29 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -104,6 +104,7 @@ public class Version { return new Date(Version.compileTime()).toString(); } + // ::comment when WASM public static String getJarPath() { try { final ClassLoader loader = Version.class.getClassLoader(); @@ -122,5 +123,6 @@ public class Version { return t.toString(); } } + // ::done } diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSItem.java b/src/net/sourceforge/plantuml/wbs/CommandWBSItem.java index 0a9531d72..e54c94071 100644 --- a/src/net/sourceforge/plantuml/wbs/CommandWBSItem.java +++ b/src/net/sourceforge/plantuml/wbs/CommandWBSItem.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.wbs; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.mindmap.IdeaShape; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java b/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java index 4e296c3e1..d64b6a57b 100644 --- a/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java +++ b/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java @@ -42,15 +42,15 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; import net.sourceforge.plantuml.command.Trim; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.mindmap.IdeaShape; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.Direction; diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java index 867138c90..fffafbb41 100644 --- a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java +++ b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.wbs; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.color.ColorParser; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWBSLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wbs/Fork.java b/src/net/sourceforge/plantuml/wbs/Fork.java index a09e8f6d4..74cfd5a46 100644 --- a/src/net/sourceforge/plantuml/wbs/Fork.java +++ b/src/net/sourceforge/plantuml/wbs/Fork.java @@ -40,10 +40,10 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; class Fork extends WBSTextBlock { diff --git a/src/net/sourceforge/plantuml/wbs/ITF.java b/src/net/sourceforge/plantuml/wbs/ITF.java index c34faf764..bd4b82c74 100644 --- a/src/net/sourceforge/plantuml/wbs/ITF.java +++ b/src/net/sourceforge/plantuml/wbs/ITF.java @@ -36,8 +36,8 @@ package net.sourceforge.plantuml.wbs; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; interface ITF extends TextBlock { diff --git a/src/net/sourceforge/plantuml/wbs/ITFComposed.java b/src/net/sourceforge/plantuml/wbs/ITFComposed.java index 86ed25bdd..161f3e157 100644 --- a/src/net/sourceforge/plantuml/wbs/ITFComposed.java +++ b/src/net/sourceforge/plantuml/wbs/ITFComposed.java @@ -42,12 +42,12 @@ import java.util.List; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.utils.Direction; class ITFComposed extends WBSTextBlock implements ITF { diff --git a/src/net/sourceforge/plantuml/wbs/ITFLeaf.java b/src/net/sourceforge/plantuml/wbs/ITFLeaf.java index 372bbf3aa..d997a9df5 100644 --- a/src/net/sourceforge/plantuml/wbs/ITFLeaf.java +++ b/src/net/sourceforge/plantuml/wbs/ITFLeaf.java @@ -42,14 +42,14 @@ import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.mindmap.IdeaShape; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; class ITFLeaf extends AbstractTextBlock implements ITF { diff --git a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java index 616f3f746..62e9053be 100644 --- a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java +++ b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java @@ -48,19 +48,22 @@ import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.command.regex.Matcher2; -import net.sourceforge.plantuml.command.regex.MyPattern; -import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.mindmap.IdeaShape; +import net.sourceforge.plantuml.regex.Matcher2; +import net.sourceforge.plantuml.regex.MyPattern; +import net.sourceforge.plantuml.regex.Pattern2; import net.sourceforge.plantuml.style.NoStyleAvailableException; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -68,10 +71,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.TextBlockBackcolored; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; public class WBSDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/wbs/WBSLink.java b/src/net/sourceforge/plantuml/wbs/WBSLink.java index dcdd71079..bf5824b7d 100644 --- a/src/net/sourceforge/plantuml/wbs/WBSLink.java +++ b/src/net/sourceforge/plantuml/wbs/WBSLink.java @@ -40,10 +40,10 @@ import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.UDrawable; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.svek.extremity.ExtremityArrow; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; class WBSLink implements UDrawable { diff --git a/src/net/sourceforge/plantuml/wbs/WBSTextBlock.java b/src/net/sourceforge/plantuml/wbs/WBSTextBlock.java index 36f434b7a..f0e7ccd2b 100644 --- a/src/net/sourceforge/plantuml/wbs/WBSTextBlock.java +++ b/src/net/sourceforge/plantuml/wbs/WBSTextBlock.java @@ -43,14 +43,14 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.mindmap.IdeaShape; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UTranslate; abstract class WBSTextBlock extends AbstractTextBlock { diff --git a/src/net/sourceforge/plantuml/wbs/WElement.java b/src/net/sourceforge/plantuml/wbs/WElement.java index cffeb24f4..ae4566b56 100644 --- a/src/net/sourceforge/plantuml/wbs/WElement.java +++ b/src/net/sourceforge/plantuml/wbs/WElement.java @@ -44,16 +44,16 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamColors; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.mindmap.IdeaShape; import net.sourceforge.plantuml.style.MergeStrategy; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; final public class WElement { diff --git a/src/net/sourceforge/plantuml/wire/Block.java b/src/net/sourceforge/plantuml/wire/Block.java index 60d05e2f5..1c018b99a 100644 --- a/src/net/sourceforge/plantuml/wire/Block.java +++ b/src/net/sourceforge/plantuml/wire/Block.java @@ -41,25 +41,26 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.AbstractTextBlock; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.MinMax; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.FontParam; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; public class Block extends AbstractTextBlock { + // ::remove folder when WASM static class Pos { final double x; diff --git a/src/net/sourceforge/plantuml/wire/CommandComponent.java b/src/net/sourceforge/plantuml/wire/CommandComponent.java index 6ab228351..0f395a89b 100644 --- a/src/net/sourceforge/plantuml/wire/CommandComponent.java +++ b/src/net/sourceforge/plantuml/wire/CommandComponent.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandComponent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandGoto.java b/src/net/sourceforge/plantuml/wire/CommandGoto.java index 2e1576706..6761305a3 100644 --- a/src/net/sourceforge/plantuml/wire/CommandGoto.java +++ b/src/net/sourceforge/plantuml/wire/CommandGoto.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandGoto extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandMove.java b/src/net/sourceforge/plantuml/wire/CommandMove.java index 496cc4a0c..c8c687c87 100644 --- a/src/net/sourceforge/plantuml/wire/CommandMove.java +++ b/src/net/sourceforge/plantuml/wire/CommandMove.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandMove extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandNewColumn.java b/src/net/sourceforge/plantuml/wire/CommandNewColumn.java index 9dc88178b..04c741b3b 100644 --- a/src/net/sourceforge/plantuml/wire/CommandNewColumn.java +++ b/src/net/sourceforge/plantuml/wire/CommandNewColumn.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewColumn extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandPrint.java b/src/net/sourceforge/plantuml/wire/CommandPrint.java index e9e2b4a0c..19cde13b3 100644 --- a/src/net/sourceforge/plantuml/wire/CommandPrint.java +++ b/src/net/sourceforge/plantuml/wire/CommandPrint.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrint extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandSpot.java b/src/net/sourceforge/plantuml/wire/CommandSpot.java index 99f955d77..bc41954b5 100644 --- a/src/net/sourceforge/plantuml/wire/CommandSpot.java +++ b/src/net/sourceforge/plantuml/wire/CommandSpot.java @@ -37,14 +37,14 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandSpot extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/CommandWLink.java b/src/net/sourceforge/plantuml/wire/CommandWLink.java index 8edc5d11e..d4f9cd1ca 100644 --- a/src/net/sourceforge/plantuml/wire/CommandWLink.java +++ b/src/net/sourceforge/plantuml/wire/CommandWLink.java @@ -37,15 +37,15 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.command.regex.IRegex; -import net.sourceforge.plantuml.command.regex.RegexConcat; -import net.sourceforge.plantuml.command.regex.RegexLeaf; -import net.sourceforge.plantuml.command.regex.RegexOptional; -import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.ugraphic.color.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColorSet; -import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/wire/Spot.java b/src/net/sourceforge/plantuml/wire/Spot.java index 97b654652..22b091399 100644 --- a/src/net/sourceforge/plantuml/wire/Spot.java +++ b/src/net/sourceforge/plantuml/wire/Spot.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.wire; +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.ugraphic.UEllipse; 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.HColors; public class Spot { diff --git a/src/net/sourceforge/plantuml/wire/WBlock.java b/src/net/sourceforge/plantuml/wire/WBlock.java index 573a12b87..587b0cb67 100644 --- a/src/net/sourceforge/plantuml/wire/WBlock.java +++ b/src/net/sourceforge/plantuml/wire/WBlock.java @@ -44,16 +44,16 @@ import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColors; public class WBlock { diff --git a/src/net/sourceforge/plantuml/wire/WCursor.java b/src/net/sourceforge/plantuml/wire/WCursor.java index 930c19845..0cb0d47a5 100644 --- a/src/net/sourceforge/plantuml/wire/WCursor.java +++ b/src/net/sourceforge/plantuml/wire/WCursor.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.klimt.UTranslate; public class WCursor { diff --git a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java index e2320d241..2f9e0f3c6 100644 --- a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java +++ b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java @@ -38,17 +38,17 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.URectangle; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.ULine; -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.HColors; public class WLinkHorizontal { diff --git a/src/net/sourceforge/plantuml/wire/WLinkVertical.java b/src/net/sourceforge/plantuml/wire/WLinkVertical.java index e39f1cbea..c7150af51 100644 --- a/src/net/sourceforge/plantuml/wire/WLinkVertical.java +++ b/src/net/sourceforge/plantuml/wire/WLinkVertical.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.ULine; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColor; -import net.sourceforge.plantuml.ugraphic.color.HColors; public class WLinkVertical { diff --git a/src/net/sourceforge/plantuml/wire/WPrint.java b/src/net/sourceforge/plantuml/wire/WPrint.java index bfab6d401..ee6c1baca 100644 --- a/src/net/sourceforge/plantuml/wire/WPrint.java +++ b/src/net/sourceforge/plantuml/wire/WPrint.java @@ -37,16 +37,16 @@ package net.sourceforge.plantuml.wire; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.UChange; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.klimt.UChange; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; 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.HColors; public class WPrint { diff --git a/src/net/sourceforge/plantuml/wire/WireDiagram.java b/src/net/sourceforge/plantuml/wire/WireDiagram.java index f1c8e7319..40e8552f3 100644 --- a/src/net/sourceforge/plantuml/wire/WireDiagram.java +++ b/src/net/sourceforge/plantuml/wire/WireDiagram.java @@ -52,12 +52,12 @@ import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.InnerStrategy; -import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.MinMax; import net.sourceforge.plantuml.svek.TextBlockBackcolored; -import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.ugraphic.color.HColor; public class WireDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java b/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java index b5bdb55fb..e2d0fc156 100644 --- a/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java +++ b/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java @@ -53,7 +53,6 @@ import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; -import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.baraye.EntityImp; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.cucadiagram.Display; @@ -61,6 +60,7 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.statediagram.StateDiagram; +import net.sourceforge.plantuml.text.Guillemet; import net.sourceforge.plantuml.xml.XmlFactories; public class ScxmlStateDiagramStandard { diff --git a/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java b/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java index 0f52196bd..c95dbb590 100644 --- a/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java +++ b/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java @@ -47,11 +47,11 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.jsondiagram.JsonDiagram; import net.sourceforge.plantuml.jsondiagram.StyleExtractor; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.style.parser.StyleParsingException; diff --git a/test/net/sourceforge/plantuml/SkinParamTest.java b/test/net/sourceforge/plantuml/SkinParamTest.java index 92e00e22a..950a1824d 100644 --- a/test/net/sourceforge/plantuml/SkinParamTest.java +++ b/test/net/sourceforge/plantuml/SkinParamTest.java @@ -9,18 +9,19 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.EnumSource; -import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotSplines; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.color.ColorMapper; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.Rankdir; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.skin.Padder; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svg.LengthAdjust; -import net.sourceforge.plantuml.ugraphic.color.ColorMapper; -import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.text.Guillemet; class SkinParamTest { diff --git a/test/net/sourceforge/plantuml/UrlBuilderTest.java b/test/net/sourceforge/plantuml/UrlBuilderTest.java index bcf3a2bbd..fd2c076da 100644 --- a/test/net/sourceforge/plantuml/UrlBuilderTest.java +++ b/test/net/sourceforge/plantuml/UrlBuilderTest.java @@ -4,7 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import net.sourceforge.plantuml.UrlMode; +import net.sourceforge.plantuml.url.Url; +import net.sourceforge.plantuml.url.UrlBuilder; +import net.sourceforge.plantuml.url.UrlMode; class UrlBuilderTest { diff --git a/test/net/sourceforge/plantuml/graphic/color/ColorHSBTest.java b/test/net/sourceforge/plantuml/graphic/color/ColorHSBTest.java index b1d4e8140..9f654fdf7 100644 --- a/test/net/sourceforge/plantuml/graphic/color/ColorHSBTest.java +++ b/test/net/sourceforge/plantuml/graphic/color/ColorHSBTest.java @@ -6,6 +6,8 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import net.sourceforge.plantuml.klimt.color.ColorHSB; + class ColorHSBTest { @ParameterizedTest diff --git a/test/net/sourceforge/plantuml/test/ImageTestUtils.java b/test/net/sourceforge/plantuml/test/ImageTestUtils.java index 619afb270..cd989f3a7 100644 --- a/test/net/sourceforge/plantuml/test/ImageTestUtils.java +++ b/test/net/sourceforge/plantuml/test/ImageTestUtils.java @@ -7,7 +7,7 @@ import java.util.Comparator; import org.opentest4j.AssertionFailedError; -import net.sourceforge.plantuml.graphic.color.ColorHSB; +import net.sourceforge.plantuml.klimt.color.ColorHSB; // Beware there is also https://github.com/assertj/assertj-swing which has some image comparisons that might help us. // It does not compare using HSB, so we have built that ourselves. diff --git a/test/net/sourceforge/plantuml/ugraphic/ImageBuilderTest.java b/test/net/sourceforge/plantuml/ugraphic/ImageBuilderTest.java index df4832400..d7455916f 100644 --- a/test/net/sourceforge/plantuml/ugraphic/ImageBuilderTest.java +++ b/test/net/sourceforge/plantuml/ugraphic/ImageBuilderTest.java @@ -4,7 +4,7 @@ import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.creole.legacy.PSystemCreole; -import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.wbs.WBSDiagram; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource;