diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractAllocateEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractAllocateEdgeDescriptionProvider.java index 63c77deae..e48b58eb8 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractAllocateEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractAllocateEdgeDescriptionProvider.java @@ -99,6 +99,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDefinitionOwnedUsageEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDefinitionOwnedUsageEdgeDescriptionProvider.java index fc80302ce..cb5bef938 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDefinitionOwnedUsageEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDefinitionOwnedUsageEdgeDescriptionProvider.java @@ -26,9 +26,6 @@ import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.EdgeDescription; import org.eclipse.sirius.components.view.diagram.EdgeStyle; -import org.eclipse.sirius.components.view.diagram.InsideLabelDescription; -import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; -import org.eclipse.sirius.components.view.diagram.InsideLabelStyle; import org.eclipse.sirius.components.view.diagram.LabelEditTool; import org.eclipse.sirius.components.view.diagram.LineStyle; import org.eclipse.sirius.components.view.diagram.NodeDescription; @@ -100,34 +97,6 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde edgeDescription.setPalette(this.createEdgePalette()); } - protected InsideLabelDescription createInsideLabelDescription() { - return this.diagramBuilderHelper.newInsideLabelDescription() - .labelExpression(AQLUtils.getSelfServiceCallExpression("getContainerLabel")) - .position(InsideLabelPosition.TOP_CENTER) - .style(this.createInsideLabelStyle()) - .build(); - } - - protected InsideLabelStyle createInsideLabelStyle() { - return this.diagramBuilderHelper.newInsideLabelStyle() - .borderSize(0) - .displayHeaderSeparator(true) - .labelColor(this.colorProvider.getColor(ViewConstants.DEFAULT_LABEL_COLOR)) - .showIcon(true) - .withHeader(true) - .build(); - } - - private EdgeStyle createEdgeStyle() { - return this.diagramBuilderHelper.newEdgeStyle() - .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) - .edgeWidth(1) - .lineStyle(LineStyle.SOLID) - .sourceArrowStyle(ArrowStyle.FILL_DIAMOND) - .targetArrowStyle(ArrowStyle.NONE) - .build(); - } - @Override protected boolean isDeletable() { return true; @@ -169,4 +138,15 @@ protected ChangeContextBuilder getTargetReconnectToolBody() { return this.viewBuilderHelper.newChangeContext() .expression(AQLConstants.AQL + AQLConstants.EDGE_SEMANTIC_ELEMENT + ".reconnnectTargetCompositionEdge(" + String.join(",", params) + ")"); } + + private EdgeStyle createEdgeStyle() { + return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) + .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) + .edgeWidth(1) + .lineStyle(LineStyle.SOLID) + .sourceArrowStyle(ArrowStyle.FILL_DIAMOND) + .targetArrowStyle(ArrowStyle.NONE) + .build(); + } } diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDependencyEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDependencyEdgeDescriptionProvider.java index 08982a711..fd0d737b5 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDependencyEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractDependencyEdgeDescriptionProvider.java @@ -98,6 +98,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.DASH) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractRedefinitionEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractRedefinitionEdgeDescriptionProvider.java index 5bb480c26..1d6280d6a 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractRedefinitionEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractRedefinitionEdgeDescriptionProvider.java @@ -98,6 +98,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractSubsettingEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractSubsettingEdgeDescriptionProvider.java index bd05f2acf..67acadce6 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractSubsettingEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractSubsettingEdgeDescriptionProvider.java @@ -98,6 +98,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractUsageNestedUsageEdgeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractUsageNestedUsageEdgeDescriptionProvider.java index b8bb733ed..5a119b540 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractUsageNestedUsageEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/edges/AbstractUsageNestedUsageEdgeDescriptionProvider.java @@ -101,6 +101,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID) diff --git a/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/BindingConnectorAsUsageEdgeDescriptionProvider.java b/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/BindingConnectorAsUsageEdgeDescriptionProvider.java index 7e8e7d7c1..f2dc278e3 100644 --- a/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/BindingConnectorAsUsageEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/BindingConnectorAsUsageEdgeDescriptionProvider.java @@ -100,6 +100,7 @@ public String getName() { private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID) diff --git a/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/InterfaceUsageEdgeDescriptionProvider.java b/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/InterfaceUsageEdgeDescriptionProvider.java index cb084b4ec..b5b9f83b6 100644 --- a/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/InterfaceUsageEdgeDescriptionProvider.java +++ b/backend/views/syson-diagram-interconnection-view/src/main/java/org/eclipse/syson/diagram/interconnection/view/edges/InterfaceUsageEdgeDescriptionProvider.java @@ -101,6 +101,7 @@ public String getName() { private EdgeStyle createEdgeStyle() { return this.diagramBuilderHelper.newEdgeStyle() + .borderSize(0) .color(this.colorProvider.getColor(ViewConstants.DEFAULT_EDGE_COLOR)) .edgeWidth(1) .lineStyle(LineStyle.SOLID)