commit 2953af7737ade1afae74b9ef1342b4fca0009bbb
author Laurent Redor <laurent.redor@obeo.fr> Thu Aug 08 16:05:18 2019 +0200
committer Laurent Redor <laurent.redor@obeo.fr> Fri Aug 23 16:45:02 2019 +0200
tree ea1681075c34f5d149faca8a0defc14e07c2fccf
parent da2108d5252301ee9490c79c75cf6c99a0da8d17

[550389] Convert Sirius diagram to ELK graph - No label for border node

There was no label exported for a border node with label located outside
the border node.

Bug: 550389
Cherry-picked-from: 548820
Change-Id: I0628bf5b637d4ceaef530f5575d8cc0f0a56f8e8
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java

diff --git a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
index 3ca53c2..88d6b0c 100644
--- a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
+++ b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
@@ -864,6 +864,9 @@
                     text = ((WrappingLabel) labelFigure).getText();
                 } else if (labelFigure instanceof Label) {
                     text = ((Label) labelFigure).getText();
+                } else if (labelFigure instanceof SiriusWrapLabel) {
+                    SiriusWrapLabel label = (SiriusWrapLabel) labelFigure;
+                    text = label.getText();
                 }
 
                 if (text != null) {