1 files changed, 23 insertions, 11 deletions

diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java
index 9e6aee7..0f59f7f 100644
--- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java
+++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java
@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009-2017, Arnaud Roques
+ * (C) Copyright 2009-2020, Arnaud Roques
  *
  * Project Info:  http://plantuml.com
  * 
@@ -48,10 +48,12 @@ import net.sourceforge.plantuml.sequencediagram.Message;
 import net.sourceforge.plantuml.sequencediagram.Note;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.skin.ArrowBody;
+import net.sourceforge.plantuml.skin.ArrowComponent;
 import net.sourceforge.plantuml.skin.ArrowConfiguration;
 import net.sourceforge.plantuml.skin.ArrowHead;
 import net.sourceforge.plantuml.skin.Component;
 import net.sourceforge.plantuml.skin.ComponentType;
+import net.sourceforge.plantuml.style.Style;
 
 class Step1Message extends Step1Abstract {
 
@@ -69,9 +71,11 @@ class Step1Message extends Step1Abstract {
 		if (isSelfMessage()) {
 			this.messageArrow = null;
 		} else {
-			final Component comp = drawingSet.getSkin().createComponent(ComponentType.ARROW, getConfig(),
+			final ArrowComponent comp = drawingSet.getSkin().createComponentArrow(message.getUsedStyles(), getConfig(),
 					drawingSet.getSkinParam(), message.getLabelNumbered());
-			final Component compAliveBox = drawingSet.getSkin().createComponent(ComponentType.ALIVE_BOX_OPEN_OPEN,
+			final Component compAliveBox = drawingSet.getSkin().createComponent(
+					new Style[] { ComponentType.ALIVE_BOX_OPEN_OPEN.getDefaultStyleDefinition().getMergedStyle(
+							drawingSet.getSkinParam().getCurrentStyleBuilder()) }, ComponentType.ALIVE_BOX_OPEN_OPEN,
 					null, drawingSet.getSkinParam(), null);
 
 			this.messageArrow = new MessageArrow(freeY.getFreeY(range), drawingSet.getSkin(), comp,
@@ -81,8 +85,8 @@ class Step1Message extends Step1Abstract {
 		final List<Note> noteOnMessages = message.getNoteOnMessages();
 		for (Note noteOnMessage : noteOnMessages) {
 			final ISkinParam skinParam = noteOnMessage.getSkinParamBackcolored(drawingSet.getSkinParam());
-			addNote(drawingSet.getSkin().createComponent(noteOnMessage.getStyle().getNoteComponentType(), null,
-					skinParam, noteOnMessage.getStrings()));
+			addNote(drawingSet.getSkin().createComponent(noteOnMessage.getUsedStyles(),
+					noteOnMessage.getNoteStyle().getNoteComponentType(), null, skinParam, noteOnMessage.getStrings()));
 		}
 
 	}
@@ -173,6 +177,7 @@ class Step1Message extends Step1Abstract {
 			for (int i = 0; i < getNotes().size(); i++) {
 				final Component note = getNotes().get(i);
 				final Note noteOnMessage = getMessage().getNoteOnMessages().get(i);
+				noteOnMessage.temporaryProtectedUntilTeozIsStandard();
 				noteBoxes.add(createNoteBox(getStringBounder(), messageSelfArrow, note, noteOnMessage));
 			}
 			return new ArrowAndNoteBox(getStringBounder(), messageSelfArrow, noteBoxes);
@@ -181,6 +186,7 @@ class Step1Message extends Step1Abstract {
 			for (int i = 0; i < getNotes().size(); i++) {
 				final Component note = getNotes().get(i);
 				final Note noteOnMessage = getMessage().getNoteOnMessages().get(i);
+				noteOnMessage.temporaryProtectedUntilTeozIsStandard();
 				noteBoxes.add(createNoteBox(getStringBounder(), messageArrow, note, noteOnMessage));
 			}
 			return new ArrowAndNoteBox(getStringBounder(), messageArrow, noteBoxes);
@@ -205,16 +211,21 @@ class Step1Message extends Step1Abstract {
 			deltaY += getHalfLifeWidth();
 		}
 
-		return new MessageSelfArrow(posY, getDrawingSet().getSkin(), getDrawingSet().getSkin().createComponent(
-				ComponentType.ARROW, getConfig(), getDrawingSet().getSkinParam(), getMessage().getLabelNumbered()),
-				getLivingParticipantBox1(), deltaY, getMessage().getUrl(), deltaX);
+		final Style[] styles = getMessage().getUsedStyles();
+		final ArrowComponent comp = getDrawingSet().getSkin().createComponentArrow(styles, getConfig(),
+				getDrawingSet().getSkinParam(), getMessage().getLabelNumbered());
+		return new MessageSelfArrow(posY, getDrawingSet().getSkin(), comp, getLivingParticipantBox1(), deltaY,
+				getMessage().getUrl(), deltaX);
 	}
 
 	private double getHalfLifeWidth() {
 		return getDrawingSet()
 				.getSkin()
-				.createComponent(ComponentType.ALIVE_BOX_OPEN_OPEN, null, getDrawingSet().getSkinParam(),
-						Display.create("")).getPreferredWidth(null) / 2;
+				.createComponent(
+						new Style[] { ComponentType.ALIVE_BOX_OPEN_OPEN.getDefaultStyleDefinition().getMergedStyle(
+								getDrawingSet().getSkinParam().getCurrentStyleBuilder()) },
+						ComponentType.ALIVE_BOX_OPEN_OPEN, null, getDrawingSet().getSkinParam(), Display.create(""))
+				.getPreferredWidth(null) / 2;
 	}
 
 	private Arrow createArrowCreate() {
@@ -255,7 +266,8 @@ class Step1Message extends Step1Abstract {
 		}
 		if (m.getArrowConfiguration().getDressing2().getHead() == ArrowHead.CROSSX) {
 			result = result.withHead2(m.getArrowConfiguration().getDressing2().getHead());
-			System.err.println("WARNING : CROSSX");
+			// System.err.println("WARNING : CROSSX");
+			// Thread.dumpStack();
 			// assert false;
 		}
 		result = result.withPart(m.getArrowConfiguration().getPart());