diff --git a/src/net/sourceforge/plantuml/AbstractPSystem.java b/src/net/sourceforge/plantuml/AbstractPSystem.java index 298339086..23c1ccd30 100644 --- a/src/net/sourceforge/plantuml/AbstractPSystem.java +++ b/src/net/sourceforge/plantuml/AbstractPSystem.java @@ -41,7 +41,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Objects; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.ProtectedCommand; @@ -58,6 +57,7 @@ import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.ugraphic.ImageBuilder; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.version.License; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/BackSlash.java b/src/net/sourceforge/plantuml/BackSlash.java index 36c2bcf13..feda63fa6 100644 --- a/src/net/sourceforge/plantuml/BackSlash.java +++ b/src/net/sourceforge/plantuml/BackSlash.java @@ -40,6 +40,8 @@ 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 2d2ecb5d2..6bc093f86 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -59,7 +59,10 @@ import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.preproc.FileWithSuffix; import net.sourceforge.plantuml.preproc2.PreprocessorModeSet; 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/BlockUmlBuilder.java b/src/net/sourceforge/plantuml/BlockUmlBuilder.java index 4e8c6da0c..c3ca181d2 100644 --- a/src/net/sourceforge/plantuml/BlockUmlBuilder.java +++ b/src/net/sourceforge/plantuml/BlockUmlBuilder.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.preproc.UncommentReadLine; import net.sourceforge.plantuml.preproc2.Preprocessor; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; public final class BlockUmlBuilder implements DefinitionsContainer { diff --git a/src/net/sourceforge/plantuml/ClipboardLoop.java b/src/net/sourceforge/plantuml/ClipboardLoop.java index 841227b67..b1c6564ab 100644 --- a/src/net/sourceforge/plantuml/ClipboardLoop.java +++ b/src/net/sourceforge/plantuml/ClipboardLoop.java @@ -46,6 +46,7 @@ import java.io.IOException; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.security.SImageIO; +import net.sourceforge.plantuml.utils.Log; public class ClipboardLoop { diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index d7954764d..ee626f14c 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -60,6 +60,8 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.utils.StringUtils; public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { diff --git a/src/net/sourceforge/plantuml/EmptyImageBuilder.java b/src/net/sourceforge/plantuml/EmptyImageBuilder.java index d394bfd82..c0abd7111 100644 --- a/src/net/sourceforge/plantuml/EmptyImageBuilder.java +++ b/src/net/sourceforge/plantuml/EmptyImageBuilder.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d; +import net.sourceforge.plantuml.utils.Log; public class EmptyImageBuilder { diff --git a/src/net/sourceforge/plantuml/ErrorUml.java b/src/net/sourceforge/plantuml/ErrorUml.java index 67c67cc25..4afe7b033 100644 --- a/src/net/sourceforge/plantuml/ErrorUml.java +++ b/src/net/sourceforge/plantuml/ErrorUml.java @@ -37,6 +37,8 @@ package net.sourceforge.plantuml; import java.util.Objects; +import net.sourceforge.plantuml.utils.LineLocation; + public class ErrorUml { private final String error; diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index 84167ff51..e19bff00e 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -54,6 +54,7 @@ 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/FileSystem.java b/src/net/sourceforge/plantuml/FileSystem.java index 04e232861..cba4edd25 100644 --- a/src/net/sourceforge/plantuml/FileSystem.java +++ b/src/net/sourceforge/plantuml/FileSystem.java @@ -39,6 +39,7 @@ import java.io.IOException; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.utils.Log; public class FileSystem { diff --git a/src/net/sourceforge/plantuml/FileUtils.java b/src/net/sourceforge/plantuml/FileUtils.java index fa2c1bf9e..5d525dbc0 100644 --- a/src/net/sourceforge/plantuml/FileUtils.java +++ b/src/net/sourceforge/plantuml/FileUtils.java @@ -49,6 +49,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.utils.Log; // Used by the Eclipse Plugin, so do not change package location. public class FileUtils { diff --git a/src/net/sourceforge/plantuml/NewpagedDiagram.java b/src/net/sourceforge/plantuml/NewpagedDiagram.java index d2ba6e4a6..c4f9825bb 100644 --- a/src/net/sourceforge/plantuml/NewpagedDiagram.java +++ b/src/net/sourceforge/plantuml/NewpagedDiagram.java @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.core.Diagram; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class NewpagedDiagram extends AbstractPSystem { diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 010340cce..35f19d9ec 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -56,6 +56,8 @@ import net.sourceforge.plantuml.preproc.Defines; 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/OptionFlags.java b/src/net/sourceforge/plantuml/OptionFlags.java index 24211dc90..7099fd1f2 100644 --- a/src/net/sourceforge/plantuml/OptionFlags.java +++ b/src/net/sourceforge/plantuml/OptionFlags.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.utils.Log; public class OptionFlags { diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index edd002665..a5748e6c5 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -97,6 +97,8 @@ import net.sourceforge.plantuml.statediagram.StateDiagramFactory; import net.sourceforge.plantuml.stats.StatsUtilsIncrement; import net.sourceforge.plantuml.sudoku.PSystemSudokuFactory; import net.sourceforge.plantuml.timingdiagram.TimingDiagramFactory; +import net.sourceforge.plantuml.utils.Log; +import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.License; import net.sourceforge.plantuml.version.PSystemLicenseFactory; import net.sourceforge.plantuml.version.PSystemVersionFactory; diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java index 81f56539f..71184850a 100644 --- a/src/net/sourceforge/plantuml/PSystemUtils.java +++ b/src/net/sourceforge/plantuml/PSystemUtils.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.utils.Log; public class PSystemUtils { diff --git a/src/net/sourceforge/plantuml/PaddingParam.java b/src/net/sourceforge/plantuml/PaddingParam.java index 0c07520a5..d524465bb 100644 --- a/src/net/sourceforge/plantuml/PaddingParam.java +++ b/src/net/sourceforge/plantuml/PaddingParam.java @@ -35,6 +35,7 @@ */ 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 d167ff25d..98a69a411 100644 --- a/src/net/sourceforge/plantuml/Run.java +++ b/src/net/sourceforge/plantuml/Run.java @@ -71,6 +71,8 @@ import net.sourceforge.plantuml.stats.StatsUtils; 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 5deb0e664..3d5f45af1 100644 --- a/src/net/sourceforge/plantuml/SkinParam.java +++ b/src/net/sourceforge/plantuml/SkinParam.java @@ -56,7 +56,6 @@ import java.util.regex.Pattern; import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsRegular; import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsTriangle; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; @@ -81,6 +80,7 @@ import net.sourceforge.plantuml.style.FromSkinparamToStyle; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleLoader; +import net.sourceforge.plantuml.style.parser.StyleParser; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.svek.PackageStyle; @@ -91,6 +91,8 @@ 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.BlocLines; +import net.sourceforge.plantuml.utils.StringUtils; public class SkinParam implements ISkinParam { @@ -179,7 +181,7 @@ public class SkinParam implements ISkinParam { final StyleBuilder styleBuilder = this.getCurrentStyleBuilder(); try { final BlocLines lines = BlocLines.load(internalIs, null); - for (Style modifiedStyle : StyleLoader.getDeclaredStyles(lines, styleBuilder)) + for (Style modifiedStyle : StyleParser.parse(lines, styleBuilder)) this.muteStyle(modifiedStyle); } catch (IOException e) { diff --git a/src/net/sourceforge/plantuml/SourceFileReader.java b/src/net/sourceforge/plantuml/SourceFileReader.java index c118ed9e4..ecde8f320 100644 --- a/src/net/sourceforge/plantuml/SourceFileReader.java +++ b/src/net/sourceforge/plantuml/SourceFileReader.java @@ -44,6 +44,7 @@ import java.util.List; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.utils.Log; @HaxeIgnored public class SourceFileReader extends SourceFileReaderAbstract implements ISourceFileReader { diff --git a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java index 23d0f8111..1bfcfd7db 100644 --- a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java +++ b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.preproc.FileWithSuffix; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.utils.Log; public abstract class SourceFileReaderAbstract implements ISourceFileReader { diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index e4f9f1026..60d03f851 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.graphic.GraphicStrings; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.svek.TextBlockBackcolored; +import net.sourceforge.plantuml.utils.Log; @HaxeIgnored public class SourceStringReader { diff --git a/src/net/sourceforge/plantuml/StdrptNull.java b/src/net/sourceforge/plantuml/StdrptNull.java index c407af05a..8384ecb05 100644 --- a/src/net/sourceforge/plantuml/StdrptNull.java +++ b/src/net/sourceforge/plantuml/StdrptNull.java @@ -39,6 +39,7 @@ import java.io.File; import java.io.PrintStream; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.Log; public class StdrptNull implements Stdrpt { diff --git a/src/net/sourceforge/plantuml/StdrptPipe0.java b/src/net/sourceforge/plantuml/StdrptPipe0.java index 9ae72093b..fee105fbf 100644 --- a/src/net/sourceforge/plantuml/StdrptPipe0.java +++ b/src/net/sourceforge/plantuml/StdrptPipe0.java @@ -40,6 +40,7 @@ import java.io.PrintStream; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; +import net.sourceforge.plantuml.utils.Log; public class StdrptPipe0 implements Stdrpt { diff --git a/src/net/sourceforge/plantuml/StdrptV1.java b/src/net/sourceforge/plantuml/StdrptV1.java index 2d9232a6a..f067e01f0 100644 --- a/src/net/sourceforge/plantuml/StdrptV1.java +++ b/src/net/sourceforge/plantuml/StdrptV1.java @@ -42,6 +42,7 @@ import net.sourceforge.plantuml.command.PSystemAbstractFactory; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.eggs.PSystemWelcome; import net.sourceforge.plantuml.error.PSystemError; +import net.sourceforge.plantuml.utils.Log; public class StdrptV1 implements Stdrpt { diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index 377d32f5a..76ac09d09 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -64,6 +64,7 @@ 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/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java index 217191d80..354846265 100644 --- a/src/net/sourceforge/plantuml/UmlDiagram.java +++ b/src/net/sourceforge/plantuml/UmlDiagram.java @@ -80,6 +80,7 @@ import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annotated, WithSprite { diff --git a/src/net/sourceforge/plantuml/Url.java b/src/net/sourceforge/plantuml/Url.java index 399c698ad..720e4c76c 100644 --- a/src/net/sourceforge/plantuml/Url.java +++ b/src/net/sourceforge/plantuml/Url.java @@ -39,6 +39,7 @@ 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/UrlBuilder.java b/src/net/sourceforge/plantuml/UrlBuilder.java index 8bf33efa6..ec0b574b3 100644 --- a/src/net/sourceforge/plantuml/UrlBuilder.java +++ b/src/net/sourceforge/plantuml/UrlBuilder.java @@ -35,38 +35,48 @@ */ package net.sourceforge.plantuml; +import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; +import net.sourceforge.plantuml.command.regex.RegexLeaf; +import net.sourceforge.plantuml.command.regex.RegexOptional; public class UrlBuilder { - private static final String S_QUOTED = "\\[\\[[%s]*" + // + public static final IRegex MANDATORY = new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")"); + public static final IRegex OPTIONAL = new RegexOptional(MANDATORY); + + private static final String START_PART = "\\[\\[[%s]*"; + private static final String END_PART = "[%s]*\\]\\]"; + + private static final String S_QUOTED = START_PART + // "[%g]([^%g]+)[%g]" + // Quoted part "(?:[%s]*\\{([^{}]*)\\})?" + // Optional tooltip "(?:[%s]([^%s\\{\\}\\[\\]][^\\[\\]]*))?" + // Optional label - "[%s]*\\]\\]"; + END_PART; - private static final String S_ONLY_TOOLTIP = "\\[\\[[%s]*" + // + private static final String S_ONLY_TOOLTIP = START_PART + // "\\{(.*)\\}" + // Tooltip - "[%s]*\\]\\]"; + END_PART; - private static final String S_ONLY_TOOLTIP_AND_LABEL = "\\[\\[[%s]*" + // + private static final String S_ONLY_TOOLTIP_AND_LABEL = START_PART + // "\\{([^{}]*)\\}" + // Tooltip "[%s]*" + // "([^\\[%s\\{\\}\\[\\]][^\\[\\]]*)" // Label - + "[%s]*\\]\\]"; + + END_PART; - private static final String S_LINK_TOOLTIP_NOLABEL = "\\[\\[[%s]*" + // + private static final String S_LINK_TOOLTIP_NOLABEL = START_PART + // "([^\\s%g{}\\[\\]]+?)" + // Link - "[%s]*\\{(.+)\\}" + // Tooltip - "[%s]*\\]\\]"; + "[%s]*" + // + "\\{(.+)\\}" + // Tooltip + END_PART; - private static final String S_LINK_WITH_OPTIONAL_TOOLTIP_WITH_OPTIONAL_LABEL = "\\[\\[[%s]*" + // + private static final String S_LINK_WITH_OPTIONAL_TOOLTIP_WITH_OPTIONAL_LABEL = START_PART + // "([^%s%g\\[\\]]+?)" + // Link "(?:[%s]*\\{([^{}]*)\\})?" + // Optional tooltip "(?:[%s]([^%s\\{\\}\\[\\]][^\\[\\]]*))?" + // Optional label - "[%s]*\\]\\]"; + END_PART; public static String getRegexp() { return S_QUOTED + "|" + // diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java index ea68eedde..0d99aeb49 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.baraye.IEntity; @@ -54,6 +53,7 @@ import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.utils.Direction; public class ActivityDiagram extends CucaDiagram { diff --git a/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java b/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java index 2397e3674..4e8177f64 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.activitydiagram; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.utils.Direction; public class ConditionalContext { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java index b9d55f8f7..4646d779a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElse extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java index 1f1c3b3f8..53c299cc7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPartition extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java index abaf3455c..f5db660e6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndif extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java index 1c86b1cf3..96eacfa7c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java @@ -35,9 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; @@ -55,6 +52,9 @@ import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.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/CommandInnerConcurrent.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java index 2e6670346..491960e29 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandInnerConcurrent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java index b78b8927b..11b5bdd03 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java @@ -35,9 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -69,6 +66,9 @@ import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.Direction; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandLinkActivity extends SingleLineCommand2 { @@ -89,7 +89,7 @@ public class CommandLinkActivity extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // ColorParser.exp2(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // new RegexLeaf("ARROW_BODY1", "([-.]+)"), // new RegexLeaf("ARROW_STYLE1", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), // diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java index d6b98416f..bcd0dca5d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java @@ -38,16 +38,12 @@ package net.sourceforge.plantuml.activitydiagram.command; import java.util.List; import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -73,6 +69,10 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.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 { @@ -98,7 +98,7 @@ public class CommandLinkLongActivity extends CommandMultilines2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("BACKCOLOR", "(#\\w+)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // new RegexLeaf("ARROW_BODY1", "([-.]+)"), // new RegexLeaf("ARROW_STYLE1", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), // diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java index 8256b83fa..53bb993cc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.IGroup; @@ -57,6 +55,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandPartition extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java index a19b8288f..42328eb3b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import java.util.regex.Matcher; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivity3 extends SingleLineCommand2 { @@ -86,7 +86,7 @@ public class CommandActivity3 extends SingleLineCommand2 { static IRegex getRegexConcat() { return RegexConcat.build(CommandActivity3.class.getName(), RegexLeaf.start(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java index cb9466ec8..5bde329ef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivityLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java index 2896bd86a..050886d5e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandActivityLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java index d2622f78d..ff6790364 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandArrow3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java index b0cd0ab57..f9d9685be 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import java.util.List; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandArrowLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java index 0914f23bb..1ed396009 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandBackward3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java index 52e129874..d1309df82 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandBackwardLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java index f6fdc427d..4cb892b51 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandBreak extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java index afaa828ff..ad83e054b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCase extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java index 265be11b3..4410dc6c0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCircleSpot3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java index 36b36c019..1e43c0d44 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElse3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java index 4779560e1..b7008375a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseIf2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java index 1222be6ee..b662aeaea 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java index 6955204a4..d3fda295e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java index e3c8d330a..8c14a49fd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPartition3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java index 62d8f7f53..22ccd5fda 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndSwitch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java index feb72f593..b692ad9c0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndif3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java index f468c632e..9186c1a9a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFork3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java index 8d78d6b51..fdf442a34 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandForkAgain3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java index d98cf82a5..18344d731 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ForkStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandForkEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java index 102b60508..8ddf0f09e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGoto extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java index 9aa1ddd7b..6741cb8a0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java index 4ab1dddf9..7fb3bc344 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -51,6 +50,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandIf2 extends SingleLineCommand2 { @@ -60,7 +60,7 @@ public class CommandIf2 extends SingleLineCommand2 { static IRegex getRegexConcat() { return RegexConcat.build(CommandIf2.class.getName(), RegexLeaf.start(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // ColorParser.exp4(), // new RegexLeaf("if"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java index 06b539a31..4bdb0a7d8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandIf4 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java index fee7b3fa0..6ddc64c71 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandIfLegacy1 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java index 2af1db18f..e7cb5c78f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandKill3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java index 61aa5b1a6..c13b2eb20 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLabel extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java index 40467d0ce..7b6359bea 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java index b0c24397f..51128eb09 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNolink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java index 6d5b17901..a5d06b8d5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNote3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java index 7d52453e9..77f2b90c2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -52,6 +51,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteLong3 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index e41d96d3e..e2ba357b6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; -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; @@ -57,6 +55,8 @@ import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandPartition3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java index d2b96990d..682a9c7ff 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.activitydiagram3.command; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -53,6 +52,7 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandRepeat3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java index 7b5aee978..dc8068d13 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandRepeatWhile3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java index 966b30d83..eb69565a5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java @@ -37,10 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.command; import java.util.List; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines3; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -51,6 +48,9 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.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/activitydiagram3/command/CommandSplit3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java index d5fc491d8..01212fab9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplit3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java index 53971728f..8041a9681 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplitAgain3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java index 2f159fa96..d8f2c0561 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSplitEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java index d44bfcf47..05bd6fe23 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandStart3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java index 9f0456463..73ce6e618 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandStop3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java index efe374dda..450c8ee99 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwimlane extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java index a6174b9e3..44e127e6b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwimlane2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java index ef65b1a21..aa16101cd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwitch.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSwitch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java index f8b4cda4f..983cce447 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandWhile3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java index 0b6b36032..d2412be85 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandWhileEnd3 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java index 215b60098..f04095e60 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.utils.Direction; public abstract class Arrows { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java index 3746ef3de..157e3fbb5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java @@ -40,7 +40,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XLine2D; @@ -60,6 +59,7 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UShape; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.comp.PiecewiseAffineTransform; +import net.sourceforge.plantuml.utils.Direction; public class Snake implements UShape { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java index 1b43bd1d0..4f8c5bec2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java @@ -42,7 +42,6 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.awt.geom.XLine2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.cucadiagram.LinkStyle; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; +import net.sourceforge.plantuml.utils.Direction; public class Worm implements Iterable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java index d3d37aae8..950f3447e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.activitydiagram3.ftile; import java.util.Iterator; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.HtmlColorAndStyle; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class WormTexted implements Iterable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java index cda70fcf4..0770cb6d6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -59,6 +58,7 @@ import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; public class FloatingNote extends AbstractTextBlock implements Stencil, TextBlock { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java index 312c95b10..f4bed2ee2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; import net.sourceforge.plantuml.activitydiagram3.ftile.Connection; @@ -66,6 +65,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class FtileIfDown extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java index 32a057f17..6f9a7cb0f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; @@ -74,6 +73,7 @@ import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; class FtileRepeat extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java index 9099ec9df..0806510b3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.Instruction; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; @@ -74,6 +73,7 @@ import net.sourceforge.plantuml.ugraphic.UEmpty; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; class FtileWhile extends AbstractFtile { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java index 033d2b2d6..0f66f8637 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java @@ -41,7 +41,6 @@ import java.util.HashSet; import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.activitydiagram3.LinkRendering; @@ -74,6 +73,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; public class FtileWithNoteOpale extends AbstractFtile implements Stencil, Styleable { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java index 9263270ce..7c1d4f560 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; import net.sourceforge.plantuml.activitydiagram3.ftile.Connection; @@ -60,6 +59,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class FtileIfWithLinks extends FtileIfWithDiamonds { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java index ac36a98af..8b89cc8ef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchWithManyLinks.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.Branch; import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; import net.sourceforge.plantuml.activitydiagram3.ftile.Connection; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class FtileSwitchWithManyLinks extends FtileSwitchWithDiamonds { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java index 78c8a2af9..a8ff92f90 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class GConnectionHorizontalThenVerticalDown extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java index df8f8e546..49862482b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionSideThenVerticalThenSide.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.HorizontalAlignment; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class GConnectionSideThenVerticalThenSide extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java index 1fe4ec664..5fdce42d7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenBack.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.HorizontalAlignment; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class GConnectionVerticalDownThenBack extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java index 4779860d5..c67284a7b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionVerticalDownThenHorizontal.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.activitydiagram3.ftile.Hexagon; import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Direction; public class GConnectionVerticalDownThenHorizontal extends GAbstractConnection { diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index 1aca82064..fd2c1f6cc 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/api/NumberAnalyzed.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java index bd4728201..d71358b9c 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzed.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java @@ -33,9 +33,9 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; @HaxeIgnored public class NumberAnalyzed implements INumberAnalyzed { diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java index 4977272cb..ca0e69f47 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java @@ -32,9 +32,9 @@ import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicLong; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; @HaxeIgnored public class NumberAnalyzed2 implements INumberAnalyzed { diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java index adab7d6bc..cce0ad801 100644 --- a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java +++ b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java @@ -32,9 +32,9 @@ import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicLong; import java.util.prefs.Preferences; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; @HaxeIgnored public class NumberAnalyzedDated extends NumberAnalyzed { diff --git a/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java b/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java index 77eac2634..69e15008e 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.StringUtils; +import net.sourceforge.plantuml.utils.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 6bc30be22..82f85acad 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 6578cf3c7..20b294240 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java @@ -39,7 +39,6 @@ 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; @@ -53,6 +52,7 @@ 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 bdda659f3..2d7e24ca8 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 3b0e40517..d57a7b9c9 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 466bf43d1..76c8f6a85 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 123efbc8f..f9d0d13dd 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 8b9bddc16..e119f0745 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java @@ -36,7 +36,6 @@ 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; @@ -45,6 +44,7 @@ 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 774cfcbd5..33d106d5e 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextReference.java @@ -36,7 +36,6 @@ 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,6 +43,7 @@ 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 6a6aa8c06..4fbfb9249 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java @@ -36,7 +36,6 @@ 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; @@ -48,6 +47,7 @@ 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 82d4bba01..014808c22 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java @@ -35,7 +35,6 @@ */ 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; @@ -44,6 +43,7 @@ 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/CucaDiagram.java b/src/net/sourceforge/plantuml/baraye/CucaDiagram.java index 3cf1beb42..754c85213 100644 --- a/src/net/sourceforge/plantuml/baraye/CucaDiagram.java +++ b/src/net/sourceforge/plantuml/baraye/CucaDiagram.java @@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicInteger; import net.sourceforge.plantuml.BackSlash; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.api.ImageDataSimple; @@ -88,6 +87,7 @@ import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; import net.sourceforge.plantuml.svek.CucaDiagramFileMakerSvek; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.xmi.CucaDiagramXmiMaker; import net.sourceforge.plantuml.xmlsc.StateDiagramScxmlMaker; diff --git a/src/net/sourceforge/plantuml/baraye/EntityImp.java b/src/net/sourceforge/plantuml/baraye/EntityImp.java index cb5768dd0..aa59799fb 100644 --- a/src/net/sourceforge/plantuml/baraye/EntityImp.java +++ b/src/net/sourceforge/plantuml/baraye/EntityImp.java @@ -48,12 +48,9 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.command.Position; import net.sourceforge.plantuml.cucadiagram.Bodier; @@ -89,6 +86,9 @@ import net.sourceforge.plantuml.svek.SingleStrategy; import net.sourceforge.plantuml.svek.image.EntityImageStateCommon; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.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/baraye/IEntity.java b/src/net/sourceforge/plantuml/baraye/IEntity.java index a17a70be5..927e9a314 100644 --- a/src/net/sourceforge/plantuml/baraye/IEntity.java +++ b/src/net/sourceforge/plantuml/baraye/IEntity.java @@ -41,7 +41,6 @@ import java.util.Set; import net.sourceforge.plantuml.Hideable; import net.sourceforge.plantuml.LineConfigurable; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Removeable; import net.sourceforge.plantuml.SpecificBackcolorable; import net.sourceforge.plantuml.Url; @@ -58,6 +57,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.color.Colors; +import net.sourceforge.plantuml.utils.LineLocation; public interface IEntity extends SpecificBackcolorable, Hideable, Removeable, LineConfigurable { diff --git a/src/net/sourceforge/plantuml/board/CommandBoardPlus.java b/src/net/sourceforge/plantuml/board/CommandBoardPlus.java index c68f9f55c..d56d5728d 100644 --- a/src/net/sourceforge/plantuml/board/CommandBoardPlus.java +++ b/src/net/sourceforge/plantuml/board/CommandBoardPlus.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.board; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandBoardPlus extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java b/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java index 9b8ba50dc..67562df06 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java +++ b/src/net/sourceforge/plantuml/bpm/CommandDockedEvent.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandDockedEvent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java b/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java index b488beb2e..f866ed971 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandElseBranch.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElseBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java b/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java index 4b305385d..e80d988f1 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandEndBranch.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandGoto.java b/src/net/sourceforge/plantuml/bpm/CommandGoto.java index e7e6aaea7..5b4957608 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandGoto.java +++ b/src/net/sourceforge/plantuml/bpm/CommandGoto.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGoto extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandMerge.java b/src/net/sourceforge/plantuml/bpm/CommandMerge.java index e12eda5c0..804c3c4a9 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandMerge.java +++ b/src/net/sourceforge/plantuml/bpm/CommandMerge.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMerge extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java b/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java index 5c5bcdcf6..eeae54154 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java +++ b/src/net/sourceforge/plantuml/bpm/CommandNewBranch.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewBranch extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/bpm/CommandResume.java b/src/net/sourceforge/plantuml/bpm/CommandResume.java index 8f3e1648d..cd2f32a0a 100644 --- a/src/net/sourceforge/plantuml/bpm/CommandResume.java +++ b/src/net/sourceforge/plantuml/bpm/CommandResume.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.bpm; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandResume extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java index 9057b12dc..f275526db 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddMethod extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java index c0bdabf5d..c4fe30a38 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAllowMixing extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index 0da7939bc..80ea4f1e0 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -36,8 +36,6 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -65,6 +63,8 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandCreateClass extends SingleLineCommand2 { @@ -109,7 +109,7 @@ public class CommandCreateClass extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java index d696676e8..d40189b03 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -36,8 +36,6 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -47,7 +45,6 @@ import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.baraye.Quark; import net.sourceforge.plantuml.classdiagram.ClassDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -74,6 +71,9 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.skin.VisibilityModifier; 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 { @@ -124,7 +124,7 @@ public class CommandCreateClassMultilines extends CommandMultilines2 { @@ -106,7 +106,7 @@ public class CommandCreateElementFull2 extends SingleLineCommand2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.end()); @@ -136,7 +136,7 @@ public class CommandCreateElementFull2 extends SingleLineCommand2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.end()); diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java index 3dabf405e..57a0acb59 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandDiamondAssociation extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java index d102597ba..1f2e1d885 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideShow2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java index 01813d979..ef9369c4f 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.baraye.IEntity; @@ -56,6 +54,8 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; 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 f24a2b388..54351f733 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByVisibility.java @@ -39,8 +39,6 @@ import java.util.EnumSet; import java.util.Set; import java.util.StringTokenizer; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -51,6 +49,8 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; 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/CommandHideShowSpecificClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java index c2405b643..b6d31b7e3 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideShowSpecificClass extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java index ef52e2caf..58f19119e 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLayoutNewLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java index 5b0856f7d..a47e18db7 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java @@ -36,9 +36,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; @@ -64,6 +61,9 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; 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 { @@ -131,7 +131,7 @@ final public class CommandLinkClass extends SingleLineCommand2 { @@ -131,7 +131,7 @@ final public class CommandLinkClass2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java index 0e9f08ed6..8d5de2d1f 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespaceSeparator extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java index ca29f9e00..5468f7591 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandRemoveRestore.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandRemoveRestore extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java index 4a897e18a..7d83c6d90 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.classdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.ClassDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandStereotype extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java index 424fd9a53..1a408e8d0 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.classdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Ident; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandUrl extends SingleLineCommand2 { @@ -68,7 +68,7 @@ public class CommandUrl extends SingleLineCommand2 { RegexLeaf.spaceOneOrMore(), // new RegexOptional(new RegexLeaf("is")), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")"), // + UrlBuilder.MANDATORY, // RegexLeaf.end()); // } diff --git a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java index 3e9bc28ec..a324b46be 100644 --- a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java +++ b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java @@ -38,14 +38,14 @@ package net.sourceforge.plantuml.code; import java.io.IOException; import java.io.StringReader; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineReader; import net.sourceforge.plantuml.preproc.UncommentReadLine; +import net.sourceforge.plantuml.utils.StringLocated; +import net.sourceforge.plantuml.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 9334bf9f2..7df82ba8b 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.StringUtils; +import net.sourceforge.plantuml.utils.StringUtils; public class ArobaseStringCompressor2 implements StringCompressor { diff --git a/src/net/sourceforge/plantuml/command/Command.java b/src/net/sourceforge/plantuml/command/Command.java index e9cfe2b65..2b76f89aa 100644 --- a/src/net/sourceforge/plantuml/command/Command.java +++ b/src/net/sourceforge/plantuml/command/Command.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public interface Command { diff --git a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java index dfc7456c7..d95314522 100644 --- a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java +++ b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.command; import java.util.Collections; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAffineTransform extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java b/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java index 3ea2e75b5..e8568461e 100644 --- a/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java +++ b/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.TitledDiagram; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandAffineTransformMultiline extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java b/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java index d7e8fa4b8..4bca0bd2c 100644 --- a/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java +++ b/src/net/sourceforge/plantuml/command/CommandAssumeTransparent.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAssumeTransparent extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandCaption.java b/src/net/sourceforge/plantuml/command/CommandCaption.java index 61c2f208c..345ee6576 100644 --- a/src/net/sourceforge/plantuml/command/CommandCaption.java +++ b/src/net/sourceforge/plantuml/command/CommandCaption.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCaption extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java b/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java index c20d48aae..8751bdfa4 100644 --- a/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java +++ b/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandDecoratorMultine implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandEndPackage.java b/src/net/sourceforge/plantuml/command/CommandEndPackage.java index 072e42510..e498e9d88 100644 --- a/src/net/sourceforge/plantuml/command/CommandEndPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandEndPackage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.EntityUtils; import net.sourceforge.plantuml.baraye.IGroup; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPackage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java index 10f267a11..314a335d2 100644 --- a/src/net/sourceforge/plantuml/command/CommandFactorySprite.java +++ b/src/net/sourceforge/plantuml/command/CommandFactorySprite.java @@ -38,8 +38,6 @@ package net.sourceforge.plantuml.command; import java.util.Arrays; import java.util.List; -import net.sourceforge.plantuml.LineLocation; -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,6 +48,9 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sprite.Sprite; 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/CommandFootboxIgnored.java b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java index cc62369a0..d21e049cf 100644 --- a/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java +++ b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootboxIgnored extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandFooter.java b/src/net/sourceforge/plantuml/command/CommandFooter.java index 5d827c54c..cf9c9b0d2 100644 --- a/src/net/sourceforge/plantuml/command/CommandFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandFooter.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFooter extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandHeader.java b/src/net/sourceforge/plantuml/command/CommandHeader.java index 625d4da55..b88005097 100644 --- a/src/net/sourceforge/plantuml/command/CommandHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandHeader.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHeader extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandLegend.java b/src/net/sourceforge/plantuml/command/CommandLegend.java index b04bf34ff..824e7735b 100644 --- a/src/net/sourceforge/plantuml/command/CommandLegend.java +++ b/src/net/sourceforge/plantuml/command/CommandLegend.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLegend extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMainframe.java b/src/net/sourceforge/plantuml/command/CommandMainframe.java index 4267ac470..74975ebe3 100644 --- a/src/net/sourceforge/plantuml/command/CommandMainframe.java +++ b/src/net/sourceforge/plantuml/command/CommandMainframe.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMainframe extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMinwidth.java b/src/net/sourceforge/plantuml/command/CommandMinwidth.java index c2c68ef3f..19ad0c1fe 100644 --- a/src/net/sourceforge/plantuml/command/CommandMinwidth.java +++ b/src/net/sourceforge/plantuml/command/CommandMinwidth.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMinwidth extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines.java b/src/net/sourceforge/plantuml/command/CommandMultilines.java index d511c305b..81a53b0b3 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.BlocLines; public abstract class CommandMultilines implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines2.java b/src/net/sourceforge/plantuml/command/CommandMultilines2.java index 805d0c2eb..743e3c818 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines2.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines2.java @@ -35,12 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilines2 implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines3.java b/src/net/sourceforge/plantuml/command/CommandMultilines3.java index 2ba004582..2387a6e6b 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines3.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines3.java @@ -35,10 +35,11 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilines3 implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java index 510dc7145..9ee8d742d 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java @@ -35,11 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class CommandMultilinesBracket implements Command { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java b/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java index f7bbc13d1..d37083343 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesCaption.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesCaption extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java b/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java index 1fec7390c..8b19ae5b5 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesComment extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java index 901ea5b55..e31a1ed5d 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java @@ -42,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesFooter extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java index c3961c474..f039ec32d 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java @@ -42,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesHeader extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java index 96c780813..8eb987a94 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java @@ -46,6 +46,7 @@ import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesLegend extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java index cb03dff54..24d4acb37 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandMultilinesTitle extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace.java b/src/net/sourceforge/plantuml/command/CommandNamespace.java index 5863d3518..bd66debd8 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -57,6 +56,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespace extends SingleLineCommand2 { @@ -74,7 +74,7 @@ public class CommandNamespace extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace2.java b/src/net/sourceforge/plantuml/command/CommandNamespace2.java index a81912b87..7f7d8754e 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace2.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -55,6 +54,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespace2 extends SingleLineCommand2 { @@ -78,7 +78,7 @@ public class CommandNamespace2 extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java index 9d3266238..04df5278c 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -55,6 +54,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNamespaceEmpty extends SingleLineCommand2 { @@ -70,7 +70,7 @@ public class CommandNamespaceEmpty extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/CommandNope.java b/src/net/sourceforge/plantuml/command/CommandNope.java index c4d067510..739051bdb 100644 --- a/src/net/sourceforge/plantuml/command/CommandNope.java +++ b/src/net/sourceforge/plantuml/command/CommandNope.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNope extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index bf24abdd0..8d29bc7db 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -64,6 +62,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandPackage extends SingleLineCommand2 { @@ -90,7 +90,7 @@ public class CommandPackage extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), new RegexLeaf("\\{"), RegexLeaf.end()); diff --git a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java index f767160bc..4205ccee2 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.IGroup; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; @@ -52,6 +50,8 @@ import net.sourceforge.plantuml.cucadiagram.Ident; 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/CommandPage.java b/src/net/sourceforge/plantuml/command/CommandPage.java index 11abc0224..43a71f1e5 100644 --- a/src/net/sourceforge/plantuml/command/CommandPage.java +++ b/src/net/sourceforge/plantuml/command/CommandPage.java @@ -36,11 +36,11 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandPage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandPragma.java b/src/net/sourceforge/plantuml/command/CommandPragma.java index cb264b6b1..882987cb1 100644 --- a/src/net/sourceforge/plantuml/command/CommandPragma.java +++ b/src/net/sourceforge/plantuml/command/CommandPragma.java @@ -37,8 +37,6 @@ package net.sourceforge.plantuml.command; import java.util.StringTokenizer; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +44,8 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils; +import net.sourceforge.plantuml.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 3f4141536..72ec58c40 100644 --- a/src/net/sourceforge/plantuml/command/CommandRankDir.java +++ b/src/net/sourceforge/plantuml/command/CommandRankDir.java @@ -34,15 +34,15 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.SkinParam; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Rankdir; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandRankDir extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandRotate.java b/src/net/sourceforge/plantuml/command/CommandRotate.java index 11cd8a386..4f0435cf4 100644 --- a/src/net/sourceforge/plantuml/command/CommandRotate.java +++ b/src/net/sourceforge/plantuml/command/CommandRotate.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandRotate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScale.java b/src/net/sourceforge/plantuml/command/CommandScale.java index b0f6c4a23..9c1277555 100644 --- a/src/net/sourceforge/plantuml/command/CommandScale.java +++ b/src/net/sourceforge/plantuml/command/CommandScale.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleSimple; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScale extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java index d04973ecf..989e3995b 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleMaxHeight; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java index 4e0921201..57633f179 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleMaxWidth; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxWidth extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java index 2b987fd2f..691ba73d8 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleMaxWidthAndHeight; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleMaxWidthAndHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java index faf41c20e..6b02d2fff 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java @@ -36,12 +36,12 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleWidthAndHeight; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleWidthAndHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java index 785aa603d..87887bd57 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java @@ -36,13 +36,13 @@ package net.sourceforge.plantuml.command; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.ScaleHeight; import net.sourceforge.plantuml.ScaleWidth; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandScaleWidthOrHeight extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParam.java b/src/net/sourceforge/plantuml/command/CommandSkinParam.java index b5950d196..da5bb303a 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParam.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParam.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.style.NoStyleAvailableException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSkinParam extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java index 02983ddf9..404acbc88 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java @@ -35,10 +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/CommandSpriteFile.java b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java index 518ec653c..14df14f97 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteFile.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java @@ -43,8 +43,6 @@ import java.util.zip.ZipInputStream; import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.FileUtils; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -55,6 +53,8 @@ import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.sprite.Sprite; import net.sourceforge.plantuml.sprite.SpriteImage; import net.sourceforge.plantuml.sprite.SpriteSvg; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.Log; public class CommandSpriteFile extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java b/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java index d09c3cdcd..4acecab70 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteSvg.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.emoji.SvgNanoParser; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSpriteSvg extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java b/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java index f4f02c5a4..0e4a5bcc3 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteSvgMultiline.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -43,6 +42,8 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.emoji.SvgNanoParser; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandSpriteSvgMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/command/CommandTitle.java b/src/net/sourceforge/plantuml/command/CommandTitle.java index fc7d29873..ae92c31b1 100644 --- a/src/net/sourceforge/plantuml/command/CommandTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandTitle.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.DisplayPositioned; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandTitle extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java index 6b407745b..6ba9ccf18 100644 --- a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java +++ b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.command; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public enum MultilinesStrategy { REMOVE_STARTING_QUOTE, KEEP_STARTING_QUOTE; diff --git a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java index e4130acc2..24ff1946a 100644 --- a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java @@ -39,13 +39,13 @@ import java.util.List; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.api.PSystemFactory; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class PSystemAbstractFactory implements PSystemFactory { diff --git a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java index 030c19906..cc00bc5c7 100644 --- a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java @@ -40,13 +40,13 @@ import java.util.Map; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemErrorUtils; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemBasicFactory

extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java index 1ebe6c5c2..45f7d371e 100644 --- a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java @@ -43,15 +43,16 @@ import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.EmbeddedDiagram; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemCommandFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java index 9c793fbcb..8492b4709 100644 --- a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java @@ -40,13 +40,13 @@ import java.util.Map; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.error.PSystemErrorUtils; +import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.IteratorCounter2; public abstract class PSystemSingleLineFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/command/Position.java b/src/net/sourceforge/plantuml/command/Position.java index 589016aa1..85234765c 100644 --- a/src/net/sourceforge/plantuml/command/Position.java +++ b/src/net/sourceforge/plantuml/command/Position.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.command; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.cucadiagram.Rankdir; +import net.sourceforge.plantuml.utils.Direction; public enum Position { RIGHT, LEFT, BOTTOM, TOP; diff --git a/src/net/sourceforge/plantuml/command/ProtectedCommand.java b/src/net/sourceforge/plantuml/command/ProtectedCommand.java index de8599d2a..e12c9c47f 100644 --- a/src/net/sourceforge/plantuml/command/ProtectedCommand.java +++ b/src/net/sourceforge/plantuml/command/ProtectedCommand.java @@ -37,9 +37,10 @@ package net.sourceforge.plantuml.command; import java.util.Objects; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; public class ProtectedCommand implements Command { diff --git a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java index 6d9cd4ffc..ffd785f58 100644 --- a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java +++ b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java @@ -37,14 +37,15 @@ package net.sourceforge.plantuml.command; import java.util.Objects; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.annotation.HaxeIgnored; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class SingleLineCommand2 implements Command { diff --git a/src/net/sourceforge/plantuml/command/SkinLoader.java b/src/net/sourceforge/plantuml/command/SkinLoader.java index 48444a418..a78737de1 100644 --- a/src/net/sourceforge/plantuml/command/SkinLoader.java +++ b/src/net/sourceforge/plantuml/command/SkinLoader.java @@ -38,12 +38,13 @@ package net.sourceforge.plantuml.command; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.style.NoStyleAvailableException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class SkinLoader { diff --git a/src/net/sourceforge/plantuml/command/Trim.java b/src/net/sourceforge/plantuml/command/Trim.java index 8333a8329..1593b35bc 100644 --- a/src/net/sourceforge/plantuml/command/Trim.java +++ b/src/net/sourceforge/plantuml/command/Trim.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.command; import java.util.regex.Pattern; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public enum Trim { BOTH, LEFT_ONLY; diff --git a/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java b/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java index 4becc8869..65bf224d1 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java +++ b/src/net/sourceforge/plantuml/command/note/CommandConstraintOnLinks.java @@ -37,9 +37,7 @@ package net.sourceforge.plantuml.command.note; import java.util.List; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -50,6 +48,8 @@ import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; public final class CommandConstraintOnLinks extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java index 8b2ec9031..bd666d1d7 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java @@ -35,11 +35,9 @@ */ package net.sourceforge.plantuml.command.note; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -58,6 +56,8 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; public final class CommandFactoryNote implements SingleMultiFactoryCommand { diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java index 3ea7688db..14b4d7d01 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteActivity.java @@ -35,14 +35,11 @@ */ package net.sourceforge.plantuml.command.note; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.activitydiagram.ActivityDiagram; import net.sourceforge.plantuml.baraye.IEntity; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -65,6 +62,9 @@ import net.sourceforge.plantuml.cucadiagram.LinkType; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.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 7d10f4a56..5597a7401 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java @@ -36,15 +36,12 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; import net.sourceforge.plantuml.classdiagram.command.CommandCreateClassMultilines; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -70,6 +67,9 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryCommand { @@ -100,7 +100,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf(":"), // RegexLeaf.spaceZeroOrMore(), // @@ -135,7 +135,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("\\{"), // RegexLeaf.end() // @@ -161,7 +161,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.end() // ); } diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java index 20f860bc3..8c75a4a34 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnLink.java @@ -35,13 +35,10 @@ */ package net.sourceforge.plantuml.command.note; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.CucaDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -59,6 +56,9 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.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 b2969fea3..77897db41 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java @@ -36,13 +36,11 @@ package net.sourceforge.plantuml.command.note; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -66,6 +64,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringUtils; public final class CommandFactoryTipOnEntity implements SingleMultiFactoryCommand { @@ -96,7 +96,7 @@ public final class CommandFactoryTipOnEntity implements SingleMultiFactoryComman RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("\\{"), // RegexLeaf.end() // @@ -119,7 +119,7 @@ public final class CommandFactoryTipOnEntity implements SingleMultiFactoryComman RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.end() // ); } diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java index 5648fe989..d8e6c7143 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java @@ -36,11 +36,9 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -62,6 +60,8 @@ import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; public final class FactorySequenceNoteAcrossCommand implements SingleMultiFactoryCommand { @@ -77,7 +77,8 @@ public final class FactorySequenceNoteAcrossCommand implements SingleMultiFactor RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), RegexLeaf.end() // + UrlBuilder.OPTIONAL, // + RegexLeaf.end() // ); } @@ -93,7 +94,7 @@ public final class FactorySequenceNoteAcrossCommand implements SingleMultiFactor RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf(":"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java index 1e7885d0a..37d866fbc 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java @@ -36,12 +36,9 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -64,6 +61,9 @@ import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteCommand implements SingleMultiFactoryCommand { @@ -82,7 +82,7 @@ public final class FactorySequenceNoteCommand implements SingleMultiFactoryComma RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.end()); } @@ -101,7 +101,7 @@ public final class FactorySequenceNoteCommand implements SingleMultiFactoryComma RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf(":"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java index 3b98bf9b7..c74916be3 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java @@ -36,12 +36,9 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -67,6 +64,9 @@ import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFactoryCommand { @@ -81,7 +81,7 @@ public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFacto RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.end()); } @@ -96,7 +96,7 @@ public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFacto RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf(":"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java index 9167410c4..1d55f7c9a 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java @@ -36,12 +36,9 @@ package net.sourceforge.plantuml.command.note.sequence; import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -63,6 +60,9 @@ import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiFactoryCommand { @@ -87,7 +87,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.end() // ); } @@ -113,7 +113,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf(":"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/command/regex/IRegex.java b/src/net/sourceforge/plantuml/command/regex/IRegex.java index c4eb45e0d..e06e5a562 100644 --- a/src/net/sourceforge/plantuml/command/regex/IRegex.java +++ b/src/net/sourceforge/plantuml/command/regex/IRegex.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.command.regex; import java.util.Iterator; import java.util.Map; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public interface IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/Matcher2.java b/src/net/sourceforge/plantuml/command/regex/Matcher2.java index 4354919a6..a8cc9ae33 100644 --- a/src/net/sourceforge/plantuml/command/regex/Matcher2.java +++ b/src/net/sourceforge/plantuml/command/regex/Matcher2.java @@ -40,7 +40,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.Log; +import net.sourceforge.plantuml.utils.Log; public class Matcher2 { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java b/src/net/sourceforge/plantuml/command/regex/RegexComposed.java index d88919ab7..b8de7e552 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexComposed.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public abstract class RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java b/src/net/sourceforge/plantuml/command/regex/RegexConcat.java index edc84c37e..2a9e2c861 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexConcat.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.command.regex; import java.util.concurrent.atomic.AtomicLong; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public final class RegexConcat extends RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java b/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java index 7b0c1b27f..ff5c4f91e 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java @@ -36,16 +36,14 @@ package net.sourceforge.plantuml.command.regex; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.Set; import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.annotation.HaxeIgnored; +import net.sourceforge.plantuml.utils.StringLocated; public class RegexLeaf implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java b/src/net/sourceforge/plantuml/command/regex/RegexOptional.java index eb0c23224..f6f9c338d 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexOptional.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.command.regex; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public class RegexOptional extends RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOr.java b/src/net/sourceforge/plantuml/command/regex/RegexOr.java index a63afc241..9f1ca7bc2 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOr.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexOr.java @@ -39,8 +39,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.annotation.HaxeIgnored; +import net.sourceforge.plantuml.utils.StringLocated; public class RegexOr extends RegexComposed implements IRegex { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java index 221cfb54f..101b98d56 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.compositediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java index 8a130cca6..774039f75 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.compositediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IGroup; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackageBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java index 3816152ab..ab8033a48 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.compositediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.compositediagram.CompositeDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndPackageBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java index 86fc1daa3..1d60638d6 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java @@ -34,7 +34,6 @@ */ package net.sourceforge.plantuml.compositediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.LinkArg; import net.sourceforge.plantuml.cucadiagram.LinkDecor; import net.sourceforge.plantuml.cucadiagram.LinkType; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLinkBlock extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/core/UmlSource.java b/src/net/sourceforge/plantuml/core/UmlSource.java index 0005d1b60..f638ede71 100755 --- a/src/net/sourceforge/plantuml/core/UmlSource.java +++ b/src/net/sourceforge/plantuml/core/UmlSource.java @@ -41,14 +41,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.regex.Matcher2; import net.sourceforge.plantuml.command.regex.MyPattern; import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.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 8ce18fd89..d286ecb16 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/command/CommandCreoleUrl.java b/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java index 8163598d3..9cc1c6c13 100644 --- a/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java +++ b/src/net/sourceforge/plantuml/creole/command/CommandCreoleUrl.java @@ -61,17 +61,17 @@ public class CommandCreoleUrl implements Command { public int matchingSize(String line) { final Matcher2 m = pattern.matcher(line); - if (m.find() == false) { + if (m.find() == false) return 0; - } + return m.group(1).length(); } public String executeAndGetRemaining(String line, StripeSimple stripe) { final Matcher2 m = pattern.matcher(line); - if (m.find() == false) { + if (m.find() == false) throw new IllegalStateException(); - } + final UrlBuilder urlBuilder = new UrlBuilder(stripe.getSkinParam().getValue("topurl"), UrlMode.STRICT); final Url url = urlBuilder.getUrl(m.group(1)); stripe.addUrl(url); diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java index 77220f706..8178070f5 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java @@ -40,8 +40,6 @@ import java.util.List; import java.util.StringTokenizer; import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.creole.Neutron; @@ -55,6 +53,8 @@ import net.sourceforge.plantuml.ugraphic.UText; 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 500b4ae2e..8f40c9b3a 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleParser.java @@ -45,7 +45,6 @@ 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; @@ -60,6 +59,7 @@ 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 27866a4fb..0bf1ca8ed 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java +++ b/src/net/sourceforge/plantuml/creole/legacy/CreoleStripeSimpleParser.java @@ -39,7 +39,6 @@ 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; @@ -50,6 +49,7 @@ 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 4123872e9..3c1d1fc47 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodierLikeClassOrObject.java @@ -42,7 +42,6 @@ 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; @@ -55,6 +54,7 @@ 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 6a9f10156..d7a4d7552 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced1.java @@ -43,7 +43,6 @@ 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; @@ -61,6 +60,7 @@ 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 415f82e37..9f40e75e8 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java @@ -42,7 +42,6 @@ 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; @@ -51,6 +50,7 @@ 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 823cf0fdb..284808445 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java @@ -36,7 +36,6 @@ 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; @@ -48,6 +47,7 @@ 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 639130f76..254ed9758 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/Display.java b/src/net/sourceforge/plantuml/cucadiagram/Display.java index dac2357a4..7c80fbfec 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Display.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Display.java @@ -50,7 +50,6 @@ import net.sourceforge.plantuml.Guillemet; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.SpriteContainer; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; import net.sourceforge.plantuml.command.regex.Matcher2; @@ -78,6 +77,7 @@ import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.StringLocated; public class Display implements Iterable { diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java index 40403e3a5..9d14f9691 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java @@ -43,7 +43,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.baraye.EntityFactory; import net.sourceforge.plantuml.baraye.IGroup; @@ -58,6 +57,7 @@ import net.sourceforge.plantuml.svek.PackageStyle; import net.sourceforge.plantuml.svek.SingleStrategy; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.LineLocation; public class GroupRoot implements IGroup { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Ident.java b/src/net/sourceforge/plantuml/cucadiagram/Ident.java index aabd009dd..4f9058976 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 e06986b6e..cd355b4e0 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.StringUtils; +import net.sourceforge.plantuml.utils.StringUtils; public enum LeafType { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Link.java b/src/net/sourceforge/plantuml/cucadiagram/Link.java index 8d07b3636..a66e3ecd0 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Link.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Link.java @@ -39,11 +39,9 @@ import java.util.Objects; import net.sourceforge.plantuml.Hideable; import net.sourceforge.plantuml.ISkinSimple; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.Removeable; import net.sourceforge.plantuml.SpecificBackcolorable; -import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.baraye.EntityImp; @@ -61,6 +59,7 @@ import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.ugraphic.UComment; import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.utils.LineLocation; public class Link extends WithLinkType implements Hideable, Removeable { diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java b/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java index d28b434ec..5c4a9ec74 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java @@ -35,8 +35,8 @@ */ package net.sourceforge.plantuml.cucadiagram; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.svek.GuideLine; +import net.sourceforge.plantuml.utils.Direction; public enum LinkArrow { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Member.java b/src/net/sourceforge/plantuml/cucadiagram/Member.java index 6e1d62d75..ca9aa677d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Member.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Member.java @@ -36,7 +36,6 @@ 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; @@ -44,6 +43,7 @@ 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 c698ae156..e68174241 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java @@ -44,7 +44,6 @@ 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; @@ -74,6 +73,7 @@ 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 44530cf38..67bb0e73f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java +++ b/src/net/sourceforge/plantuml/cucadiagram/StereotypeDecoration.java @@ -40,7 +40,6 @@ 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; @@ -55,6 +54,7 @@ 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 d0a148d5a..734bf2d89 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java @@ -42,11 +42,11 @@ import java.util.List; import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Log; 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 d048ff770..31c92c7c9 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java @@ -48,7 +48,6 @@ 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; @@ -64,6 +63,7 @@ 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 29714a195..b58b9abd0 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.Log; -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 c3dfde9b8..703711ca4 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.StringUtils; +import net.sourceforge.plantuml.utils.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 744282e6d..e8325db93 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/CommandCreateDomain.java b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java index 35b266512..bff55fbc4 100644 --- a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.descdiagram; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -60,6 +59,7 @@ import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateDomain extends SingleLineCommand2 { public static final String DISPLAY_WITH_GENERIC = "[%g](.+?)(?:\\<(" + GenericRegexProducer.PATTERN + ")\\>)?[%g]"; diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java index 6b39cceaf..f4cfbb3ee 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java @@ -38,7 +38,6 @@ 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; @@ -48,6 +47,7 @@ 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 93ccc7e3d..352fe65e1 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java @@ -36,8 +36,6 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -58,6 +56,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.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 ba04ff52c..a33b6bdd3 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java @@ -36,11 +36,9 @@ 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; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -60,6 +58,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandArchimateMultilines extends CommandMultilines2 { @@ -86,7 +86,7 @@ public class CommandArchimateMultilines extends CommandMultilines2\\>)") // )), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java index 8297539a9..b3be2d33d 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -37,8 +37,6 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -69,6 +67,8 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandCreateElementFull extends SingleLineCommand2 { @@ -126,7 +126,7 @@ public class CommandCreateElementFull extends SingleLineCommand2 { @@ -97,7 +97,7 @@ public class CommandCreateElementMultilines extends CommandMultilines2\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // @@ -114,7 +114,7 @@ public class CommandCreateElementMultilines extends CommandMultilines2\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java index af5a631ac..3be2ed95b 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementParenthesis.java @@ -36,8 +36,6 @@ package net.sourceforge.plantuml.descdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -65,6 +63,8 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandCreateElementParenthesis extends SingleLineCommand2 { @@ -119,7 +119,7 @@ public class CommandCreateElementParenthesis extends SingleLineCommand2\\>)") // )), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java index 1f17ef39e..51e14f188 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java @@ -35,9 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -62,6 +59,9 @@ import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.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/CommandNewpage.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java index 5e0ab366f..6d311d739 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.NewpagedDiagram; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewpage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index dd65eca55..8f304d77d 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.descdiagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -64,6 +62,8 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandPackageWithUSymbol extends SingleLineCommand2 { @@ -123,7 +123,7 @@ public class CommandPackageWithUSymbol extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java index b6b01383d..79e54b7e5 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandCommentMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java index 7096a9f0f..0405a9b66 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandCommentMultilines2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandCommentMultilines2 extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java b/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java index 6dba8bba0..8e2263182 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.ebnf; import java.util.Collections; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -48,6 +45,9 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandEBnfSingleLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java index 8160df698..c47d75d03 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandEbnfMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java index 7119001a1..44dc925cf 100644 --- a/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java +++ b/src/net/sourceforge/plantuml/ebnf/CommandNoteMultilines.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/ebnf/ETileBox.java b/src/net/sourceforge/plantuml/ebnf/ETileBox.java index d88ac8a39..c1311b90c 100644 --- a/src/net/sourceforge/plantuml/ebnf/ETileBox.java +++ b/src/net/sourceforge/plantuml/ebnf/ETileBox.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.ebnf; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -55,6 +54,7 @@ import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.utils.Direction; public class ETileBox extends ETile { diff --git a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java index c63830d20..f80334559 100644 --- a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java +++ b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java @@ -50,6 +50,7 @@ import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.CharInspector; public class EbnfExpression implements TextBlockable { @@ -58,11 +59,11 @@ public class EbnfExpression implements TextBlockable { private final String commentAbove; private final String commentBelow; - public static EbnfExpression create(CharIterator it, boolean isCompact, String commentAbove, String commentBelow) { + public static EbnfExpression create(CharInspector it, boolean isCompact, String commentAbove, String commentBelow) { return new EbnfExpression(it, isCompact, commentAbove, commentBelow); } - private EbnfExpression(CharIterator it, boolean isCompact, String commentAbove, String commentBelow) { + private EbnfExpression(CharInspector it, boolean isCompact, String commentAbove, String commentBelow) { this.isCompact = isCompact; this.commentAbove = commentAbove; this.commentBelow = commentBelow; @@ -210,7 +211,7 @@ public class EbnfExpression implements TextBlockable { return engine.getTextBlock(); } - private String readString(CharIterator it) { + private String readString(CharInspector it) { final char separator = it.peek(0); it.next(); final StringBuilder sb = new StringBuilder(); @@ -223,7 +224,7 @@ public class EbnfExpression implements TextBlockable { } } - private String readLitteral(CharIterator it) { + private String readLitteral(CharInspector it) { final StringBuilder sb = new StringBuilder(); while (true) { final char ch = it.peek(0); @@ -234,7 +235,7 @@ public class EbnfExpression implements TextBlockable { } } - private String readComment(CharIterator it) { + private String readComment(CharInspector it) { final StringBuilder sb = new StringBuilder(); it.next(); it.next(); diff --git a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java index ad20c2ed7..4e2e8ee14 100644 --- a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java +++ b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java @@ -45,7 +45,6 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; @@ -59,6 +58,8 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.TextBlockBackcolored; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.CharInspector; public class PSystemEbnf extends TitledDiagram { @@ -74,7 +75,7 @@ public class PSystemEbnf extends TitledDiagram { public CommandExecutionResult addBlocLines(BlocLines blines, String commentAbove, String commentBelow) { final boolean isCompact = getPragma().isDefine("compact"); - final CharIterator it = new CharIteratorImpl(blines); + final CharInspector it = blines.inspector(); final EbnfExpression tmp1 = EbnfExpression.create(it, isCompact, commentAbove, commentBelow); if (tmp1.isEmpty()) return CommandExecutionResult.error("Unparsable expression"); diff --git a/src/net/sourceforge/plantuml/eggs/EggUtils.java b/src/net/sourceforge/plantuml/eggs/EggUtils.java index 17af85f52..75649e112 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.StringUtils; +import net.sourceforge.plantuml.utils.StringUtils; public class EggUtils { diff --git a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java index 80cc3c238..85440bbe1 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.eggs; import java.io.IOException; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; public class PSystemAppleTwoFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java index 24e64d444..30a45d457 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.eggs; import java.io.IOException; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; public class PSystemRIPFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index 7339e07c8..602500fa6 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -49,7 +49,6 @@ 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; @@ -133,6 +132,7 @@ import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.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 a86df093a..a3ab00cb8 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/eps/EpsGraphics.java b/src/net/sourceforge/plantuml/eps/EpsGraphics.java index ee6d022e6..25ce4d8c5 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphics.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphics.java @@ -42,7 +42,6 @@ import java.util.Locale; import java.util.StringTokenizer; import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.ugraphic.ShadowManager; import net.sourceforge.plantuml.ugraphic.UPath; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.ugraphic.USegment; import net.sourceforge.plantuml.ugraphic.USegmentType; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.utils.MathUtils; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/error/PSystemError.java b/src/net/sourceforge/plantuml/error/PSystemError.java index 0bd4e252b..d4016cb3c 100644 --- a/src/net/sourceforge/plantuml/error/PSystemError.java +++ b/src/net/sourceforge/plantuml/error/PSystemError.java @@ -49,10 +49,8 @@ import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.FileImageData; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.PlainDiagram; import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.asciiart.UmlCharArea; import net.sourceforge.plantuml.awt.geom.XDimension2D; @@ -91,6 +89,8 @@ import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColorSimple; import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.txt.UGraphicTxt; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; import net.sourceforge.plantuml.version.LicenseInfo; import net.sourceforge.plantuml.version.PSystemVersion; import net.sourceforge.plantuml.version.Version; diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java b/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java index d8a2d03ed..2fac42105 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorEmpty.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.error; import java.util.List; import net.sourceforge.plantuml.ErrorUml; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.StringLocated; public class PSystemErrorEmpty extends PSystemError { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java b/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java index fb7303c91..809148f9c 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorPreprocessor.java @@ -38,9 +38,9 @@ import java.util.List; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.ErrorUmlType; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.StringLocated; public class PSystemErrorPreprocessor extends PSystemError { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java b/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java index fd1e9f1af..53f7e7e77 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorUtils.java @@ -39,9 +39,9 @@ import java.util.Collection; import java.util.List; import net.sourceforge.plantuml.ErrorUml; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.StringLocated; public class PSystemErrorUtils { diff --git a/src/net/sourceforge/plantuml/error/PSystemErrorV2.java b/src/net/sourceforge/plantuml/error/PSystemErrorV2.java index 5a09ab38e..48c4d5117 100644 --- a/src/net/sourceforge/plantuml/error/PSystemErrorV2.java +++ b/src/net/sourceforge/plantuml/error/PSystemErrorV2.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.error; import java.util.List; import net.sourceforge.plantuml.ErrorUml; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.StringLocated; public class PSystemErrorV2 extends PSystemError { diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java index 13b11e72e..82bc03927 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java @@ -47,7 +47,7 @@ import ext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter; import ext.plantuml.com.google.zxing.common.BitMatrix; import ext.plantuml.com.google.zxing.qrcode.QRCodeWriter; import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import net.sourceforge.plantuml.Log; +import net.sourceforge.plantuml.utils.Log; public class FlashCodeUtilsZxing implements FlashCodeUtils { diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java index 67b058936..a4817a6b7 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.flowdiagram; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.golem.TileGeometry; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLineSimple extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java index 70303218b..efb7141a9 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.flowdiagram; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.golem.TileGeometry; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java b/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java index f448262a5..44e0b0078 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 31be1f01c..1dc9c74dd 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/gitlog/GitDiagramFactory.java b/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java index d16585589..6638e51f9 100644 --- a/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java +++ b/src/net/sourceforge/plantuml/gitlog/GitDiagramFactory.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.gitlog; import java.util.Iterator; import java.util.Map; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.command.PSystemAbstractFactory; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.StringLocated; public class GitDiagramFactory extends PSystemAbstractFactory { diff --git a/src/net/sourceforge/plantuml/golem/TileGeometry.java b/src/net/sourceforge/plantuml/golem/TileGeometry.java index ee34b047e..96435b73d 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.StringUtils; +import net.sourceforge.plantuml.utils.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 6d8b3ed8b..466017956 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 40d8aafe6..2c99abd49 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 6d2b37570..8431f34fe 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 ddf4b0a82..eeda8ea3e 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 ad3e96988..3afdd2db2 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.StringUtils; +import net.sourceforge.plantuml.utils.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 b077fc321..c374cd5da 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/TextBlockArrow.java b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java index c411fc5ad..bcb6aff5e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.graphic; import java.util.Objects; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; public class TextBlockArrow extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/TileText.java b/src/net/sourceforge/plantuml/graphic/TileText.java index 2c2501ed9..ad4618121 100644 --- a/src/net/sourceforge/plantuml/graphic/TileText.java +++ b/src/net/sourceforge/plantuml/graphic/TileText.java @@ -37,12 +37,12 @@ package net.sourceforge.plantuml.graphic; import java.util.StringTokenizer; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UText; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Log; public class TileText extends AbstractTextBlock implements TextBlock { diff --git a/src/net/sourceforge/plantuml/graphic/USymbols.java b/src/net/sourceforge/plantuml/graphic/USymbols.java index d314e24bf..7939e1a9b 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 54bcc5581..3e2352c73 100644 --- a/src/net/sourceforge/plantuml/graphic/color/Colors.java +++ b/src/net/sourceforge/plantuml/graphic/color/Colors.java @@ -43,7 +43,6 @@ 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; @@ -51,6 +50,7 @@ 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/graphml/CucaDiagramGraphmlMaker.java b/src/net/sourceforge/plantuml/graphml/CucaDiagramGraphmlMaker.java index 15f4e9d5d..f6cf93ba4 100644 --- a/src/net/sourceforge/plantuml/graphml/CucaDiagramGraphmlMaker.java +++ b/src/net/sourceforge/plantuml/graphml/CucaDiagramGraphmlMaker.java @@ -41,11 +41,11 @@ import java.io.OutputStream; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.cucadiagram.ICucaDiagram; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.xmi.XmlDiagramTransformer; public final class CucaDiagramGraphmlMaker { diff --git a/src/net/sourceforge/plantuml/help/CommandHelp.java b/src/net/sourceforge/plantuml/help/CommandHelp.java index e3cd275f7..4796d0f05 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelp.java +++ b/src/net/sourceforge/plantuml/help/CommandHelp.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.help; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelp extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpColor.java b/src/net/sourceforge/plantuml/help/CommandHelpColor.java index e3743627c..2febb408b 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpColor.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpColor.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.help; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpColor extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpFont.java b/src/net/sourceforge/plantuml/help/CommandHelpFont.java index 55de1036b..2868530f9 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpFont.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpFont.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.help; import java.awt.GraphicsEnvironment; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpFont extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java b/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java index e1a2db6ea..983f00f78 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpKeyword.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.help; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.syntax.LanguageDescriptor; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpKeyword extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java b/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java index 99007f16a..29c8f2e2a 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpSkinparam.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.help; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpSkinparam extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpTheme.java b/src/net/sourceforge/plantuml/help/CommandHelpTheme.java index e5d0b2321..2245a91b0 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpTheme.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpTheme.java @@ -37,8 +37,6 @@ package net.sourceforge.plantuml.help; import java.io.IOException; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -47,6 +45,8 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.theme.ThemeUtils; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.Log; public class CommandHelpTheme extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/help/CommandHelpType.java b/src/net/sourceforge/plantuml/help/CommandHelpType.java index defcebda8..d7c8e7171 100644 --- a/src/net/sourceforge/plantuml/help/CommandHelpType.java +++ b/src/net/sourceforge/plantuml/help/CommandHelpType.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.help; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.syntax.LanguageDescriptor; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHelpType extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java b/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java index 3bb4f26f5..1bab25345 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 7028fadd3..5c7b67d02 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 0b3e00aee..7ff6011ad 100644 --- a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java +++ b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java @@ -40,8 +40,6 @@ import java.io.StringReader; import java.util.Properties; import net.sourceforge.plantuml.BackSlash; -import net.sourceforge.plantuml.Log; -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; @@ -49,6 +47,8 @@ import net.sourceforge.plantuml.command.regex.Pattern2; import net.sourceforge.plantuml.core.DiagramType; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.utils.Log; +import net.sourceforge.plantuml.utils.StringUtils; public class PSystemJcckitFactory extends PSystemBasicFactory { diff --git a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java index 5a40cb272..796cbb766 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java +++ b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java @@ -40,11 +40,11 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; -import net.sourceforge.plantuml.style.StyleLoader; +import net.sourceforge.plantuml.style.parser.StyleParser; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class StyleExtractor { @@ -112,7 +112,7 @@ public class StyleExtractor { if (style.size() > 0) { final StyleBuilder styleBuilder = skinParam.getCurrentStyleBuilder(); final BlocLines blocLines = BlocLines.from(style); - for (Style modifiedStyle : StyleLoader.getDeclaredStyles(blocLines.subExtract(1, 1), styleBuilder)) { + for (Style modifiedStyle : StyleParser.parse(blocLines.subExtract(1, 1), styleBuilder)) { skinParam.muteStyle(modifiedStyle); } } diff --git a/src/net/sourceforge/plantuml/math/PSystemLatex.java b/src/net/sourceforge/plantuml/math/PSystemLatex.java index 1f5d6d8cc..4230c7f54 100644 --- a/src/net/sourceforge/plantuml/math/PSystemLatex.java +++ b/src/net/sourceforge/plantuml/math/PSystemLatex.java @@ -41,7 +41,6 @@ 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; @@ -49,6 +48,7 @@ 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 6d63b3520..b58004e75 100644 --- a/src/net/sourceforge/plantuml/math/PSystemMath.java +++ b/src/net/sourceforge/plantuml/math/PSystemMath.java @@ -41,7 +41,6 @@ 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; @@ -49,6 +48,7 @@ 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/math/ScientificEquationSafe.java b/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java index 15dc1484d..2b359e61f 100644 --- a/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java +++ b/src/net/sourceforge/plantuml/math/ScientificEquationSafe.java @@ -47,7 +47,6 @@ import java.util.Arrays; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.eps.EpsGraphics; @@ -59,6 +58,7 @@ import net.sourceforge.plantuml.ugraphic.AffineTransformType; import net.sourceforge.plantuml.ugraphic.MutableImage; import net.sourceforge.plantuml.ugraphic.PixelImage; import net.sourceforge.plantuml.ugraphic.UImageSvg; +import net.sourceforge.plantuml.utils.Log; public class ScientificEquationSafe { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java index 26f4c52e0..027dfcc81 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.mindmap; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.Direction; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapDirection extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java index 0f498f957..fc78c1d2b 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.mindmap; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapOrgmode extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java index 872aa42f6..64bcfe699 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java @@ -37,8 +37,6 @@ package net.sourceforge.plantuml.mindmap; import java.util.List; -import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -51,6 +49,8 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandMindMapOrgmodeMultiline extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java index 810ffa055..1817202db 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapPlus.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.mindmap; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapPlus extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java index 316b0f468..3e612c91b 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapRoot.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.mindmap; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandMindMapRoot extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java index 15a8e910f..9b730fb16 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java @@ -40,7 +40,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.UmlDiagram; @@ -60,6 +59,7 @@ import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Direction; public class MindMapDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandComment.java b/src/net/sourceforge/plantuml/nwdiag/CommandComment.java index 4cf9abcf6..e8d366369 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandComment.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandComment.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandComment extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandElement.java b/src/net/sourceforge/plantuml/nwdiag/CommandElement.java index 61d3a104a..27a8ac92d 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandElement.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandElement.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandElement extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java b/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java index fb8619bc8..da1f7ddea 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandEndSomething.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndSomething extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java b/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java index edf6d04f7..cd9a566b2 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandGroup.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroup extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandLink.java b/src/net/sourceforge/plantuml/nwdiag/CommandLink.java index 47957d38c..1c0202eee 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandLink.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandLink.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLink extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java index 39d736680..ac74b2cee 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNetwork extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java b/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java index aa880fe1a..84da129c8 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandNwDiagInit.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNwDiagInit extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java b/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java index de04d6547..f6565db81 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandProperty.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.nwdiag; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandProperty extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java index 0edf1ea7b..db35b3be9 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.objectdiagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddData extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java index c6c59d40f..2afc6441e 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.objectdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -56,6 +55,7 @@ import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateEntityObject extends SingleLineCommand2 { @@ -71,7 +71,7 @@ public class CommandCreateEntityObject extends SingleLineCommand2\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java index 871329601..9dd3f0200 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java @@ -36,10 +36,8 @@ package net.sourceforge.plantuml.objectdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.IEntity; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -58,6 +56,8 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateEntityObjectMultilines extends CommandMultilines2 { @@ -73,7 +73,7 @@ public class CommandCreateEntityObjectMultilines extends CommandMultilines2\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java index 75b96be35..9dfa19771 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java @@ -36,11 +36,9 @@ package net.sourceforge.plantuml.objectdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandControl; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; @@ -62,6 +60,8 @@ import net.sourceforge.plantuml.json.Json.DefaultHandler; import net.sourceforge.plantuml.json.JsonParser; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateJson extends CommandMultilines2 { @@ -77,7 +77,7 @@ public class CommandCreateJson extends CommandMultilines2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java index 593a61819..8d3254d43 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.objectdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; @@ -58,6 +57,7 @@ import net.sourceforge.plantuml.json.JsonParser; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateJsonSingleLine extends SingleLineCommand2 { @@ -73,7 +73,7 @@ public class CommandCreateJsonSingleLine extends SingleLineCommand2\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java index 639e8bf43..c9fb8ea8f 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java @@ -36,12 +36,10 @@ package net.sourceforge.plantuml.objectdiagram.command; import net.sourceforge.plantuml.FontParam; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.ILeaf; import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -66,6 +64,8 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandCreateMap extends CommandMultilines2 { @@ -81,7 +81,7 @@ public class CommandCreateMap extends CommandMultilines2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java index 4856e46ae..c7ca72b04 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 c39bf4c02..55a92aec8 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 69e321cad..255ae9173 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.StringUtils; +import net.sourceforge.plantuml.utils.StringUtils; public class SvgCommandLetter implements SvgCommand { diff --git a/src/net/sourceforge/plantuml/oregon/MagicTable.java b/src/net/sourceforge/plantuml/oregon/MagicTable.java index af7d17d44..b4b4b11c7 100644 --- a/src/net/sourceforge/plantuml/oregon/MagicTable.java +++ b/src/net/sourceforge/plantuml/oregon/MagicTable.java @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import net.sourceforge.plantuml.Log; +import net.sourceforge.plantuml.utils.Log; public class MagicTable { diff --git a/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java b/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java index e5f5e450d..ae105f462 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.StringUtils; +import net.sourceforge.plantuml.utils.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 c516652cf..096f8a364 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 fb7ac92fb..649afad67 100644 --- a/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java +++ b/src/net/sourceforge/plantuml/picoweb/PicoWebServer.java @@ -57,11 +57,8 @@ import net.sourceforge.plantuml.BlockUml; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.LineLocationImpl; import net.sourceforge.plantuml.Option; import net.sourceforge.plantuml.SourceStringReader; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.code.Transcoder; import net.sourceforge.plantuml.code.TranscoderUtil; import net.sourceforge.plantuml.core.Diagram; @@ -74,6 +71,9 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.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/png/PngIO.java b/src/net/sourceforge/plantuml/png/PngIO.java index bbea9fac6..ad701907d 100644 --- a/src/net/sourceforge/plantuml/png/PngIO.java +++ b/src/net/sourceforge/plantuml/png/PngIO.java @@ -40,11 +40,11 @@ import java.awt.image.RenderedImage; import java.io.IOException; import java.io.OutputStream; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.quantization.Quantizer; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.utils.Log; public class PngIO { diff --git a/src/net/sourceforge/plantuml/png/PngIOMetadata.java b/src/net/sourceforge/plantuml/png/PngIOMetadata.java index 1eca28da5..fcab80d7a 100644 --- a/src/net/sourceforge/plantuml/png/PngIOMetadata.java +++ b/src/net/sourceforge/plantuml/png/PngIOMetadata.java @@ -50,8 +50,8 @@ import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadataNode; import javax.imageio.stream.ImageOutputStream; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.security.SImageIO; +import net.sourceforge.plantuml.utils.Log; public class PngIOMetadata { diff --git a/src/net/sourceforge/plantuml/png/PngRotation.java b/src/net/sourceforge/plantuml/png/PngRotation.java index 4ca1189f0..4e41bcee1 100644 --- a/src/net/sourceforge/plantuml/png/PngRotation.java +++ b/src/net/sourceforge/plantuml/png/PngRotation.java @@ -39,7 +39,7 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import net.sourceforge.plantuml.Log; +import net.sourceforge.plantuml.utils.Log; public class PngRotation { diff --git a/src/net/sourceforge/plantuml/png/PngSizer.java b/src/net/sourceforge/plantuml/png/PngSizer.java index 2c1952599..96e41c31e 100644 --- a/src/net/sourceforge/plantuml/png/PngSizer.java +++ b/src/net/sourceforge/plantuml/png/PngSizer.java @@ -39,7 +39,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.image.BufferedImage; -import net.sourceforge.plantuml.Log; +import net.sourceforge.plantuml.utils.Log; public class PngSizer { diff --git a/src/net/sourceforge/plantuml/png/PngSplitter.java b/src/net/sourceforge/plantuml/png/PngSplitter.java index a83586599..2c7796d44 100644 --- a/src/net/sourceforge/plantuml/png/PngSplitter.java +++ b/src/net/sourceforge/plantuml/png/PngSplitter.java @@ -42,12 +42,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.SplitParam; import net.sourceforge.plantuml.SuggestedFile; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SImageIO; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; +import net.sourceforge.plantuml.utils.Log; public class PngSplitter { diff --git a/src/net/sourceforge/plantuml/posimo/DotxMaker.java b/src/net/sourceforge/plantuml/posimo/DotxMaker.java index ac2e964ab..fbb276efc 100644 --- a/src/net/sourceforge/plantuml/posimo/DotxMaker.java +++ b/src/net/sourceforge/plantuml/posimo/DotxMaker.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.posimo; import java.util.Collection; import java.util.Objects; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.awt.geom.XDimension2D; +import net.sourceforge.plantuml.utils.Log; public class DotxMaker { diff --git a/src/net/sourceforge/plantuml/preproc/Defines.java b/src/net/sourceforge/plantuml/preproc/Defines.java index 321db7c40..ed35c72e4 100644 --- a/src/net/sourceforge/plantuml/preproc/Defines.java +++ b/src/net/sourceforge/plantuml/preproc/Defines.java @@ -51,7 +51,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.plantuml.AParentFolder; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.api.ApiWarning; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityProfile; @@ -59,6 +58,7 @@ import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.version.Version; public class Defines implements Truth { diff --git a/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java b/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java index df0082db6..c4b9f1822 100644 --- a/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java +++ b/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java @@ -51,8 +51,8 @@ import java.util.zip.ZipInputStream; import net.sourceforge.plantuml.AFile; import net.sourceforge.plantuml.AFileRegular; import net.sourceforge.plantuml.AParentFolder; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.utils.Log; public class FileWithSuffix { diff --git a/src/net/sourceforge/plantuml/preproc/ImportedFiles.java b/src/net/sourceforge/plantuml/preproc/ImportedFiles.java index 8ad73ec41..59db062a1 100644 --- a/src/net/sourceforge/plantuml/preproc/ImportedFiles.java +++ b/src/net/sourceforge/plantuml/preproc/ImportedFiles.java @@ -44,10 +44,10 @@ import net.sourceforge.plantuml.AFile; import net.sourceforge.plantuml.AFileRegular; import net.sourceforge.plantuml.AFileZipEntry; import net.sourceforge.plantuml.AParentFolder; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.OptionFlags; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.utils.Log; public class ImportedFiles { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLine.java b/src/net/sourceforge/plantuml/preproc/ReadLine.java index 496565d78..63c31fb3e 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLine.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.preproc; import java.io.Closeable; import java.io.IOException; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public interface ReadLine extends Closeable { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineList.java b/src/net/sourceforge/plantuml/preproc/ReadLineList.java index 10c08fcdf..0ac095756 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineList.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineList.java @@ -38,8 +38,8 @@ package net.sourceforge.plantuml.preproc; import java.util.Iterator; import java.util.List; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; public class ReadLineList implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java index 641e0bb3d..a4ecdf26e 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java @@ -39,10 +39,10 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.LineLocationImpl; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.LineLocationImpl; +import net.sourceforge.plantuml.utils.Log; +import net.sourceforge.plantuml.utils.StringLocated; public class ReadLineReader implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java b/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java index b09d81583..5efd6237e 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineSimple.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.preproc; -import net.sourceforge.plantuml.StringLocated; +import net.sourceforge.plantuml.utils.StringLocated; public class ReadLineSimple implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java index ca87123dc..dfc90c0fb 100644 --- a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java +++ b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java @@ -41,12 +41,12 @@ import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.Charset; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc2.ReadFilterMergeLines; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.utils.Log; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; public class StartDiagramExtractReader implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc/Stdlib.java b/src/net/sourceforge/plantuml/preproc/Stdlib.java index 0227eced5..fa9a59333 100644 --- a/src/net/sourceforge/plantuml/preproc/Stdlib.java +++ b/src/net/sourceforge/plantuml/preproc/Stdlib.java @@ -26,12 +26,12 @@ import java.util.regex.Pattern; import javax.imageio.ImageIO; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.brotli.BrotliInputStream; import net.sourceforge.plantuml.code.Base64Coder; import net.sourceforge.plantuml.creole.atom.AtomImg; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.utils.Log; public class Stdlib { diff --git a/src/net/sourceforge/plantuml/preproc/Sub.java b/src/net/sourceforge/plantuml/preproc/Sub.java index af47b4150..62d71d6ac 100644 --- a/src/net/sourceforge/plantuml/preproc/Sub.java +++ b/src/net/sourceforge/plantuml/preproc/Sub.java @@ -40,12 +40,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TLineType; import net.sourceforge.plantuml.tim.TMemory; +import net.sourceforge.plantuml.utils.StringLocated; public class Sub { diff --git a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java index bb965e20f..567dc979d 100644 --- a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java @@ -37,11 +37,11 @@ package net.sourceforge.plantuml.preproc; import java.io.IOException; -import net.sourceforge.plantuml.StringLocated; 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.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; public class UncommentReadLine implements ReadLine { diff --git a/src/net/sourceforge/plantuml/preproc2/Preprocessor.java b/src/net/sourceforge/plantuml/preproc2/Preprocessor.java index 42e96b592..17ed7f442 100644 --- a/src/net/sourceforge/plantuml/preproc2/Preprocessor.java +++ b/src/net/sourceforge/plantuml/preproc2/Preprocessor.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.preproc2; import java.io.IOException; import java.util.List; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineNumbered; +import net.sourceforge.plantuml.utils.StringLocated; public class Preprocessor implements ReadLineNumbered { diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index 1670064c7..855fdcd6f 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -44,10 +44,6 @@ import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineReader; @@ -56,6 +52,10 @@ import net.sourceforge.plantuml.preproc.StartDiagramExtractReader; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.security.SURL; 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/ReadFilterAddConfig.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java index b1247ac64..6a67ebdaa 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterAddConfig.java @@ -38,10 +38,10 @@ package net.sourceforge.plantuml.preproc2; import java.io.IOException; import java.util.List; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.preproc.ReadLine; import net.sourceforge.plantuml.preproc.ReadLineList; import net.sourceforge.plantuml.utils.StartUtils; +import net.sourceforge.plantuml.utils.StringLocated; public class ReadFilterAddConfig implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterMergeLines.java index 226beaa9d..85e5e3886 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.StringLocated; -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/preproc2/ReadFilterQuoteComment.java b/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java index 9ac4fb889..f11800f98 100644 --- a/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java +++ b/src/net/sourceforge/plantuml/preproc2/ReadFilterQuoteComment.java @@ -37,8 +37,8 @@ package net.sourceforge.plantuml.preproc2; import java.io.IOException; -import net.sourceforge.plantuml.StringLocated; import net.sourceforge.plantuml.preproc.ReadLine; +import net.sourceforge.plantuml.utils.StringLocated; public class ReadFilterQuoteComment implements ReadFilter { diff --git a/src/net/sourceforge/plantuml/project/GanttArrow.java b/src/net/sourceforge/plantuml/project/GanttArrow.java index b7511d721..6a7bf48c2 100644 --- a/src/net/sourceforge/plantuml/project/GanttArrow.java +++ b/src/net/sourceforge/plantuml/project/GanttArrow.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.project.core.Task; @@ -53,6 +52,7 @@ import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UStroke; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.utils.Direction; public class GanttArrow implements UDrawable { diff --git a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java index 7325e696d..bdfaf541c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java +++ b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandColorTask extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java index 667c485ad..7b2f0927a 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootbox extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java index b8ee2a897..28b8462c0 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGanttArrow extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java index f86d6b645..860176107 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; import net.sourceforge.plantuml.project.GanttConstraint; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGanttArrow2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java index fad916acb..2641f9bb2 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupEnd.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupEnd extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java index 5c8f0ca22..6b7fa783d 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGroupStart.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandGroupStart extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java index 7392e2f81..fb1063217 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideResourceFootbox extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java index 1b98724aa..c4d237308 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideResourceName extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java index 55e85bedb..0b052b3ec 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -47,6 +46,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.LabelPosition; import net.sourceforge.plantuml.project.LabelStrategy; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLabelOnColumn extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java index bf98dca66..0f7b67013 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLanguage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java b/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java index 524775152..2839273c5 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java +++ b/src/net/sourceforge/plantuml/project/command/CommandNoteBottom.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandNoteBottom extends CommandMultilines { diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java index a1ec8e8df..f89f35f23 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.lang.ComplementDate; import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrintBetween extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java index 2c240b86f..7499b19ec 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexOr; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.PrintScale; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrintScale extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandSeparator.java b/src/net/sourceforge/plantuml/project/command/CommandSeparator.java index 5306230b9..b323a6ec6 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandSeparator.java +++ b/src/net/sourceforge/plantuml/project/command/CommandSeparator.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSeparator extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java b/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java index bd5713e0f..bab908c8b 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java +++ b/src/net/sourceforge/plantuml/project/command/CommandWeekNumberStrategy.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandWeekNumberStrategy extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java index 8f97e5c5f..a1ba899f6 100644 --- a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java +++ b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java @@ -35,12 +35,12 @@ */ package net.sourceforge.plantuml.project.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.lang.Sentence; +import net.sourceforge.plantuml.utils.LineLocation; public class NaturalCommand extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java index 9836eb74e..c0fb5d74f 100644 --- a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; @@ -57,6 +56,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.utils.Direction; public abstract class AbstractTaskDraw implements TaskDraw { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDraw.java b/src/net/sourceforge/plantuml/project/draw/TaskDraw.java index e732a3912..e5ec23565 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDraw.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.StringBounder; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.utils.Direction; public interface TaskDraw extends UDrawable { diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java index 0065f1646..e754655ad 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawSeparator.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.SpriteContainerEmpty; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.cucadiagram.Display; @@ -63,6 +62,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; +import net.sourceforge.plantuml.utils.Direction; public class TaskDrawSeparator implements TaskDraw { diff --git a/src/net/sourceforge/plantuml/project/time/DayOfWeek.java b/src/net/sourceforge/plantuml/project/time/DayOfWeek.java index ad94b78e5..7fc76aa07 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.StringUtils; +import net.sourceforge.plantuml.utils.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 07b1faa7d..c5731c47e 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.StringUtils; +import net.sourceforge.plantuml.utils.StringUtils; public enum Month { diff --git a/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java b/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java index 70dabec53..d5f068a14 100644 --- a/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java +++ b/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java @@ -37,9 +37,6 @@ package net.sourceforge.plantuml.regex; import java.util.Collections; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -47,6 +44,9 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringLocated; public class CommandRegexfSingleLine extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/regex/PSystemRegex.java b/src/net/sourceforge/plantuml/regex/PSystemRegex.java index 31d054546..cd1f4be72 100644 --- a/src/net/sourceforge/plantuml/regex/PSystemRegex.java +++ b/src/net/sourceforge/plantuml/regex/PSystemRegex.java @@ -47,13 +47,10 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.core.UmlSource; -import net.sourceforge.plantuml.ebnf.CharIterator; -import net.sourceforge.plantuml.ebnf.CharIteratorImpl; import net.sourceforge.plantuml.ebnf.ETile; import net.sourceforge.plantuml.ebnf.ETileAlternation; import net.sourceforge.plantuml.ebnf.ETileBox; @@ -75,6 +72,8 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.HColors; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.CharInspector; public class PSystemRegex extends TitledDiagram { @@ -148,7 +147,7 @@ public class PSystemRegex extends TitledDiagram { } public CommandExecutionResult addBlocLines(BlocLines from) { - final CharIterator it = new CharIteratorImpl(from); + final CharInspector it = from.inspector(); final List parsed1 = RegexExpression.parse(it); // System.err.println("parsed1=" + parsed1); final List parsed2 = addImplicitConcatenation(parsed1); diff --git a/src/net/sourceforge/plantuml/regex/RegexExpression.java b/src/net/sourceforge/plantuml/regex/RegexExpression.java index a15ff9fb2..a7dcd478c 100644 --- a/src/net/sourceforge/plantuml/regex/RegexExpression.java +++ b/src/net/sourceforge/plantuml/regex/RegexExpression.java @@ -38,11 +38,11 @@ package net.sourceforge.plantuml.regex; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.ebnf.CharIterator; +import net.sourceforge.plantuml.utils.CharInspector; public class RegexExpression { - public static List parse(CharIterator it) { + public static List parse(CharInspector it) { final List result = new ArrayList<>(); while (true) { final char current = it.peek(0); @@ -86,14 +86,14 @@ public class RegexExpression { } - private static boolean isStartOpenParenthesis(CharIterator it) { + private static boolean isStartOpenParenthesis(CharInspector it) { final char current0 = it.peek(0); if (current0 == '(') return true; return false; } - private static String readOpenParenthesis(CharIterator it) { + private static String readOpenParenthesis(CharInspector it) { final char current0 = it.peek(0); it.next(); final StringBuilder result = new StringBuilder(); @@ -111,14 +111,14 @@ public class RegexExpression { return result.toString(); } - private static boolean isStartQuantifier(CharIterator it) { + private static boolean isStartQuantifier(CharInspector it) { final char current0 = it.peek(0); if (current0 == '*' || current0 == '+' || current0 == '?' || current0 == '{') return true; return false; } - private static String readQuantifier(CharIterator it) { + private static String readQuantifier(CharInspector it) { final char current0 = it.peek(0); it.next(); final StringBuilder result = new StringBuilder(); @@ -138,7 +138,7 @@ public class RegexExpression { return result.toString(); } - private static boolean isEscapedChar(CharIterator it) { + private static boolean isEscapedChar(CharInspector it) { final char current0 = it.peek(0); if (current0 == '\\') { final char current1 = it.peek(1); @@ -150,7 +150,7 @@ public class RegexExpression { return false; } - private static String readGroup(CharIterator it) { + private static String readGroup(CharInspector it) { final char current0 = it.peek(0); if (current0 != '[') throw new IllegalStateException(); @@ -172,7 +172,7 @@ public class RegexExpression { return result.toString(); } - private static String readClass(CharIterator it) { + private static String readClass(CharInspector it) { final char current0 = it.peek(0); if (current0 == '.') { it.next(); @@ -187,7 +187,7 @@ public class RegexExpression { throw new IllegalStateException(); } - private static boolean isStartClass(CharIterator it) { + private static boolean isStartClass(CharInspector it) { final char current0 = it.peek(0); if (current0 == '.') return true; @@ -202,7 +202,7 @@ public class RegexExpression { return true; } - private static boolean isStartAnchor(CharIterator it) { + private static boolean isStartAnchor(CharInspector it) { final char current0 = it.peek(0); if (current0 == '^' || current0 == '$') return true; @@ -215,7 +215,7 @@ public class RegexExpression { return false; } - private static String readAnchor(CharIterator it) { + private static String readAnchor(CharInspector it) { final char current0 = it.peek(0); if (current0 == '^' || current0 == '$') { it.next(); diff --git a/src/net/sourceforge/plantuml/salt/CommandAnything.java b/src/net/sourceforge/plantuml/salt/CommandAnything.java index d253b77f9..6c677932a 100644 --- a/src/net/sourceforge/plantuml/salt/CommandAnything.java +++ b/src/net/sourceforge/plantuml/salt/CommandAnything.java @@ -35,14 +35,14 @@ */ package net.sourceforge.plantuml.salt; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandAnything extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/salt/CommandSalt.java b/src/net/sourceforge/plantuml/salt/CommandSalt.java index 7458d409e..1f581c169 100644 --- a/src/net/sourceforge/plantuml/salt/CommandSalt.java +++ b/src/net/sourceforge/plantuml/salt/CommandSalt.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.salt; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSalt extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java index 929321765..c2b3b6ed8 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/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index 06c9a4f22..28d8f0860 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -43,7 +43,6 @@ import java.util.Iterator; import java.util.List; import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.ScaleSimple; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.UmlDiagram; @@ -52,7 +51,6 @@ import net.sourceforge.plantuml.WithSprite; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XRectangle2D; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandFactorySprite; @@ -90,6 +88,8 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.Log; public class PSystemSalt extends TitledDiagram implements WithSprite { diff --git a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java index 4d8442655..e06eb447a 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 bcc7901e0..5d06da6cb 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java @@ -36,7 +36,6 @@ 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; @@ -47,6 +46,7 @@ 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 8858d3a83..71adf9956 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 dd7ca804c..1130dc5b6 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 63d89ba42..b3cd5acf8 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 ecab7d958..d75bb5b59 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java @@ -35,7 +35,6 @@ */ 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; @@ -45,6 +44,7 @@ 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 9c0766c06..020741cce 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 71c21c990..cfc493d55 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 1d642a588..21503f598 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 6efb21052..e952df653 100644 --- a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java +++ b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java @@ -64,7 +64,6 @@ 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; @@ -101,6 +100,7 @@ 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 a01d5af25..3f3692722 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 0310a0dc0..f1a3b7068 100644 --- a/src/net/sourceforge/plantuml/security/SecurityUtils.java +++ b/src/net/sourceforge/plantuml/security/SecurityUtils.java @@ -57,8 +57,6 @@ import java.util.regex.Pattern; import javax.swing.ImageIcon; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.json.Json; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.log.Logme; @@ -75,6 +73,8 @@ import net.sourceforge.plantuml.security.authentication.oauth.OAuth2ClientAccess import net.sourceforge.plantuml.security.authentication.oauth.OAuth2ResourceOwnerAccessAuthorizeManager; 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 de145e392..5633e5b24 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 a75f56ef8..c492ad533 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 1878d2729..0b01e0dbb 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 2dc842eb2..35c176a4c 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 297ae4bc1..3736c3b89 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 489cb3010..7992ce24c 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.StringUtils; +import net.sourceforge.plantuml.utils.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 fb48df373..c78c7e683 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.StringUtils; +import net.sourceforge.plantuml.utils.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 ccedcf7e7..628ea1b42 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -49,6 +47,8 @@ import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandActivate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java index 1e1d59380..34a847712 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandActivate2 extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java index e3575fbfb..32c124c97 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java @@ -40,8 +40,6 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -69,6 +67,8 @@ import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandArrow extends SingleLineCommand2 { @@ -126,7 +126,7 @@ public class CommandArrow extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("MESSAGE", "(?::[%s]*(.*))?"), // RegexLeaf.end()).protectSize(2000); diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java index 6da521c83..4999cdf0e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAutoNewpage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java index 689e0826e..725bab019 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAutoactivate extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java index 45a0cfdbd..0d000f698 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.text.DecimalFormat; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -46,6 +45,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.DottedNumber; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAutonumber extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java index 329e1a71e..3cbbf2f76 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberIncrement.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -44,6 +42,8 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.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/CommandAutonumberResume.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java index 5b48d3b96..15cfcc6e5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.text.DecimalFormat; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.RegexConcat; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAutonumberResume extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java index d24c7eeec..7f2e4e12a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAutonumberStop extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java index 4177deb32..274148a30 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandBoxEnd extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java index c06b313b0..59f08ce68 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java @@ -36,7 +36,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -52,6 +51,7 @@ import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandBoxStart extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java index 9d7b1b5fe..6bcfe2aa1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.LifeEventType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandDeactivateShort extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java index ce1cea78d..0d7c0051e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandDelay extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java index d9d7c0afb..01266b815 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -44,6 +43,7 @@ import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandDivider extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java index 0ba31ab2f..bcad92a53 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -57,6 +55,8 @@ import net.sourceforge.plantuml.skin.ArrowHead; import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; abstract class CommandExoArrowAny extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java index eb9d5a9f4..4f7aea6e5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java @@ -75,7 +75,7 @@ public class CommandExoArrowLeft extends CommandExoArrowAny { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("LIFECOLOR", "(?:(#\\w+)?)"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexOptional( // new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java index 221f8a8e4..0335d78e8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java @@ -75,7 +75,7 @@ public class CommandExoArrowRight extends CommandExoArrowAny { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("LIFECOLOR", "(?:(#\\w+)?)"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexOptional( // new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java index a52be99b5..b76a7f055 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootbox extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java index e5ac17ec8..009c9db1a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootboxOld extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java index dbf1e1824..55734081c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java @@ -38,8 +38,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -52,6 +50,8 @@ import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +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 868182e56..687f72094 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -44,6 +42,8 @@ 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.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/CommandHideUnlinked.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java index 646b1165e..087e59575 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHideUnlinked.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideUnlinked extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java index 854c61ac4..76ce7a42c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandIgnoreNewpage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java index 4eb92444f..b9039f623 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandLinkAnchor.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandLinkAnchor extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java index 563b597b6..6ff35b135 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandNewpage extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java index a5812ff0f..763cc14de 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java @@ -37,8 +37,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -59,6 +57,8 @@ import net.sourceforge.plantuml.sequencediagram.ParticipantType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public abstract class CommandParticipant extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java index 2b4db4fb3..033dcf279 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java @@ -65,7 +65,7 @@ public class CommandParticipantA extends CommandParticipant { RegexLeaf.spaceZeroOrMore(), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java index b22004e84..76e8be27b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java @@ -61,7 +61,7 @@ public class CommandParticipantA2 extends CommandParticipant { RegexLeaf.spaceZeroOrMore(), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java index a560f8451..9b39bbded 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java @@ -61,7 +61,7 @@ public class CommandParticipantA3 extends CommandParticipant { RegexLeaf.spaceZeroOrMore(), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java index 001696173..2c14bda9a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java @@ -57,7 +57,7 @@ public class CommandParticipantA4 extends CommandParticipant { RegexLeaf.spaceZeroOrMore(), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java index 90c3d74e6..d9509ce3e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java @@ -40,7 +40,6 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -57,6 +56,7 @@ import net.sourceforge.plantuml.sequencediagram.ParticipantType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandParticipantMultilines extends CommandMultilines2 { @@ -79,7 +79,7 @@ public class CommandParticipantMultilines extends CommandMultilines2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java index 2f3149e05..2032027ca 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java @@ -38,8 +38,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.util.ArrayList; import java.util.List; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -55,6 +53,8 @@ import net.sourceforge.plantuml.sequencediagram.Reference; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.StringUtils; public class CommandReferenceOverSeveral extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java index 988d73281..e4836b6da 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -54,6 +53,7 @@ import net.sourceforge.plantuml.skin.ArrowBody; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.ugraphic.color.HColorSet; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandReturn extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java index 25f6e0077..da7a11771 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.sequencediagram.command; import java.io.IOException; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -45,6 +44,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandSkin extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java index aaf349824..f4e0bbfcf 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sequencediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -48,6 +47,7 @@ import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandUrl extends SingleLineCommand2 { @@ -65,7 +65,7 @@ public class CommandUrl extends SingleLineCommand2 { RegexLeaf.spaceOneOrMore(), // new RegexOptional(new RegexLeaf("is")), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")"), // + UrlBuilder.MANDATORY, // RegexLeaf.end()); // } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java index e61fd7b97..71ffbbde4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java @@ -42,7 +42,6 @@ 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; @@ -57,6 +56,7 @@ 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/sequencediagram/teoz/CommunicationTileSelf.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java index 8a5b37c7f..887805f53 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.sequencediagram.teoz; import java.util.Iterator; import net.sourceforge.plantuml.ISkinParam; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.awt.geom.XPoint2D; import net.sourceforge.plantuml.graphic.StringBounder; @@ -53,6 +52,7 @@ import net.sourceforge.plantuml.skin.Context2D; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UTranslate; +import net.sourceforge.plantuml.utils.Log; public class CommunicationTileSelf extends AbstractTile { diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index 7d5f748aa..a2cee1e29 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -36,7 +36,6 @@ 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; @@ -53,6 +52,7 @@ import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.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/CommandListSprite.java b/src/net/sourceforge/plantuml/sprite/CommandListSprite.java index 6d99bc54d..c2bc8d04f 100644 --- a/src/net/sourceforge/plantuml/sprite/CommandListSprite.java +++ b/src/net/sourceforge/plantuml/sprite/CommandListSprite.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.sprite; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandListSprite extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sprite/CommandStdlib.java b/src/net/sourceforge/plantuml/sprite/CommandStdlib.java index 2916375ef..b1c1173bc 100644 --- a/src/net/sourceforge/plantuml/sprite/CommandStdlib.java +++ b/src/net/sourceforge/plantuml/sprite/CommandStdlib.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.sprite; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandStdlib extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java b/src/net/sourceforge/plantuml/sprite/PSystemListInternalSpritesFactory.java index 90b951a14..e9d2b2209 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 e06592b3a..1c942c126 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteGrayLevel.java @@ -41,7 +41,6 @@ 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; @@ -52,6 +51,7 @@ 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/sprite/SpriteImage.java b/src/net/sourceforge/plantuml/sprite/SpriteImage.java index 753b437dc..e1e6736d8 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteImage.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteImage.java @@ -40,7 +40,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Objects; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.awt.geom.XDimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; @@ -53,6 +52,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; +import net.sourceforge.plantuml.utils.Log; public class SpriteImage implements Sprite { diff --git a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java index 3837d722a..b06712a10 100644 --- a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java @@ -45,7 +45,6 @@ import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.WithSprite; import net.sourceforge.plantuml.awt.geom.XDimension2D; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.Command; import net.sourceforge.plantuml.command.CommandFactorySprite; import net.sourceforge.plantuml.core.DiagramDescription; @@ -67,6 +66,7 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColors; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.BlocLines; public class StdlibDiagram extends UmlDiagram { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java index 984686ce9..2c30ebc12 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.CucaDiagram; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.baraye.Quark; @@ -50,6 +49,7 @@ import net.sourceforge.plantuml.cucadiagram.Code; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandAddField extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java index c599c7dd1..b279bc8e5 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -43,6 +42,7 @@ 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.statediagram.StateDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandConcurrentState extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java index 165f579d6..76f2b5572 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -62,6 +61,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackage2 extends SingleLineCommand2 { @@ -89,7 +89,7 @@ public class CommandCreatePackage2 extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java index cd6d9294d..e19ea21fa 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -63,6 +62,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreatePackageState extends SingleLineCommand2 { @@ -94,7 +94,7 @@ public class CommandCreatePackageState extends SingleLineCommand2 RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java index 1d5f8576f..9c64c68a3 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UrlBuilder; import net.sourceforge.plantuml.UrlMode; @@ -61,6 +60,7 @@ import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateState extends SingleLineCommand2 { @@ -91,7 +91,7 @@ public class CommandCreateState extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), // + UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java index 296fc144c..3b903c513 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -44,6 +43,7 @@ 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.statediagram.StateDiagram; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandEndState extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java index 6bd958abe..97d108e36 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -43,6 +42,7 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandHideEmptyDescription extends SingleLineCommand2 { diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java index fdd1a5537..cd973a734 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateCommon.java @@ -36,10 +36,6 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.Direction; -import net.sourceforge.plantuml.LineLocation; -import net.sourceforge.plantuml.StringUtils; -import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.baraye.IEntity; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; @@ -58,6 +54,9 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.color.ColorType; 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/statediagram/command/CommandLinkStateReverse.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java index 734f03a04..85f658312 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkStateReverse.java @@ -36,11 +36,11 @@ */ package net.sourceforge.plantuml.statediagram.command; -import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexOptional; import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement; +import net.sourceforge.plantuml.utils.Direction; public class CommandLinkStateReverse extends CommandLinkStateCommon { diff --git a/src/net/sourceforge/plantuml/stats/PSystemStatsFactory.java b/src/net/sourceforge/plantuml/stats/PSystemStatsFactory.java index 90d0ec022..5287c835e 100644 --- a/src/net/sourceforge/plantuml/stats/PSystemStatsFactory.java +++ b/src/net/sourceforge/plantuml/stats/PSystemStatsFactory.java @@ -37,9 +37,9 @@ package net.sourceforge.plantuml.stats; import java.io.IOException; import net.sourceforge.plantuml.AbstractPSystem; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.command.PSystemSingleLineFactory; import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.utils.Log; public class PSystemStatsFactory extends PSystemSingleLineFactory { diff --git a/src/net/sourceforge/plantuml/stats/StatsUtils.java b/src/net/sourceforge/plantuml/stats/StatsUtils.java index 3504b1460..324f00645 100644 --- a/src/net/sourceforge/plantuml/stats/StatsUtils.java +++ b/src/net/sourceforge/plantuml/stats/StatsUtils.java @@ -51,11 +51,11 @@ import java.util.prefs.Preferences; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.stats.api.Stats; +import net.sourceforge.plantuml.utils.Log; public class StatsUtils { diff --git a/src/net/sourceforge/plantuml/style/CommandStyleImport.java b/src/net/sourceforge/plantuml/style/CommandStyleImport.java index 32241b08b..12faaad47 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleImport.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleImport.java @@ -39,9 +39,7 @@ import java.io.IOException; import java.io.InputStream; import net.sourceforge.plantuml.FileSystem; -import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; import net.sourceforge.plantuml.command.regex.IRegex; @@ -49,6 +47,9 @@ 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.security.SFile; +import net.sourceforge.plantuml.style.parser.StyleParser; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocation; public class CommandStyleImport extends SingleLineCommand2 { @@ -91,7 +92,7 @@ public class CommandStyleImport extends SingleLineCommand2 { return CommandExecutionResult.error("Cannot read: " + path); } final StyleBuilder styleBuilder = diagram.getSkinParam().getCurrentStyleBuilder(); - for (Style modifiedStyle : StyleLoader.getDeclaredStyles(lines, styleBuilder)) { + for (Style modifiedStyle : StyleParser.parse(lines, styleBuilder)) { diagram.getSkinParam().muteStyle(modifiedStyle); } } catch (IOException e) { diff --git a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java index 2448d9719..34d83201b 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java @@ -37,7 +37,6 @@ package net.sourceforge.plantuml.style; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.TitledDiagram; -import net.sourceforge.plantuml.command.BlocLines; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.CommandMultilines2; import net.sourceforge.plantuml.command.MultilinesStrategy; @@ -45,6 +44,8 @@ import net.sourceforge.plantuml.command.Trim; import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; +import net.sourceforge.plantuml.style.parser.StyleParser; +import net.sourceforge.plantuml.utils.BlocLines; public class CommandStyleMultilinesCSS extends CommandMultilines2 { @@ -69,7 +70,7 @@ public class CommandStyleMultilinesCSS extends CommandMultilines2 protected CommandExecutionResult executeNow(TitledDiagram diagram, BlocLines lines) { try { final StyleBuilder styleBuilder = diagram.getSkinParam().getCurrentStyleBuilder(); - for (Style modifiedStyle : StyleLoader.getDeclaredStyles(lines.subExtract(1, 1), styleBuilder)) + for (Style modifiedStyle : StyleParser.parse(lines.subExtract(1, 1), styleBuilder)) diagram.getSkinParam().muteStyle(modifiedStyle); ((SkinParam) diagram.getSkinParam()).applyPendingStyleMigration(); diff --git a/src/net/sourceforge/plantuml/style/StyleBuilder.java b/src/net/sourceforge/plantuml/style/StyleBuilder.java index b6069e584..fc5151879 100644 --- a/src/net/sourceforge/plantuml/style/StyleBuilder.java +++ b/src/net/sourceforge/plantuml/style/StyleBuilder.java @@ -42,8 +42,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.SkinParam; +import net.sourceforge.plantuml.utils.Log; public class StyleBuilder implements AutomaticCounter { diff --git a/src/net/sourceforge/plantuml/style/StyleLoader.java b/src/net/sourceforge/plantuml/style/StyleLoader.java index 7339930b7..e16c3442b 100644 --- a/src/net/sourceforge/plantuml/style/StyleLoader.java +++ b/src/net/sourceforge/plantuml/style/StyleLoader.java @@ -37,28 +37,20 @@ package net.sourceforge.plantuml.style; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.EnumMap; -import java.util.List; import java.util.Map; import java.util.Map.Entry; import net.sourceforge.plantuml.FileSystem; -import net.sourceforge.plantuml.LineLocationImpl; -import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.SkinParam; -import net.sourceforge.plantuml.StringLocated; -import net.sourceforge.plantuml.command.BlocLines; -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.security.SFile; +import net.sourceforge.plantuml.style.parser.StyleParser; +import net.sourceforge.plantuml.utils.BlocLines; +import net.sourceforge.plantuml.utils.LineLocationImpl; +import net.sourceforge.plantuml.utils.Log; public class StyleLoader { - public static final int DELTA_PRIORITY_FOR_STEREOTYPE = 1000; private final SkinParam skinParam; public StyleLoader(SkinParam skinParam) { @@ -110,104 +102,11 @@ public class StyleLoader { } private void loadSkinInternal(final BlocLines lines) { - for (Style newStyle : getDeclaredStyles(lines, styleBuilder)) + for (Style newStyle : StyleParser.parse(lines, styleBuilder)) this.styleBuilder.loadInternal(newStyle.getSignature(), newStyle); - } - private final static String KEYNAMES = "[-.\\w(), ]+?"; - private final static Pattern2 keyName = MyPattern.cmpile("^[:]?(" + KEYNAMES + ")([%s]+\\*)?[%s]*\\{$"); - private final static Pattern2 propertyAndValue = MyPattern.cmpile("^([\\w]+):?[%s]+(.*?);?$"); - private final static Pattern2 closeBracket = MyPattern.cmpile("^\\}$"); - - public static Collection