From 58469686e6e38312e18e29d86f7523b5f9f9d70f Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sat, 17 Dec 2022 12:10:05 +0100 Subject: [PATCH] Revert StringUtils to original package --- src/net/sourceforge/plantuml/BackSlash.java | 2 -- src/net/sourceforge/plantuml/BlockUml.java | 1 - src/net/sourceforge/plantuml/EmbeddedDiagram.java | 1 - src/net/sourceforge/plantuml/FileFormat.java | 1 - src/net/sourceforge/plantuml/Option.java | 1 - src/net/sourceforge/plantuml/PaddingParam.java | 2 -- src/net/sourceforge/plantuml/Run.java | 1 - src/net/sourceforge/plantuml/SkinParam.java | 1 - src/net/sourceforge/plantuml/{utils => }/StringUtils.java | 4 +++- src/net/sourceforge/plantuml/TitledDiagram.java | 1 - src/net/sourceforge/plantuml/Url.java | 1 - .../plantuml/activitydiagram/command/CommandIf.java | 2 +- .../plantuml/activitydiagram/command/CommandLinkActivity.java | 2 +- .../activitydiagram/command/CommandLinkLongActivity.java | 2 +- .../plantuml/activitydiagram/command/CommandPartition.java | 2 +- .../plantuml/activitydiagram3/command/CommandPartition3.java | 2 +- .../command/CommandRepeatWhile3Multilines.java | 2 +- src/net/sourceforge/plantuml/anim/AffineTransformation.java | 2 +- src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java | 2 +- src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java | 2 +- src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java | 2 +- src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java | 2 +- .../sourceforge/plantuml/asciiart/ComponentTextDivider.java | 2 +- .../plantuml/asciiart/ComponentTextGroupingHeader.java | 2 +- src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java | 2 +- .../plantuml/asciiart/ComponentTextParticipant.java | 2 +- .../sourceforge/plantuml/asciiart/ComponentTextReference.java | 2 +- .../sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java | 2 +- src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java | 2 +- src/net/sourceforge/plantuml/baraye/EntityImp.java | 2 +- .../plantuml/classdiagram/command/CommandCreateClass.java | 2 +- .../classdiagram/command/CommandCreateClassMultilines.java | 2 +- .../classdiagram/command/CommandCreateElementFull2.java | 2 +- .../classdiagram/command/CommandHideShowByGender.java | 2 +- .../classdiagram/command/CommandHideShowByVisibility.java | 2 +- .../plantuml/classdiagram/command/CommandLinkClass.java | 2 +- .../plantuml/classdiagram/command/CommandLinkClass2.java | 2 +- .../plantuml/classdiagram/command/CommandLinkLollipop.java | 2 +- .../sourceforge/plantuml/code/ArobaseStringCompressor.java | 2 +- .../sourceforge/plantuml/code/ArobaseStringCompressor2.java | 2 +- .../sourceforge/plantuml/command/CommandFactorySprite.java | 2 +- src/net/sourceforge/plantuml/command/CommandPackage.java | 2 +- src/net/sourceforge/plantuml/command/CommandPackageEmpty.java | 2 +- src/net/sourceforge/plantuml/command/CommandPragma.java | 2 +- src/net/sourceforge/plantuml/command/CommandRankDir.java | 2 +- .../plantuml/command/CommandSkinParamMultilines.java | 2 +- .../plantuml/command/note/CommandFactoryNoteActivity.java | 2 +- .../plantuml/command/note/CommandFactoryNoteOnEntity.java | 2 +- .../plantuml/command/note/CommandFactoryNoteOnLink.java | 2 +- .../plantuml/command/note/CommandFactoryTipOnEntity.java | 2 +- .../command/note/sequence/FactorySequenceNoteCommand.java | 2 +- .../note/sequence/FactorySequenceNoteOnArrowCommand.java | 2 +- .../note/sequence/FactorySequenceNoteOverSeveralCommand.java | 2 +- src/net/sourceforge/plantuml/core/UmlSource.java | 2 +- .../sourceforge/plantuml/creole/command/CommandCreoleImg.java | 2 +- src/net/sourceforge/plantuml/creole/legacy/AtomText.java | 2 +- src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java | 2 +- .../plantuml/creole/legacy/CreoleStripeSimpleParser.java | 2 +- .../plantuml/cucadiagram/BodierLikeClassOrObject.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java | 2 +- .../plantuml/cucadiagram/BodyEnhancedAbstract.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/CodeImpl.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/Ident.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/LeafType.java | 2 +- src/net/sourceforge/plantuml/cucadiagram/Member.java | 2 +- .../sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java | 2 +- .../plantuml/cucadiagram/StereotypeDecoration.java | 2 +- .../plantuml/cucadiagram/dot/AbstractGraphviz.java | 2 +- .../plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java | 2 +- .../sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java | 2 +- .../plantuml/cucadiagram/dot/GraphvizVersionFinder.java | 2 +- .../plantuml/cucadiagram/dot/GraphvizWindowsOld.java | 2 +- .../sourceforge/plantuml/descdiagram/DescriptionDiagram.java | 2 +- .../plantuml/descdiagram/command/CommandArchimate.java | 2 +- .../descdiagram/command/CommandArchimateMultilines.java | 2 +- .../descdiagram/command/CommandCreateElementFull.java | 2 +- .../descdiagram/command/CommandCreateElementMultilines.java | 2 +- .../descdiagram/command/CommandCreateElementParenthesis.java | 2 +- .../plantuml/descdiagram/command/CommandLinkElement.java | 2 +- .../descdiagram/command/CommandPackageWithUSymbol.java | 2 +- src/net/sourceforge/plantuml/descdiagram/command/Labels.java | 2 +- .../plantuml/descdiagram/command/StringWithArrow.java | 2 +- src/net/sourceforge/plantuml/directdot/PSystemDot.java | 2 +- src/net/sourceforge/plantuml/eggs/EggUtils.java | 2 +- src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java | 2 +- .../sourceforge/plantuml/emoji/PSystemListEmojiFactory.java | 2 +- .../sourceforge/plantuml/font/PSystemListFontsFactory.java | 2 +- src/net/sourceforge/plantuml/ftp/FtpLoop.java | 2 +- src/net/sourceforge/plantuml/golem/TileGeometry.java | 2 +- src/net/sourceforge/plantuml/graphic/FontFamilyChange.java | 2 +- src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java | 2 +- src/net/sourceforge/plantuml/graphic/Img.java | 2 +- src/net/sourceforge/plantuml/graphic/Splitter.java | 2 +- src/net/sourceforge/plantuml/graphic/SpriteCommand.java | 2 +- src/net/sourceforge/plantuml/graphic/SvgAttributes.java | 2 +- src/net/sourceforge/plantuml/graphic/USymbols.java | 2 +- src/net/sourceforge/plantuml/graphic/color/Colors.java | 2 +- src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java | 2 +- src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java | 2 +- src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java | 2 +- src/net/sourceforge/plantuml/math/PSystemLatex.java | 2 +- src/net/sourceforge/plantuml/math/PSystemMath.java | 2 +- .../plantuml/mindmap/CommandMindMapOrgmodeMultiline.java | 2 +- .../plantuml/openiconic/PSystemListOpenIconicFactory.java | 2 +- .../plantuml/openiconic/PSystemOpenIconicFactory.java | 2 +- src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java | 2 +- src/net/sourceforge/plantuml/oregon/OregonBasicGame.java | 2 +- src/net/sourceforge/plantuml/oregon/PSystemOregon.java | 2 +- src/net/sourceforge/plantuml/picoweb/PicoWebServer.java | 2 +- src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java | 2 +- .../sourceforge/plantuml/preproc2/ReadFilterMergeLines.java | 2 +- src/net/sourceforge/plantuml/project/time/DayOfWeek.java | 2 +- src/net/sourceforge/plantuml/project/time/Month.java | 2 +- src/net/sourceforge/plantuml/salt/CommandAnything.java | 2 +- src/net/sourceforge/plantuml/salt/DataSourceImpl.java | 2 +- src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java | 2 +- .../plantuml/salt/element/AbstractElementText.java | 2 +- src/net/sourceforge/plantuml/salt/element/ElementTree.java | 2 +- .../plantuml/salt/factory/ElementFactoryCheckboxOff.java | 2 +- .../plantuml/salt/factory/ElementFactoryCheckboxOn.java | 2 +- .../plantuml/salt/factory/ElementFactoryPyramid.java | 2 +- .../plantuml/salt/factory/ElementFactoryRadioOff.java | 2 +- .../plantuml/salt/factory/ElementFactoryRadioOn.java | 2 +- .../sourceforge/plantuml/salt/factory/ElementFactoryText.java | 2 +- .../plantuml/sdot/CucaDiagramFileMakerSmetana.java | 2 +- src/net/sourceforge/plantuml/security/SURL.java | 2 +- src/net/sourceforge/plantuml/security/SecurityUtils.java | 2 +- .../plantuml/security/authentication/SecurityCredentials.java | 2 +- .../authentication/basicauth/BasicAuthAccessInterceptor.java | 2 +- .../authentication/oauth/OAuth2AccessInterceptor.java | 2 +- .../oauth/OAuth2ClientAccessAuthorizeManager.java | 2 +- .../oauth/OAuth2ResourceOwnerAccessAuthorizeManager.java | 2 +- .../sourceforge/plantuml/sequencediagram/NotePosition.java | 2 +- src/net/sourceforge/plantuml/sequencediagram/NoteType.java | 2 +- .../plantuml/sequencediagram/command/CommandActivate.java | 2 +- .../plantuml/sequencediagram/command/CommandArrow.java | 2 +- .../sequencediagram/command/CommandAutonumberIncrement.java | 2 +- .../plantuml/sequencediagram/command/CommandExoArrowAny.java | 2 +- .../plantuml/sequencediagram/command/CommandGrouping.java | 2 +- .../plantuml/sequencediagram/command/CommandHSpace.java | 2 +- .../plantuml/sequencediagram/command/CommandParticipant.java | 2 +- .../command/CommandReferenceMultilinesOverSeveral.java | 2 +- .../sequencediagram/command/CommandReferenceOverSeveral.java | 2 +- .../sequencediagram/graphic/SequenceDiagramTxtMaker.java | 2 +- src/net/sourceforge/plantuml/skin/VisibilityModifier.java | 2 +- .../plantuml/sprite/PSystemListInternalSpritesFactory.java | 2 +- src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java | 2 +- .../plantuml/statediagram/command/CommandLinkStateCommon.java | 2 +- src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java | 2 +- src/net/sourceforge/plantuml/sudoku/SudokuDLX.java | 2 +- src/net/sourceforge/plantuml/svek/ClusterDotString.java | 2 +- src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java | 2 +- src/net/sourceforge/plantuml/svek/DotStringFactory.java | 2 +- src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java | 2 +- src/net/sourceforge/plantuml/svek/GraphvizCrash.java | 2 +- src/net/sourceforge/plantuml/svek/SvekLine.java | 2 +- src/net/sourceforge/plantuml/svek/SvekNode.java | 2 +- src/net/sourceforge/plantuml/svek/SvgResult.java | 2 +- src/net/sourceforge/plantuml/svg/SvgData.java | 2 +- src/net/sourceforge/plantuml/text/RichText.java | 2 +- src/net/sourceforge/plantuml/text/StyledString.java | 2 +- src/net/sourceforge/plantuml/ugraphic/UFont.java | 2 +- src/net/sourceforge/plantuml/ugraphic/color/HColor.java | 2 +- src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java | 2 +- src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java | 2 +- .../plantuml/ugraphic/debug/StringBounderDebug.java | 2 +- src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java | 2 +- .../sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java | 2 +- src/net/sourceforge/plantuml/utils/StartUtils.java | 1 + src/net/sourceforge/plantuml/utils/StringLocated.java | 1 + src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java | 2 +- src/net/sourceforge/plantuml/yaml/SimpleYamlParser.java | 2 +- test/net/sourceforge/plantuml/SkinParamTest.java | 1 - test/net/sourceforge/plantuml/StringUtilsTest.java | 2 -- 175 files changed, 165 insertions(+), 176 deletions(-) rename src/net/sourceforge/plantuml/{utils => }/StringUtils.java (99%) diff --git a/src/net/sourceforge/plantuml/BackSlash.java b/src/net/sourceforge/plantuml/BackSlash.java index feda63fa6..36c2bcf13 100644 --- a/src/net/sourceforge/plantuml/BackSlash.java +++ b/src/net/sourceforge/plantuml/BackSlash.java @@ -40,8 +40,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.utils.StringUtils; - public class BackSlash { public static final String BS_BS_N = "\\n"; diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java index 6bc093f86..f07de7c42 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -62,7 +62,6 @@ 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.utils.StringUtils; import net.sourceforge.plantuml.version.Version; public class BlockUml { diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index ee626f14c..6789d8dc8 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -61,7 +61,6 @@ import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index e19bff00e..84167ff51 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -54,7 +54,6 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.svg.SvgGraphics; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.debug.StringBounderDebug; -import net.sourceforge.plantuml.utils.StringUtils; /** * Format for output files generated by PlantUML. diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 35f19d9ec..f23f0726f 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -57,7 +57,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; @HaxeIgnored public class Option { diff --git a/src/net/sourceforge/plantuml/PaddingParam.java b/src/net/sourceforge/plantuml/PaddingParam.java index d524465bb..b9612d8ba 100644 --- a/src/net/sourceforge/plantuml/PaddingParam.java +++ b/src/net/sourceforge/plantuml/PaddingParam.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml; -import net.sourceforge.plantuml.utils.StringUtils; - public enum PaddingParam { PARTICIPANT, BOX; diff --git a/src/net/sourceforge/plantuml/Run.java b/src/net/sourceforge/plantuml/Run.java index 98a69a411..e6d65c199 100644 --- a/src/net/sourceforge/plantuml/Run.java +++ b/src/net/sourceforge/plantuml/Run.java @@ -72,7 +72,6 @@ import net.sourceforge.plantuml.swing.MainWindow; import net.sourceforge.plantuml.syntax.LanguageDescriptor; import net.sourceforge.plantuml.utils.Cypher; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.version.Version; public class Run { diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java index 3d5f45af1..430308e81 100644 --- a/src/net/sourceforge/plantuml/SkinParam.java +++ b/src/net/sourceforge/plantuml/SkinParam.java @@ -92,7 +92,6 @@ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; public class SkinParam implements ISkinParam { diff --git a/src/net/sourceforge/plantuml/utils/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java similarity index 99% rename from src/net/sourceforge/plantuml/utils/StringUtils.java rename to src/net/sourceforge/plantuml/StringUtils.java index 6af5b1b86..e6a4c912d 100644 --- a/src/net/sourceforge/plantuml/utils/StringUtils.java +++ b/src/net/sourceforge/plantuml/StringUtils.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.utils; +package net.sourceforge.plantuml; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +47,8 @@ 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.utils.Direction; +import net.sourceforge.plantuml.utils.Log; // Do not move public class StringUtils { diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index 76ac09d09..377d32f5a 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -64,7 +64,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public abstract class TitledDiagram extends AbstractPSystem implements Diagram, Annotated { diff --git a/src/net/sourceforge/plantuml/Url.java b/src/net/sourceforge/plantuml/Url.java index 720e4c76c..399c698ad 100644 --- a/src/net/sourceforge/plantuml/Url.java +++ b/src/net/sourceforge/plantuml/Url.java @@ -39,7 +39,6 @@ import java.util.Comparator; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.cucadiagram.dot.DotMaker2; -import net.sourceforge.plantuml.utils.StringUtils; public class Url implements EnsureVisible { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java index 96eacfa7c..54dfe55de 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandIf extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java index 11b5bdd03..f57d3cb11 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java @@ -35,6 +35,7 @@ */ 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; @@ -68,7 +69,6 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandLinkActivity extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java index bcd0dca5d..51ff9a273 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java @@ -38,6 +38,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; @@ -72,7 +73,6 @@ import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; 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 53bb993cc..de0377430 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.IGroup; @@ -56,7 +57,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPartition extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index e2ba357b6..7ca4d2110 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileGroup; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -56,7 +57,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPartition3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java index eb69565a5..945b25301 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.command; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines3; @@ -50,7 +51,6 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandRepeatWhile3Multilines extends CommandMultilines3 { diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index fd2c1f6cc..1aca82064 100644 --- a/src/net/sourceforge/plantuml/anim/AffineTransformation.java +++ b/src/net/sourceforge/plantuml/anim/AffineTransformation.java @@ -41,10 +41,10 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; 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.utils.StringUtils; public class AffineTransformation { diff --git a/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java b/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java index 69e15008e..77eac2634 100644 --- a/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java +++ b/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class BasicCharAreaImpl implements BasicCharArea { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java index 82f85acad..6bc30be22 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextActor extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java index 20b294240..6578cf3c7 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java @@ -39,6 +39,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.FileFormat; +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; @@ -52,7 +53,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextArrow extends AbstractComponentText implements ArrowComponent { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java index 2d7e24ca8..bdda659f3 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextDelay extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java index d57a7b9c9..3b0e40517 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextDivider extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java index 76c8f6a85..466bf43d1 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextGroupingHeader extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java index f9d0d13dd..123efbc8f 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextNote extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java index e119f0745..8b9bddc16 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextParticipant extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java index 33d106d5e..774cfcbd5 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; 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; @@ -43,7 +44,6 @@ import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextReference extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java index 4fbfb9249..6a6aa8c06 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.asciiart; import net.sourceforge.plantuml.FileFormat; +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; @@ -47,7 +48,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextSelfArrow extends AbstractComponentText implements ArrowComponent { diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java index 014808c22..82d4bba01 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java @@ -35,6 +35,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; @@ -43,7 +44,6 @@ import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public class ComponentTextShape extends AbstractComponentText { diff --git a/src/net/sourceforge/plantuml/baraye/EntityImp.java b/src/net/sourceforge/plantuml/baraye/EntityImp.java index aa59799fb..62de8c18f 100644 --- a/src/net/sourceforge/plantuml/baraye/EntityImp.java +++ b/src/net/sourceforge/plantuml/baraye/EntityImp.java @@ -51,6 +51,7 @@ import java.util.Set; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Bodier; @@ -88,7 +89,6 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; final public class EntityImp implements ILeaf, IGroup { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index 80ea4f1e0..84cc3828e 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -36,6 +36,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; @@ -64,7 +65,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; 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 d40189b03..4a342f277 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -36,6 +36,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; @@ -73,7 +74,6 @@ import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; 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 56afa868f..bfa30e3a0 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -37,6 +37,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; @@ -62,7 +63,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandCreateElementFull2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java index ef9369c4f..e1874ac91 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.classdiagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.baraye.IEntity; @@ -55,7 +56,6 @@ import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandHideShowByGender extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java index 54351f733..b9e8aafdf 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java @@ -39,6 +39,7 @@ import java.util.EnumSet; import java.util.Set; import java.util.StringTokenizer; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -50,7 +51,6 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.EntityPortion; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandHideShowByVisibility extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java index a47e18db7..0db5aee44 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java @@ -36,6 +36,7 @@ */ 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; @@ -63,7 +64,6 @@ import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; final public class CommandLinkClass extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass2.java index 2af30493b..db9fc9f8a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass2.java @@ -36,6 +36,7 @@ */ 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; @@ -63,7 +64,6 @@ import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; final public class CommandLinkClass2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java index 14a64b361..14a53f3b5 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.classdiagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -57,7 +58,6 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; final public class CommandLinkLollipop extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java index a324b46be..9d037f64a 100644 --- a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java +++ b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.code; 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; @@ -45,7 +46,6 @@ 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.utils.StringUtils; public class ArobaseStringCompressor implements StringCompressor { diff --git a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor2.java b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor2.java index 7df82ba8b..9334bf9f2 100644 --- a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor2.java +++ b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.code; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class ArobaseStringCompressor2 implements StringCompressor { diff --git a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java index 314a335d2..530a7d35b 100644 --- a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java +++ b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.command; import java.util.Arrays; 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; @@ -50,7 +51,6 @@ import net.sourceforge.plantuml.sprite.SpriteColorBuilder4096; import net.sourceforge.plantuml.sprite.SpriteGrayLevel; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactorySprite implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index 8d29bc7db..b2ad39674 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -35,6 +35,7 @@ */ 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; @@ -63,7 +64,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPackage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java index 4205ccee2..a33023131 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.IGroup; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -51,7 +52,6 @@ import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPackageEmpty extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPragma.java b/src/net/sourceforge/plantuml/command/CommandPragma.java index 882987cb1..6b5d28869 100644 --- a/src/net/sourceforge/plantuml/command/CommandPragma.java +++ b/src/net/sourceforge/plantuml/command/CommandPragma.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.command; 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; @@ -45,7 +46,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPragma extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandRankDir.java b/src/net/sourceforge/plantuml/command/CommandRankDir.java index 72ec58c40..aa48a0275 100644 --- a/src/net/sourceforge/plantuml/command/CommandRankDir.java +++ b/src/net/sourceforge/plantuml/command/CommandRankDir.java @@ -35,6 +35,7 @@ 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; @@ -42,7 +43,6 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Rankdir; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandRankDir extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java index 404acbc88..5e9f6cf94 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java @@ -35,11 +35,11 @@ */ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandSkinParamMultilines extends CommandMultilinesBracket { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java index 14b4d7d01..86bb1a6f9 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java @@ -35,6 +35,7 @@ */ 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; @@ -64,7 +65,6 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryNoteActivity implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java index 5597a7401..5c0e216c6 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java @@ -36,6 +36,7 @@ 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; @@ -69,7 +70,6 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java index 8c75a4a34..047bb4d44 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java @@ -35,6 +35,7 @@ */ 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; @@ -58,7 +59,6 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryNoteOnLink implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java index 77897db41..08f709e57 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java @@ -36,6 +36,7 @@ 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; @@ -65,7 +66,6 @@ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryTipOnEntity implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java index 37d866fbc..ef4bda7e0 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java @@ -36,6 +36,7 @@ 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; @@ -63,7 +64,6 @@ import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteCommand implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java index c74916be3..c68d98707 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java @@ -36,6 +36,7 @@ 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; @@ -66,7 +67,6 @@ import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java index 1d55f7c9a..b72d232cd 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java @@ -36,6 +36,7 @@ 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; @@ -62,7 +63,6 @@ import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/core/UmlSource.java b/src/net/sourceforge/plantuml/core/UmlSource.java index f638ede71..28d6714e1 100755 --- a/src/net/sourceforge/plantuml/core/UmlSource.java +++ b/src/net/sourceforge/plantuml/core/UmlSource.java @@ -41,6 +41,7 @@ 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; @@ -48,7 +49,6 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.version.IteratorCounter2; import net.sourceforge.plantuml.version.IteratorCounter2Impl; diff --git a/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java index d286ecb16..8ce18fd89 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleImg.java @@ -35,13 +35,13 @@ */ 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.utils.StringUtils; public class CommandCreoleImg implements Command { diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java index 8178070f5..5e15356d6 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java @@ -40,6 +40,7 @@ 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; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.CharHidder; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; public final class AtomText extends AbstractAtom implements Atom { diff --git a/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java b/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java index 8f40c9b3a..500b4ae2e 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java @@ -45,6 +45,7 @@ import java.util.Objects; 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; import net.sourceforge.plantuml.creole.CreoleMode; import net.sourceforge.plantuml.creole.Parser; @@ -59,7 +60,6 @@ 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.utils.StringUtils; 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 0bf1ca8ed..27866a4fb 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java @@ -39,6 +39,7 @@ import java.util.Objects; import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.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; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.creole.StripeStyle; import net.sourceforge.plantuml.creole.StripeStyleType; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.utils.CharHidder; -import net.sourceforge.plantuml.utils.StringUtils; public class CreoleStripeSimpleParser { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java b/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java index 3c1d1fc47..4123872e9 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java @@ -42,6 +42,7 @@ import java.util.Objects; import java.util.Set; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.creole.Parser; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.utils.StringUtils; public class BodierLikeClassOrObject implements Bodier { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java index d7a4d7552..6a9f10156 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java @@ -43,6 +43,7 @@ import java.util.regex.Matcher; 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.ILeaf; @@ -60,7 +61,6 @@ 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.utils.StringUtils; 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 9f40e75e8..415f82e37 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java @@ -42,6 +42,7 @@ import java.util.List; 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; @@ -50,7 +51,6 @@ import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.TextBlockVertical2; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; -import net.sourceforge.plantuml.utils.StringUtils; public class BodyEnhanced2 extends BodyEnhancedAbstract { diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java index 284808445..823cf0fdb 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.cucadiagram; import net.sourceforge.plantuml.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; @@ -47,7 +48,6 @@ import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.utils.StringUtils; public abstract class BodyEnhancedAbstract extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/cucadiagram/CodeImpl.java b/src/net/sourceforge/plantuml/cucadiagram/CodeImpl.java index 254ed9758..639130f76 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/CodeImpl.java +++ b/src/net/sourceforge/plantuml/cucadiagram/CodeImpl.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.Objects; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.EntityFactory; -import net.sourceforge.plantuml.utils.StringUtils; public class CodeImpl implements Code { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Ident.java b/src/net/sourceforge/plantuml/cucadiagram/Ident.java index 4f9058976..aabd009dd 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Ident.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Ident.java @@ -39,9 +39,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.baraye.EntityFactory; -import net.sourceforge.plantuml.utils.StringUtils; public class Ident implements Code { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java index cd355b4e0..e06986b6e 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java @@ -37,7 +37,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum LeafType { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Member.java b/src/net/sourceforge/plantuml/cucadiagram/Member.java index ca9aa677d..6e1d62d75 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Member.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Member.java @@ -36,6 +36,7 @@ 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; @@ -43,7 +44,6 @@ 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.skin.VisibilityModifier; -import net.sourceforge.plantuml.utils.StringUtils; public class Member implements CharSequence { diff --git a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java index e68174241..c698ae156 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java @@ -44,6 +44,7 @@ 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; @@ -73,7 +74,6 @@ import net.sourceforge.plantuml.ugraphic.ULayoutGroup; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.utils.CharHidder; -import net.sourceforge.plantuml.utils.StringUtils; public class MethodsOrFieldsArea extends AbstractTextBlock implements TextBlock, WithPorts { diff --git a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java index 67bb0e73f..44530cf38 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java +++ b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java @@ -40,6 +40,7 @@ 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; @@ -54,7 +55,6 @@ 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.utils.StringUtils; public class StereotypeDecoration { private final static RegexComposed circleChar = new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java b/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java index 734bf2d89..113d947df 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java @@ -43,10 +43,10 @@ import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.OptionFlags; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; abstract class AbstractGraphviz implements Graphviz { diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java index 31c92c7c9..d048ff770 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java @@ -48,6 +48,7 @@ import java.util.Map; import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormat; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.cucadiagram.Display; @@ -63,7 +64,6 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; -import net.sourceforge.plantuml.utils.StringUtils; public final class CucaDiagramTxtMaker { diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java index b58b9abd0..f5dd1f12c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java @@ -43,12 +43,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.vizjs.GraphvizJs; import net.sourceforge.plantuml.vizjs.VizJsEngine; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java index 703711ca4..c3dfde9b8 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java @@ -39,7 +39,7 @@ import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class GraphvizVersionFinder { diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindowsOld.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindowsOld.java index e8325db93..744282e6d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindowsOld.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindowsOld.java @@ -42,8 +42,8 @@ import java.util.Collections; import java.util.List; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.windowsdot.WindowsDotArchive; class GraphvizWindowsOld extends AbstractGraphviz { diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java index f4cfbb3ee..6b39cceaf 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.descdiagram; import java.util.Map; import java.util.Objects; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -47,7 +48,6 @@ import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; -import net.sourceforge.plantuml.utils.StringUtils; public class DescriptionDiagram extends AbstractEntityDiagram { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java index 352fe65e1..73868364c 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.FontParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -57,7 +58,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; 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 a33b6bdd3..2fa5a232a 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.FontParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -59,7 +60,6 @@ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; 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 b3be2d33d..5cff29983 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -37,6 +37,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; @@ -68,7 +69,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; 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 07b072b74..641e1977f 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java @@ -38,6 +38,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; @@ -63,7 +64,6 @@ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; 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 3be2ed95b..3cbca9b25 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java @@ -36,6 +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; @@ -64,7 +65,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; 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 51e14f188..b216b20c2 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -61,7 +62,6 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandLinkElement extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index 8f304d77d..65bfcf105 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -35,6 +35,7 @@ */ 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; @@ -63,7 +64,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandPackageWithUSymbol extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/Labels.java b/src/net/sourceforge/plantuml/descdiagram/command/Labels.java index 6565e8d92..9a0401fb6 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/Labels.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/Labels.java @@ -35,13 +35,13 @@ */ 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.utils.StringUtils; public class Labels { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java b/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java index c9373f9dc..be88bf7b9 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/StringWithArrow.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.descdiagram.command; 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; @@ -45,7 +46,6 @@ import net.sourceforge.plantuml.graphic.TextBlockArrow2; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.svek.GuideLine; -import net.sourceforge.plantuml.utils.StringUtils; public class StringWithArrow { diff --git a/src/net/sourceforge/plantuml/directdot/PSystemDot.java b/src/net/sourceforge/plantuml/directdot/PSystemDot.java index 6d991460a..af397d91e 100644 --- a/src/net/sourceforge/plantuml/directdot/PSystemDot.java +++ b/src/net/sourceforge/plantuml/directdot/PSystemDot.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.CounterOutputStream; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.FileImageData; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; import net.sourceforge.plantuml.cucadiagram.dot.ProcessState; import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemDot extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/eggs/EggUtils.java b/src/net/sourceforge/plantuml/eggs/EggUtils.java index 75649e112..17af85f52 100644 --- a/src/net/sourceforge/plantuml/eggs/EggUtils.java +++ b/src/net/sourceforge/plantuml/eggs/EggUtils.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.eggs; import java.math.BigInteger; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class EggUtils { diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index 602500fa6..7339e07c8 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -49,6 +49,7 @@ 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; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.api.ImageDataSimple; @@ -132,7 +133,6 @@ 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.StringUtils; /* * Some notes: diff --git a/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java b/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java index a3ab00cb8..a86df093a 100644 --- a/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java +++ b/src/net/sourceforge/plantuml/emoji/PSystemListEmojiFactory.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.emoji; import net.sourceforge.plantuml.AbstractPSystem; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemListEmojiFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java b/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java index 44e0b0078..f448262a5 100644 --- a/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java +++ b/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.font; import net.sourceforge.plantuml.AbstractPSystem; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemListFontsFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/ftp/FtpLoop.java b/src/net/sourceforge/plantuml/ftp/FtpLoop.java index 1dc9c74dd..31be1f01c 100644 --- a/src/net/sourceforge/plantuml/ftp/FtpLoop.java +++ b/src/net/sourceforge/plantuml/ftp/FtpLoop.java @@ -53,9 +53,9 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileUtils; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SecurityUtils; -import net.sourceforge.plantuml.utils.StringUtils; class FtpLoop implements Runnable { enum Mode { diff --git a/src/net/sourceforge/plantuml/golem/TileGeometry.java b/src/net/sourceforge/plantuml/golem/TileGeometry.java index 96435b73d..ee34b047e 100644 --- a/src/net/sourceforge/plantuml/golem/TileGeometry.java +++ b/src/net/sourceforge/plantuml/golem/TileGeometry.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.golem; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum TileGeometry { NORTH, SOUTH, EAST, WEST, CENTER; diff --git a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java index 466017956..6d8b3ed8b 100644 --- a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java +++ b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java @@ -35,10 +35,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.utils.StringUtils; class FontFamilyChange implements FontChange { diff --git a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java b/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java index 2c99abd49..40d8aafe6 100644 --- a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java +++ b/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.utils.StringUtils; public enum HorizontalAlignment { diff --git a/src/net/sourceforge/plantuml/graphic/Img.java b/src/net/sourceforge/plantuml/graphic/Img.java index 8431f34fe..6d2b37570 100644 --- a/src/net/sourceforge/plantuml/graphic/Img.java +++ b/src/net/sourceforge/plantuml/graphic/Img.java @@ -40,13 +40,13 @@ 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.security.SFile; import net.sourceforge.plantuml.security.SURL; -import net.sourceforge.plantuml.utils.StringUtils; public class Img implements HtmlCommand { diff --git a/src/net/sourceforge/plantuml/graphic/Splitter.java b/src/net/sourceforge/plantuml/graphic/Splitter.java index eeda8ea3e..ddf4b0a82 100644 --- a/src/net/sourceforge/plantuml/graphic/Splitter.java +++ b/src/net/sourceforge/plantuml/graphic/Splitter.java @@ -41,12 +41,12 @@ import java.util.Collections; 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.sprite.SpriteUtils; -import net.sourceforge.plantuml.utils.StringUtils; public class Splitter { diff --git a/src/net/sourceforge/plantuml/graphic/SpriteCommand.java b/src/net/sourceforge/plantuml/graphic/SpriteCommand.java index 3afdd2db2..ad3e96988 100644 --- a/src/net/sourceforge/plantuml/graphic/SpriteCommand.java +++ b/src/net/sourceforge/plantuml/graphic/SpriteCommand.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class SpriteCommand implements HtmlCommand { diff --git a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java index c374cd5da..b077fc321 100644 --- a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java +++ b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java @@ -39,10 +39,10 @@ import java.util.Collections; 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.utils.StringUtils; public class SvgAttributes { diff --git a/src/net/sourceforge/plantuml/graphic/USymbols.java b/src/net/sourceforge/plantuml/graphic/USymbols.java index 7939e1a9b..d314e24bf 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbols.java +++ b/src/net/sourceforge/plantuml/graphic/USymbols.java @@ -40,10 +40,10 @@ import java.util.Map; import net.sourceforge.plantuml.ComponentStyle; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.svek.PackageStyle; -import net.sourceforge.plantuml.utils.StringUtils; public abstract class USymbols { diff --git a/src/net/sourceforge/plantuml/graphic/color/Colors.java b/src/net/sourceforge/plantuml/graphic/color/Colors.java index 3e2352c73..54bcc5581 100644 --- a/src/net/sourceforge/plantuml/graphic/color/Colors.java +++ b/src/net/sourceforge/plantuml/graphic/color/Colors.java @@ -43,6 +43,7 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.ISkinParam; 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.ugraphic.UGraphic; @@ -50,7 +51,6 @@ 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.utils.StringUtils; public class Colors { diff --git a/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java b/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java index 1bab25345..3bb4f26f5 100644 --- a/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java +++ b/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java @@ -44,13 +44,13 @@ import java.util.Collections; import java.util.List; import net.sourceforge.plantuml.FileImageData; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.security.SFile; -import net.sourceforge.plantuml.utils.StringUtils; public final class CucaDiagramHtmlMaker { diff --git a/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java b/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java index 5c7b67d02..7028fadd3 100644 --- a/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java +++ b/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.html; import java.io.PrintWriter; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkDecor; -import net.sourceforge.plantuml.utils.StringUtils; public final class LinkHtmlPrinter { diff --git a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java index 7ff6011ad..69367f857 100644 --- a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java +++ b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java @@ -40,6 +40,7 @@ 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; @@ -48,7 +49,6 @@ import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemJcckitFactory extends PSystemBasicFactory { diff --git a/src/net/sourceforge/plantuml/math/PSystemLatex.java b/src/net/sourceforge/plantuml/math/PSystemLatex.java index 4230c7f54..1f5d6d8cc 100644 --- a/src/net/sourceforge/plantuml/math/PSystemLatex.java +++ b/src/net/sourceforge/plantuml/math/PSystemLatex.java @@ -41,6 +41,7 @@ import java.io.OutputStream; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.FileFormatOption; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; @@ -48,7 +49,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemLatex extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/math/PSystemMath.java b/src/net/sourceforge/plantuml/math/PSystemMath.java index b58004e75..6d63b3520 100644 --- a/src/net/sourceforge/plantuml/math/PSystemMath.java +++ b/src/net/sourceforge/plantuml/math/PSystemMath.java @@ -41,6 +41,7 @@ import java.io.OutputStream; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.FileFormatOption; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; @@ -48,7 +49,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemMath extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java index 64bcfe699..4c820f764 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.mindmap; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -50,7 +51,6 @@ 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.utils.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandMindMapOrgmodeMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java index c7ca72b04..4856e46ae 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.openiconic; import net.sourceforge.plantuml.AbstractPSystem; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemListOpenIconicFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java index 55a92aec8..c39bf4c02 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.openiconic; import net.sourceforge.plantuml.AbstractPSystem; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemOpenIconicFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java b/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java index 255ae9173..69e321cad 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.openiconic; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class SvgCommandLetter implements SvgCommand { diff --git a/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java b/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java index ae105f462..e5f5e450d 100644 --- a/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java +++ b/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.oregon; import java.util.Random; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class OregonBasicGame implements BasicGame { diff --git a/src/net/sourceforge/plantuml/oregon/PSystemOregon.java b/src/net/sourceforge/plantuml/oregon/PSystemOregon.java index 096f8a364..c516652cf 100644 --- a/src/net/sourceforge/plantuml/oregon/PSystemOregon.java +++ b/src/net/sourceforge/plantuml/oregon/PSystemOregon.java @@ -43,11 +43,11 @@ import java.util.List; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.PlainDiagram; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.ImageBuilder; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemOregon extends PlainDiagram { diff --git a/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java b/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java index 649afad67..2a936a350 100644 --- a/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java +++ b/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.Option; import net.sourceforge.plantuml.SourceStringReader; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.code.Transcoder; import net.sourceforge.plantuml.code.TranscoderUtil; import net.sourceforge.plantuml.core.Diagram; @@ -73,7 +74,6 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.LineLocationImpl; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.version.Version; public class PicoWebServer implements Runnable { diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index 855fdcd6f..b701f87d8 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -44,6 +44,7 @@ import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineReader; @@ -55,7 +56,6 @@ import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; public class PreprocessorUtils { diff --git a/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java index 85e5e3886..591bd5dbe 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.preproc2; 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.utils.StartUtils; import net.sourceforge.plantuml.utils.StringLocated; -import net.sourceforge.plantuml.utils.StringUtils; public class ReadFilterMergeLines implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/project/time/DayOfWeek.java b/src/net/sourceforge/plantuml/project/time/DayOfWeek.java index 7fc76aa07..ad94b78e5 100644 --- a/src/net/sourceforge/plantuml/project/time/DayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/time/DayOfWeek.java @@ -41,7 +41,7 @@ import java.util.Calendar; import java.util.Locale; import java.util.TimeZone; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum DayOfWeek { diff --git a/src/net/sourceforge/plantuml/project/time/Month.java b/src/net/sourceforge/plantuml/project/time/Month.java index c5731c47e..07b1faa7d 100644 --- a/src/net/sourceforge/plantuml/project/time/Month.java +++ b/src/net/sourceforge/plantuml/project/time/Month.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.project.time; import java.time.format.TextStyle; import java.util.Locale; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum Month { diff --git a/src/net/sourceforge/plantuml/salt/CommandAnything.java b/src/net/sourceforge/plantuml/salt/CommandAnything.java index 6c677932a..928e48215 100644 --- a/src/net/sourceforge/plantuml/salt/CommandAnything.java +++ b/src/net/sourceforge/plantuml/salt/CommandAnything.java @@ -35,6 +35,7 @@ */ 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; @@ -42,7 +43,6 @@ 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.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandAnything extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java index c2b3b6ed8..929321765 100644 --- a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java +++ b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java @@ -39,10 +39,10 @@ import java.util.ArrayList; 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.utils.StringUtils; public class DataSourceImpl implements DataSource { diff --git a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java index e06eb447a..4d8442655 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java @@ -35,10 +35,10 @@ */ package net.sourceforge.plantuml.salt; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemBasicFactory; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemSaltFactory extends PSystemBasicFactory { diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java index 5d06da6cb..bcc7901e0 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.salt.element; import net.sourceforge.plantuml.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; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; -import net.sourceforge.plantuml.utils.StringUtils; abstract class AbstractElementText extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTree.java b/src/net/sourceforge/plantuml/salt/element/ElementTree.java index 71adf9956..8858d3a83 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTree.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTree.java @@ -41,11 +41,11 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.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.ugraphic.UGraphic; -import net.sourceforge.plantuml.utils.StringUtils; public class ElementTree extends AbstractElement { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java index 1130dc5b6..dd7ca804c 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java @@ -39,12 +39,12 @@ import java.util.Arrays; import java.util.List; import net.sourceforge.plantuml.ISkinSimple; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; 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 b3cd5acf8..63d89ba42 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java @@ -39,12 +39,12 @@ import java.util.Arrays; import java.util.List; import net.sourceforge.plantuml.ISkinSimple; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; public class ElementFactoryCheckboxOn implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java index d75bb5b59..ecab7d958 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java @@ -35,6 +35,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.Positionner2; @@ -44,7 +45,6 @@ import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.salt.element.ElementPyramid; import net.sourceforge.plantuml.salt.element.ElementText; import net.sourceforge.plantuml.salt.element.TableStrategy; -import net.sourceforge.plantuml.utils.StringUtils; public class ElementFactoryPyramid extends AbstractElementFactoryComplex { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java index 020741cce..9c0766c06 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java @@ -39,12 +39,12 @@ import java.util.Arrays; import java.util.List; import net.sourceforge.plantuml.ISkinSimple; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; 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 cfc493d55..71c21c990 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java @@ -39,12 +39,12 @@ import java.util.Arrays; import java.util.List; import net.sourceforge.plantuml.ISkinSimple; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; public class ElementFactoryRadioOn implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java index 21503f598..1d642a588 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java @@ -38,12 +38,12 @@ package net.sourceforge.plantuml.salt.factory; import java.util.Arrays; import net.sourceforge.plantuml.ISkinSimple; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; public class ElementFactoryText implements ElementFactory { diff --git a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java index e952df653..6efb21052 100644 --- a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java +++ b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java @@ -64,6 +64,7 @@ import h.ST_boxf; 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; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -100,7 +101,6 @@ 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.StringUtils; import smetana.core.CString; import smetana.core.JUtils; import smetana.core.Macro; diff --git a/src/net/sourceforge/plantuml/security/SURL.java b/src/net/sourceforge/plantuml/security/SURL.java index 3f3692722..a01d5af25 100644 --- a/src/net/sourceforge/plantuml/security/SURL.java +++ b/src/net/sourceforge/plantuml/security/SURL.java @@ -67,11 +67,11 @@ import java.util.regex.Pattern; import javax.net.ssl.HttpsURLConnection; import javax.swing.ImageIcon; +import net.sourceforge.plantuml.StringUtils; 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; -import net.sourceforge.plantuml.utils.StringUtils; /** * Secure replacement for java.net.URL. diff --git a/src/net/sourceforge/plantuml/security/SecurityUtils.java b/src/net/sourceforge/plantuml/security/SecurityUtils.java index f1a3b7068..9ef745f7f 100644 --- a/src/net/sourceforge/plantuml/security/SecurityUtils.java +++ b/src/net/sourceforge/plantuml/security/SecurityUtils.java @@ -57,6 +57,7 @@ import java.util.regex.Pattern; import javax.swing.ImageIcon; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.json.Json; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.log.Logme; @@ -74,7 +75,6 @@ import net.sourceforge.plantuml.security.authentication.oauth.OAuth2ResourceOwne import net.sourceforge.plantuml.security.authentication.token.TokenAuthAccessInterceptor; import net.sourceforge.plantuml.security.authentication.token.TokenAuthAuthorizeManager; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; public class SecurityUtils { diff --git a/src/net/sourceforge/plantuml/security/authentication/SecurityCredentials.java b/src/net/sourceforge/plantuml/security/authentication/SecurityCredentials.java index 5633e5b24..de145e392 100644 --- a/src/net/sourceforge/plantuml/security/authentication/SecurityCredentials.java +++ b/src/net/sourceforge/plantuml/security/authentication/SecurityCredentials.java @@ -43,9 +43,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.utils.StringUtils; /** * Defines a configuration for credentials. diff --git a/src/net/sourceforge/plantuml/security/authentication/basicauth/BasicAuthAccessInterceptor.java b/src/net/sourceforge/plantuml/security/authentication/basicauth/BasicAuthAccessInterceptor.java index c492ad533..a75f56ef8 100644 --- a/src/net/sourceforge/plantuml/security/authentication/basicauth/BasicAuthAccessInterceptor.java +++ b/src/net/sourceforge/plantuml/security/authentication/basicauth/BasicAuthAccessInterceptor.java @@ -37,10 +37,10 @@ package net.sourceforge.plantuml.security.authentication.basicauth; import java.net.URLConnection; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.code.Base64Coder; import net.sourceforge.plantuml.security.authentication.SecurityAccessInterceptor; import net.sourceforge.plantuml.security.authentication.SecurityAuthentication; -import net.sourceforge.plantuml.utils.StringUtils; /** * Applies from {@link SecurityAuthentication} data a BasicAuth authentication access header. diff --git a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2AccessInterceptor.java b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2AccessInterceptor.java index 0b01e0dbb..1878d2729 100644 --- a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2AccessInterceptor.java +++ b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2AccessInterceptor.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.security.authentication.oauth; import java.net.URLConnection; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.security.authentication.SecurityAccessInterceptor; import net.sourceforge.plantuml.security.authentication.SecurityAuthentication; -import net.sourceforge.plantuml.utils.StringUtils; /** * Applies from {@link SecurityAuthentication} data an OAuth2 Authorization access header. diff --git a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ClientAccessAuthorizeManager.java b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ClientAccessAuthorizeManager.java index 35c176a4c..2dc842eb2 100644 --- a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ClientAccessAuthorizeManager.java +++ b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ClientAccessAuthorizeManager.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.security.authentication.oauth; import java.util.Arrays; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.security.authentication.SecurityAuthentication; import net.sourceforge.plantuml.security.authentication.SecurityCredentials; import net.sourceforge.plantuml.security.authentication.basicauth.BasicAuthAuthorizeManager; -import net.sourceforge.plantuml.utils.StringUtils; /** * Authorize the principal (from {@link SecurityCredentials} and creates a {@link SecurityAuthentication} object with a diff --git a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ResourceOwnerAccessAuthorizeManager.java b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ResourceOwnerAccessAuthorizeManager.java index 3736c3b89..297ae4bc1 100644 --- a/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ResourceOwnerAccessAuthorizeManager.java +++ b/src/net/sourceforge/plantuml/security/authentication/oauth/OAuth2ResourceOwnerAccessAuthorizeManager.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.security.authentication.oauth; import java.util.Arrays; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.security.authentication.SecurityAuthentication; import net.sourceforge.plantuml.security.authentication.SecurityCredentials; import net.sourceforge.plantuml.security.authentication.basicauth.BasicAuthAuthorizeManager; -import net.sourceforge.plantuml.utils.StringUtils; /** * Authorize via principal a resource owner (from {@link SecurityCredentials} and creates a diff --git a/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java b/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java index 7992ce24c..489cb3010 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum NotePosition { LEFT, RIGHT, OVER, OVER_SEVERAL, BOTTOM, TOP; diff --git a/src/net/sourceforge/plantuml/sequencediagram/NoteType.java b/src/net/sourceforge/plantuml/sequencediagram/NoteType.java index c78c7e683..fb48df373 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NoteType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NoteType.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public enum NoteType { NOTE, FLOATING_NOTE; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java index 628ea1b42..19445f500 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java @@ -35,6 +35,7 @@ */ 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; @@ -48,7 +49,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandActivate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java index 32c124c97..a5aeacbc1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java @@ -40,6 +40,7 @@ import java.util.Collections; 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; @@ -68,7 +69,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandArrow extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java index 3cbbf2f76..82408526d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java @@ -35,6 +35,7 @@ */ 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; @@ -43,7 +44,6 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandAutonumberIncrement extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java index bcad92a53..c9859fd45 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java @@ -35,6 +35,7 @@ */ 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; @@ -56,7 +57,6 @@ import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; abstract class CommandExoArrowAny extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java index 55734081c..514df8371 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.util.regex.Matcher; 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; @@ -51,7 +52,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; 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 687f72094..d92f6d8ad 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java @@ -35,6 +35,7 @@ */ 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; @@ -43,7 +44,6 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandHSpace extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java index 763cc14de..78714b542 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java @@ -37,6 +37,7 @@ 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; @@ -58,7 +59,6 @@ import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.LineLocation; -import net.sourceforge.plantuml.utils.StringUtils; public abstract class CommandParticipant extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java index 5396698ab..9d9557aa1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.sequencediagram.command; 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; @@ -54,7 +55,6 @@ 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.BlocLines; -import net.sourceforge.plantuml.utils.StringUtils; 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 2032027ca..1ad33204e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.sequencediagram.command; 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; @@ -54,7 +55,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandReferenceOverSeveral extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java index 71ffbbde4..e61fd7b97 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java @@ -42,6 +42,7 @@ import java.io.OutputStream; import java.io.PrintStream; import net.sourceforge.plantuml.FileFormat; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.asciiart.TextSkin; import net.sourceforge.plantuml.asciiart.TextStringBounder; @@ -56,7 +57,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public class SequenceDiagramTxtMaker implements FileMaker { diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index a2cee1e29..7d5f748aa 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.ColorParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; @@ -52,7 +53,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public enum VisibilityModifier { PRIVATE_FIELD(StringUtils.PRIVATE_FIELD, ColorParam.iconPrivate, null), diff --git a/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java b/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java index e9d2b2209..90b951a14 100644 --- a/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java +++ b/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.sprite; import net.sourceforge.plantuml.AbstractPSystem; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.utils.StringUtils; public class PSystemListInternalSpritesFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java b/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java index 1c942c126..e06592b3a 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java @@ -41,6 +41,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.code.AsciiEncoder; import net.sourceforge.plantuml.code.AsciiEncoderFinalZeros; import net.sourceforge.plantuml.code.ByteArray; @@ -51,7 +52,6 @@ import net.sourceforge.plantuml.code.PairInt; import net.sourceforge.plantuml.code.SpiralOnRectangle; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.ugraphic.color.ColorUtils; -import net.sourceforge.plantuml.utils.StringUtils; public enum SpriteGrayLevel { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java index cd973a734..cea88fbde 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java @@ -36,6 +36,7 @@ */ package net.sourceforge.plantuml.statediagram.command; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -56,7 +57,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; abstract class CommandLinkStateCommon extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java index 648eb7b8c..78c21a20a 100644 --- a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java +++ b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java @@ -36,12 +36,12 @@ 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.utils.StringUtils; public class PSystemSudokuFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java b/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java index 25010c3e2..07808151e 100644 --- a/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java +++ b/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.sudoku; import java.util.Random; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; public class SudokuDLX implements ISudoku { diff --git a/src/net/sourceforge/plantuml/svek/ClusterDotString.java b/src/net/sourceforge/plantuml/svek/ClusterDotString.java index acc81affe..d1427c1a4 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDotString.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDotString.java @@ -46,13 +46,13 @@ import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ISkinParam; +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.utils.StringUtils; public class ClusterDotString { diff --git a/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java b/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java index 6d09e99fe..ffdee6617 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDotStringKermor.java @@ -44,6 +44,7 @@ import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.command.Position; @@ -53,7 +54,6 @@ 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.utils.StringUtils; public class ClusterDotStringKermor { diff --git a/src/net/sourceforge/plantuml/svek/DotStringFactory.java b/src/net/sourceforge/plantuml/svek/DotStringFactory.java index bdb3e802f..26cf652dd 100644 --- a/src/net/sourceforge/plantuml/svek/DotStringFactory.java +++ b/src/net/sourceforge/plantuml/svek/DotStringFactory.java @@ -47,6 +47,7 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.BaseFile; import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityFactory; @@ -64,7 +65,6 @@ import net.sourceforge.plantuml.cucadiagram.dot.ProcessState; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.posimo.Moveable; import net.sourceforge.plantuml.security.SFile; -import net.sourceforge.plantuml.utils.StringUtils; import net.sourceforge.plantuml.vizjs.GraphvizJs; import net.sourceforge.plantuml.vizjs.GraphvizJsRuntimeException; diff --git a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java index 494279f47..b82a104c7 100644 --- a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java +++ b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.Pragma; import net.sourceforge.plantuml.SkinParam; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; @@ -126,7 +127,6 @@ 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; -import net.sourceforge.plantuml.utils.StringUtils; public final class GeneralImageBuilder { diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java index bf94a0e99..4b6a49fd0 100644 --- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java +++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java @@ -42,6 +42,7 @@ 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; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; @@ -62,7 +63,6 @@ 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.utils.StringUtils; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java index e3d419c33..69b4d1dbe 100644 --- a/src/net/sourceforge/plantuml/svek/SvekLine.java +++ b/src/net/sourceforge/plantuml/svek/SvekLine.java @@ -49,6 +49,7 @@ import net.sourceforge.plantuml.Hideable; import net.sourceforge.plantuml.ISkinParam; 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; @@ -107,7 +108,6 @@ import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.Log; -import net.sourceforge.plantuml.utils.StringUtils; public class SvekLine implements Moveable, Hideable, GuideLine { diff --git a/src/net/sourceforge/plantuml/svek/SvekNode.java b/src/net/sourceforge/plantuml/svek/SvekNode.java index 2e73421a2..a036da844 100644 --- a/src/net/sourceforge/plantuml/svek/SvekNode.java +++ b/src/net/sourceforge/plantuml/svek/SvekNode.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.svek; import java.util.List; import net.sourceforge.plantuml.Hideable; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -54,7 +55,6 @@ import net.sourceforge.plantuml.ugraphic.Shadowable; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.utils.Direction; -import net.sourceforge.plantuml.utils.StringUtils; public class SvekNode implements Positionable, Hideable { diff --git a/src/net/sourceforge/plantuml/svek/SvgResult.java b/src/net/sourceforge/plantuml/svek/SvgResult.java index 0b6944b9d..4bd42aa10 100644 --- a/src/net/sourceforge/plantuml/svek/SvgResult.java +++ b/src/net/sourceforge/plantuml/svek/SvgResult.java @@ -40,8 +40,8 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.awt.geom.XPoint2D; -import net.sourceforge.plantuml.utils.StringUtils; public class SvgResult { diff --git a/src/net/sourceforge/plantuml/svg/SvgData.java b/src/net/sourceforge/plantuml/svg/SvgData.java index ee521f8ec..efd74142b 100644 --- a/src/net/sourceforge/plantuml/svg/SvgData.java +++ b/src/net/sourceforge/plantuml/svg/SvgData.java @@ -39,7 +39,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public final class SvgData { diff --git a/src/net/sourceforge/plantuml/text/RichText.java b/src/net/sourceforge/plantuml/text/RichText.java index 908ad31d3..95bf16253 100644 --- a/src/net/sourceforge/plantuml/text/RichText.java +++ b/src/net/sourceforge/plantuml/text/RichText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.text; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class RichText { diff --git a/src/net/sourceforge/plantuml/text/StyledString.java b/src/net/sourceforge/plantuml/text/StyledString.java index 4dde4fee8..222180426 100644 --- a/src/net/sourceforge/plantuml/text/StyledString.java +++ b/src/net/sourceforge/plantuml/text/StyledString.java @@ -39,8 +39,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.graphic.FontStyle; -import net.sourceforge.plantuml.utils.StringUtils; public class StyledString { diff --git a/src/net/sourceforge/plantuml/ugraphic/UFont.java b/src/net/sourceforge/plantuml/ugraphic/UFont.java index dbe326b8d..357a23762 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFont.java +++ b/src/net/sourceforge/plantuml/ugraphic/UFont.java @@ -40,7 +40,7 @@ import java.awt.GraphicsEnvironment; import java.util.HashSet; import java.util.Set; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class UFont { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColor.java b/src/net/sourceforge/plantuml/ugraphic/color/HColor.java index 6ca062eb3..dafa890cf 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColor.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColor.java @@ -36,9 +36,9 @@ package net.sourceforge.plantuml.ugraphic.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.utils.StringUtils; public abstract class HColor implements UChange { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java index cb760d92c..409d66943 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorSet.java @@ -44,9 +44,9 @@ import java.util.Objects; 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.utils.StringUtils; public class HColorSet { diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java index 441ea70bb..efd114297 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic.color; import java.awt.Color; -import net.sourceforge.plantuml.utils.StringUtils; +import net.sourceforge.plantuml.StringUtils; public class HColorSimple extends HColor { diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java index 82bf57148..7cf1784a4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.ugraphic.debug; import java.util.Random; +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.utils.StringUtils; public class StringBounderDebug extends StringBounderRaw { diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java index 10c1981b9..44755056f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java @@ -34,6 +34,7 @@ */ 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; @@ -49,7 +50,6 @@ import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; -import net.sourceforge.plantuml.utils.StringUtils; public class DriverTextSvg implements UDriver { diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java index 191d1985f..c5e2c00e0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java @@ -34,6 +34,7 @@ */ 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; @@ -43,7 +44,6 @@ 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.utils.StringUtils; public class DriverTextVdx implements UDriver { diff --git a/src/net/sourceforge/plantuml/utils/StartUtils.java b/src/net/sourceforge/plantuml/utils/StartUtils.java index 66788e5b5..8662ae6a6 100644 --- a/src/net/sourceforge/plantuml/utils/StartUtils.java +++ b/src/net/sourceforge/plantuml/utils/StartUtils.java @@ -35,6 +35,7 @@ */ 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; diff --git a/src/net/sourceforge/plantuml/utils/StringLocated.java b/src/net/sourceforge/plantuml/utils/StringLocated.java index f3554c997..1ded0600d 100644 --- a/src/net/sourceforge/plantuml/utils/StringLocated.java +++ b/src/net/sourceforge/plantuml/utils/StringLocated.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.utils; 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; diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java b/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java index 123e3b701..4e296c3e1 100644 --- a/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java +++ b/src/net/sourceforge/plantuml/wbs/CommandWBSItemMultiline.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.wbs; import java.util.List; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -52,7 +53,6 @@ import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.Direction; -import net.sourceforge.plantuml.utils.StringUtils; public class CommandWBSItemMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/yaml/SimpleYamlParser.java b/src/net/sourceforge/plantuml/yaml/SimpleYamlParser.java index 6b5e3879c..0cd93113a 100644 --- a/src/net/sourceforge/plantuml/yaml/SimpleYamlParser.java +++ b/src/net/sourceforge/plantuml/yaml/SimpleYamlParser.java @@ -39,11 +39,11 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonString; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.utils.StringUtils; public class SimpleYamlParser { diff --git a/test/net/sourceforge/plantuml/SkinParamTest.java b/test/net/sourceforge/plantuml/SkinParamTest.java index cc5c534d9..1b4abb9ed 100644 --- a/test/net/sourceforge/plantuml/SkinParamTest.java +++ b/test/net/sourceforge/plantuml/SkinParamTest.java @@ -21,7 +21,6 @@ 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.utils.StringUtils; class SkinParamTest { diff --git a/test/net/sourceforge/plantuml/StringUtilsTest.java b/test/net/sourceforge/plantuml/StringUtilsTest.java index 7fc6dd417..39c9f3600 100644 --- a/test/net/sourceforge/plantuml/StringUtilsTest.java +++ b/test/net/sourceforge/plantuml/StringUtilsTest.java @@ -5,8 +5,6 @@ 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.utils.StringUtils; - class StringUtilsTest { @ParameterizedTest