version 1.2019.6

pom.xml

@@ -35,7 +35,7 @@
 
     <groupId>net.sourceforge.plantuml</groupId>
     <artifactId>plantuml</artifactId>
-    <version>1.2019.6-SNAPSHOT</version>
+    <version>1.2019.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>PlantUML</name>

src/net/sourceforge/plantuml/AnnotatedWorker.java

@@ -99,7 +99,7 @@ public TextBlock addFrame(final TextBlock original) {
 		final double width = x1 + Math.max(dimOriginal.getWidth(), dimTitle.getWidth()) + x2;
 		final double height = dimTitle.getHeight() + y1 + dimOriginal.getHeight() + y2;
 		final TextBlock result = USymbol.FRAME.asBig(title, HorizontalAlignment.LEFT, TextBlockUtils.empty(0, 0),
-				width, height, symbolContext);
+				width, height, symbolContext, skinParam.getStereotypeAlignment());
 
 		return new TextBlockBackcolored() {
 

src/net/sourceforge/plantuml/BlockUml.java

@@ -47,6 +47,7 @@
 import net.sourceforge.plantuml.code.TranscoderUtil;
 import net.sourceforge.plantuml.command.regex.Matcher2;
 import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.error.PSystemErrorPreprocessor;
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.preproc2.PreprocessorMode;
 import net.sourceforge.plantuml.preproc2.PreprocessorModeSet;
@@ -57,6 +58,7 @@
 public class BlockUml {
 
 	private final List<StringLocated> data;
+	private List<StringLocated> debug;
 	private Diagram system;
 	private final Defines localDefines;
 	private final ISkinSimple skinParam;
@@ -96,6 +98,9 @@ public static List<StringLocated> convert(List<String> strings) {
 		return result;
 	}
 
+	private PreprocessorMode pmode = PreprocessorMode.V1_LEGACY;
+	private boolean preprocessorError;
+
 	public BlockUml(List<StringLocated> strings, Defines defines, ISkinSimple skinParam, PreprocessorModeSet mode) {
 		this.localDefines = defines;
 		this.skinParam = skinParam;
@@ -104,7 +109,12 @@ public BlockUml(List<StringLocated> strings, Defines defines, ISkinSimple skinPa
 			throw new IllegalArgumentException();
 		}
 		if (mode != null && mode.getPreprocessorMode() == PreprocessorMode.V2_NEW_TIM) {
-			this.data = new TimLoader(mode.getImportedFiles(), defines).load(strings);
+			this.pmode = mode.getPreprocessorMode();
+			final TimLoader timLoader = new TimLoader(mode.getImportedFiles(), defines, mode.getCharset());
+			timLoader.load(strings);
+			this.data = timLoader.getResult();
+			this.debug = timLoader.getDebug();
+			this.preprocessorError = timLoader.isPreprocessorError();
 		} else {
 			this.data = new ArrayList<StringLocated>(strings);
 		}
@@ -139,7 +149,11 @@ public String getFileOrDirname() {
 
 	public Diagram getDiagram() {
 		if (system == null) {
-			system = new PSystemBuilder().createPSystem(skinParam, data);
+			if (preprocessorError) {
+				system = new PSystemErrorPreprocessor(data, debug);
+			} else {
+				system = new PSystemBuilder().createPSystem(skinParam, data);
+			}
 		}
 		return system;
 	}

src/net/sourceforge/plantuml/BlockUmlBuilder.java

@@ -57,18 +57,20 @@
 
 public final class BlockUmlBuilder implements DefinitionsContainer {
 
-	private PreprocessorMode mode = PreprocessorMode.V1_LEGACY;
+	private PreprocessorMode mode = PreprocessorMode.V2_NEW_TIM;
 
 	private final List<BlockUml> blocks = new ArrayList<BlockUml>();
 	private Set<FileWithSuffix> usedFiles = new HashSet<FileWithSuffix>();
 	private final UncommentReadLine reader2;
 	private final Defines defines;
 	private final ImportedFiles importedFiles;
+	private final String charset;
 
 	public BlockUmlBuilder(List<String> config, String charset, Defines defines, Reader reader, File newCurrentDir,
 			String desc) throws IOException {
 		ReadLineNumbered includer = null;
 		this.defines = defines;
+		this.charset = charset;
 		try {
 			this.reader2 = new UncommentReadLine(new PreprocessorChangeModeReader(ReadLineReader.create(reader, desc),
 					this));
@@ -159,4 +161,8 @@ public final ImportedFiles getImportedFiles() {
 		return importedFiles;
 	}
 
+	public final String getCharset() {
+		return charset;
+	}
+
 }

src/net/sourceforge/plantuml/ColorParam.java

@@ -140,6 +140,8 @@ public enum ColorParam {
 	nodeBorder(HtmlColorUtils.BLACK, ColorType.LINE),
 	rectangleBackground(HtmlColorUtils.MY_YELLOW, true, ColorType.BACK),
 	rectangleBorder(HtmlColorUtils.BLACK, ColorType.LINE),
+	archimateBackground(HtmlColorUtils.MY_YELLOW, true, ColorType.BACK),
+	archimateBorder(HtmlColorUtils.BLACK, ColorType.LINE),
 	cardBackground(HtmlColorUtils.MY_YELLOW, true, ColorType.BACK),
 	cardBorder(HtmlColorUtils.BLACK, ColorType.LINE),
 	agentBackground(HtmlColorUtils.MY_YELLOW, true, ColorType.BACK),

src/net/sourceforge/plantuml/CornerParam.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml;
 
 public enum CornerParam {
-	DEFAULT, diagramBorder, titleBorder, rectangle, component, card, agent;
+	DEFAULT, diagramBorder, titleBorder, rectangle, archimate, component, card, agent;
 
 	public String getRoundKey() {
 		if (this == DEFAULT) {

src/net/sourceforge/plantuml/ErrorUml.java

@@ -35,14 +35,11 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.suggest.SuggestEngineResult;
-import net.sourceforge.plantuml.suggest.SuggestEngineStatus;
 
 public class ErrorUml {
 
 	private final String error;
 	private final ErrorUmlType type;
-	private SuggestEngineResult suggest;
 	private final LineLocation lineLocation;
 
 	public ErrorUml(ErrorUmlType type, String error, LineLocation lineLocation) {
@@ -62,12 +59,12 @@ public boolean equals(Object obj) {
 
 	@Override
 	public int hashCode() {
-		return error.hashCode() + type.hashCode() + getPosition() + (suggest == null ? 0 : suggest.hashCode());
+		return error.hashCode() + type.hashCode() + getPosition();
 	}
 
 	@Override
 	public String toString() {
-		return type.toString() + " " + getPosition() + " " + error + " " + suggest;
+		return type.toString() + " " + getPosition() + " " + error;
 	}
 
 	public final String getError() {
@@ -86,16 +83,4 @@ public final LineLocation getLineLocation() {
 		return lineLocation;
 	}
 
-	public final SuggestEngineResult getSuggest() {
-		return suggest;
-	}
-
-	public final boolean hasSuggest() {
-		return suggest != null && suggest.getStatus() == SuggestEngineStatus.ONE_SUGGESTION;
-	}
-
-	public void setSuggest(SuggestEngineResult suggest) {
-		this.suggest = suggest;
-	}
-
 }

src/net/sourceforge/plantuml/FontParam.java

@@ -77,6 +77,7 @@ public enum FontParam {
 	ENTITY(14, Font.PLAIN), //
 	AGENT(14, Font.PLAIN), //
 	RECTANGLE(14, Font.PLAIN), //
+	ARCHIMATE(14, Font.PLAIN), //
 	CARD(14, Font.PLAIN), //
 	NODE(14, Font.PLAIN), //
 	DATABASE(14, Font.PLAIN), //
@@ -110,6 +111,7 @@ public enum FontParam {
 	ENTITY_STEREOTYPE(14, Font.ITALIC), //
 	AGENT_STEREOTYPE(14, Font.ITALIC), //
 	RECTANGLE_STEREOTYPE(14, Font.ITALIC), //
+	ARCHIMATE_STEREOTYPE(14, Font.ITALIC), //
 	CARD_STEREOTYPE(14, Font.ITALIC), //
 	NODE_STEREOTYPE(14, Font.ITALIC), //
 	FOLDER_STEREOTYPE(14, Font.ITALIC), //

src/net/sourceforge/plantuml/GeneratedImageImpl.java

@@ -38,6 +38,7 @@
 import java.io.File;
 
 import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.error.PSystemError;
 
 public class GeneratedImageImpl implements GeneratedImage {
 
@@ -68,7 +69,7 @@ public String getDescription() {
 	public int lineErrorRaw() {
 		final Diagram system = blockUml.getDiagram();
 		if (system instanceof PSystemError) {
-			return ((PSystemError) system).getHigherErrorPosition2().getPosition();
+			return ((PSystemError) system).getLineLocation().getPosition();
 		}
 		return -1;
 	}

src/net/sourceforge/plantuml/ISkinParam.java

@@ -73,6 +73,8 @@ public HorizontalAlignment getHorizontalAlignment(AlignmentParam param, ArrowDir
 
 	public HorizontalAlignment getDefaultTextAlignment(HorizontalAlignment defaultValue);
 
+	public HorizontalAlignment getStereotypeAlignment();
+
 	public int getCircledCharacterRadius();
 
 	public char getCircledCharacter(Stereotype stereotype);

src/net/sourceforge/plantuml/LineParam.java

@@ -55,6 +55,7 @@ public enum LineParam {
 	titleBorder,
 	diagramBorder,
 	rectangleBorder,
+	archimateBorder,
 	componentBorder,
 	cardBorder,
 	agentBorder,

src/net/sourceforge/plantuml/PSystemBuilder.java

@@ -63,6 +63,8 @@
 import net.sourceforge.plantuml.eggs.PSystemEggFactory;
 import net.sourceforge.plantuml.eggs.PSystemRIPFactory;
 import net.sourceforge.plantuml.eggs.PSystemWelcomeFactory;
+import net.sourceforge.plantuml.error.PSystemError;
+import net.sourceforge.plantuml.error.PSystemErrorUtils;
 import net.sourceforge.plantuml.flowdiagram.FlowDiagramFactory;
 import net.sourceforge.plantuml.font.PSystemListFontsFactory;
 import net.sourceforge.plantuml.help.HelpFactory;
@@ -100,15 +102,15 @@ final public Diagram createPSystem(ISkinSimple skinParam, final List<StringLocat
 			final DiagramType type = DiagramType.getTypeFromArobaseStart(strings2.get(0).getString());
 			final UmlSource umlSource = new UmlSource(strings2, type == DiagramType.UML);
 
-			// int cpt = 0;
 			for (StringLocated s : strings2) {
 				if (s.getPreprocessorError() != null) {
+					// Dead code : should not append
 					Log.error("Preprocessor Error: " + s.getPreprocessorError());
 					final ErrorUml err = new ErrorUml(ErrorUmlType.SYNTAX_ERROR, s.getPreprocessorError(), /* cpt */
 					s.getLocation());
-					return new PSystemError(umlSource, err, Collections.<String> emptyList());
+					// return PSystemErrorUtils.buildV1(umlSource, err, Collections.<String> emptyList());
+					return PSystemErrorUtils.buildV2(umlSource, err, Collections.<String> emptyList(), strings2);
 				}
-				// cpt++;
 			}
 
 			final DiagramType diagramType = umlSource.getDiagramType();
@@ -126,7 +128,7 @@ final public Diagram createPSystem(ISkinSimple skinParam, final List<StringLocat
 				errors.add((PSystemError) sys);
 			}
 
-			final PSystemError err = PSystemError.merge(errors);
+			final PSystemError err = PSystemErrorUtils.merge(errors);
 			result = err;
 			return err;
 		} finally {

src/net/sourceforge/plantuml/Pipe.java

@@ -44,6 +44,7 @@
 
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.preproc.Defines;
 
 public class Pipe {

src/net/sourceforge/plantuml/SkinParam.java

@@ -550,6 +550,15 @@ public HorizontalAlignment getDefaultTextAlignment(HorizontalAlignment defaultVa
 		return result;
 	}
 
+	public HorizontalAlignment getStereotypeAlignment() {
+		final String value = getValue("stereotypealignment");
+		final HorizontalAlignment result = HorizontalAlignment.fromString(value);
+		if (result == null) {
+			return HorizontalAlignment.CENTER;
+		}
+		return result;
+	}
+
 	private String getArg(String value, int i) {
 		if (value == null) {
 			return null;

src/net/sourceforge/plantuml/SkinParamDelegator.java

@@ -317,5 +317,10 @@ public void copyAllFrom(ISkinSimple other) {
 	public Map<String, String> values() {
 		return skinParam.values();
 	}
+
+	public HorizontalAlignment getStereotypeAlignment() {
+		return skinParam.getStereotypeAlignment();
+	}
+
 
 }

src/net/sourceforge/plantuml/SourceFileReaderAbstract.java

@@ -52,6 +52,7 @@
 import java.util.Set;
 
 import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.preproc.FileWithSuffix;
 
 public abstract class SourceFileReaderAbstract {

src/net/sourceforge/plantuml/StdrptPipe0.java

@@ -38,14 +38,15 @@
 import java.io.PrintStream;
 
 import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.error.PSystemError;
 
 public class StdrptPipe0 implements Stdrpt {
 
 	public void printInfo(final PrintStream output, final Diagram sys) {
 		if (sys instanceof PSystemError) {
 			final PSystemError err = (PSystemError) sys;
 			output.println("ERROR");
-			output.println(err.getHigherErrorPosition2().getPosition());
+			output.println(err.getLineLocation().getPosition());
 			for (ErrorUml er : err.getErrorsUml()) {
 				output.println(er.getError());
 			}

src/net/sourceforge/plantuml/StdrptV1.java

@@ -40,6 +40,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;
 
 public class StdrptV1 implements Stdrpt {
 
@@ -58,7 +59,7 @@ private void out(final PrintStream output, final PSystemError err) {
 			output.println("status=NO_DATA");
 		} else {
 			output.println("status=ERROR");
-			output.println("lineNumber=" + err.getHigherErrorPosition2().getPosition());
+			output.println("lineNumber=" + err.getLineLocation().getPosition());
 			for (ErrorUml er : err.getErrorsUml()) {
 				output.println("label=" + er.getError());
 			}

src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java

@@ -262,7 +262,7 @@ public CommandExecutionResult endFork(ForkStyle forkStyle, String label) {
 	}
 
 	public void split() {
-		final InstructionSplit instructionSplit = new InstructionSplit(current(), nextLinkRenderer());
+		final InstructionSplit instructionSplit = new InstructionSplit(current(), nextLinkRenderer(), swinlanes.getCurrentSwimlane());
 		setNextLinkRendererInternal(LinkRendering.none());
 		current().add(instructionSplit);
 		setCurrent(instructionSplit);
@@ -279,7 +279,7 @@ public CommandExecutionResult splitAgain() {
 
 	public CommandExecutionResult endSplit() {
 		if (current() instanceof InstructionSplit) {
-			((InstructionSplit) current()).endSplit(nextLinkRenderer());
+			((InstructionSplit) current()).endSplit(nextLinkRenderer(), swinlanes.getCurrentSwimlane());
 			setNextLinkRendererInternal(LinkRendering.none());
 			setCurrent(((InstructionSplit) current()).getParent());
 			return CommandExecutionResult.ok();

src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java

@@ -155,15 +155,6 @@ public Set<Swimlane> getSwimlanes() {
 
 	public Swimlane getSwimlaneIn() {
 		return defaultSwimlane;
-		// final Set<Swimlane> swimlanes = getSwimlanes();
-		// if (swimlanes.size() == 0) {
-		// return null;
-		// }
-		// if (swimlanes.size() == 1) {
-		// return swimlanes.iterator().next();
-		// }
-		// System.err.println("foo1="+getClass());
-		// return all.get(0).getSwimlaneIn();
 	}
 
 	public Swimlane getSwimlaneOut() {