[3677] Remove old position, size and ratio from old layout engine

Bug: #3677 Signed-off-by: Guillaume Coutable <[email protected]>
eclipse-sirius · Sep 23, 2024 · d70c426 · d70c426
1 parent 9989503
commit d70c426
Show file tree

Hide file tree

Showing 106 changed files with 527 additions and 3,349 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -73,6 +73,7 @@ An event may have been caused by another event or caused by an input received fr
 It is now possible to choose between three options:
 never, always and if_children (to display the separator only if children exist).
 - https://github.com/eclipse-sirius/sirius-web/issues/4021[#4021] [sirius-web] Disable the _Rename_ and _Delete_ project menu actions when project is read-only
+- https://github.com/eclipse-sirius/sirius-web/issues/3677[#3677] [diagram] Remove backend layouting code from the time the backend was computing the layout.
 
 == v2024.9.0
 

diff --git a/...sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java b/...sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2024 Obeo and others.
+ * Copyright (c) 2019, 2024 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -33,7 +33,6 @@
 import org.eclipse.sirius.components.diagrams.LabelOverflowStrategy;
 import org.eclipse.sirius.components.diagrams.LabelTextAlign;
 import org.eclipse.sirius.components.diagrams.LineStyle;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.description.EdgeDescription;
 import org.eclipse.sirius.components.diagrams.description.InsideLabelDescription;
 import org.eclipse.sirius.components.diagrams.description.LabelStyleDescription;
@@ -131,7 +130,6 @@ private NodeDescription createNodeDescription(String id) {
                 .insideLabelDescription(insideLabelDescription)
                 .styleProvider(variableManager -> null)
                 .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy())
-                .sizeProvider(variableManager -> Size.UNDEFINED)
                 .borderNodeDescriptions(List.of())
                 .childNodeDescriptions(List.of())
                 .labelEditHandler((variableManager, newLabel) -> new Success())

diff --git a/...clipse/sirius/components/compatibility/emf/compatibility/diagrams/TestDiagramBuilder.java b/...clipse/sirius/components/compatibility/emf/compatibility/diagrams/TestDiagramBuilder.java
@@ -30,10 +30,7 @@
 import org.eclipse.sirius.components.diagrams.LineStyle;
 import org.eclipse.sirius.components.diagrams.Node;
 import org.eclipse.sirius.components.diagrams.NodeType;
-import org.eclipse.sirius.components.diagrams.Position;
-import org.eclipse.sirius.components.diagrams.Ratio;
 import org.eclipse.sirius.components.diagrams.RectangularNodeStyle;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.ViewModifier;
 import org.eclipse.sirius.components.diagrams.tools.SingleClickOnDiagramElementTool;
 import org.eclipse.sirius.components.representations.Success;
@@ -56,8 +53,6 @@ public Diagram getDiagram(String id) {
                 .label("diagramLabel")
                 .descriptionId(UUID.randomUUID().toString())
                 .targetObjectId("diagramTargetObjectId")
-                .position(Position.UNDEFINED)
-                .size(Size.UNDEFINED)
                 .nodes(List.of())
                 .edges(List.of())
                 .build();
@@ -88,8 +83,6 @@ public Node getNode(String id, boolean withLabel) {
                 .descriptionId(UUID.randomUUID().toString())
                 .style(this.getRectangularNodeStyle())
                 .childrenLayoutStrategy(new FreeFormLayoutStrategy())
-                .position(Position.UNDEFINED)
-                .size(Size.UNDEFINED)
                 .borderNodes(List.of())
                 .childNodes(List.of())
                 .modifiers(Set.of())
@@ -137,11 +130,8 @@ public Edge getEdge(String id, String sourceId, String targetId) {
                 .sourceId(sourceId)
                 .targetId(targetId)
                 .style(style)
-                .routingPoints(List.of())
                 .modifiers(Set.of())
                 .state(ViewModifier.Normal)
-                .sourceAnchorRelativePosition(Ratio.UNDEFINED)
-                .targetAnchorRelativePosition(Ratio.UNDEFINED)
                 .build();
     }
 

diff --git a/...omponents/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java b/...omponents/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2024 Obeo and others.
+ * Copyright (c) 2021, 2024 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -35,9 +35,7 @@
 import org.eclipse.sirius.components.diagrams.LabelOverflowStrategy;
 import org.eclipse.sirius.components.diagrams.LabelTextAlign;
 import org.eclipse.sirius.components.diagrams.LineStyle;
-import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.RectangularNodeStyle;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.ViewCreationRequest;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.components.diagrams.description.InsideLabelDescription;
@@ -95,8 +93,6 @@ public void initialize() {
                 .descriptionId(diagramDescription.getId())
                 .targetObjectId(UUID.randomUUID().toString())
                 .label("DiagramTest")
-                .position(Position.at(0, 0))
-                .size(Size.of(100, 100))
                 .nodes(new ArrayList<>())
                 .edges(List.of())
                 .build();
@@ -248,7 +244,6 @@ private NodeDescription getNodeDescription(String nodeDescriptionId) {
                 .insideLabelDescription(insideLabelDescription)
                 .styleProvider(nodeStyleProvider)
                 .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy())
-                .sizeProvider(variableManager -> Size.UNDEFINED)
                 .borderNodeDescriptions(new ArrayList<>())
                 .childNodeDescriptions(new ArrayList<>())
                 .labelEditHandler((variableManager, newLabel) -> new Success())

diff --git a/...omponents/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java b/...omponents/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2024 Obeo and others.
+ * Copyright (c) 2021, 2024 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -39,9 +39,7 @@
 import org.eclipse.sirius.components.diagrams.LabelTextAlign;
 import org.eclipse.sirius.components.diagrams.LineStyle;
 import org.eclipse.sirius.components.diagrams.Node;
-import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.RectangularNodeStyle;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.ViewDeletionRequest;
 import org.eclipse.sirius.components.diagrams.ViewModifier;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
@@ -119,8 +117,6 @@ public void initialize() {
                         .textAlign(LabelTextAlign.CENTER)
                         .build())
                 .style(ImageNodeStyle.newImageNodeStyle().imageURL("").scalingFactor(0).build())
-                .position(Position.at(0, 0))
-                .size(Size.of(10, 10))
                 .borderNodes(List.of())
                 .childNodes(List.of())
                 .state(ViewModifier.Normal)
@@ -132,8 +128,6 @@ public void initialize() {
                 .descriptionId(diagramDescription.getId())
                 .targetObjectId(UUID.randomUUID().toString())
                 .label("DiagramTest")
-                .position(Position.at(0, 0))
-                .size(Size.of(100, 100))
                 .nodes(List.of(node))
                 .edges(List.of())
                 .build();
@@ -234,7 +228,6 @@ private NodeDescription getNodeDescription(String nodeDescriptionId) {
                 .insideLabelDescription(insideLabelDescription)
                 .styleProvider(nodeStyleProvider)
                 .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy())
-                .sizeProvider(variableManager -> Size.UNDEFINED)
                 .borderNodeDescriptions(new ArrayList<>())
                 .childNodeDescriptions(new ArrayList<>())
                 .labelEditHandler((variableManager, newLabel) -> new Success())

diff --git a/...va/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java b/...va/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java
@@ -33,7 +33,6 @@
 import org.eclipse.sirius.components.diagrams.LabelOverflowStrategy;
 import org.eclipse.sirius.components.diagrams.LabelTextAlign;
 import org.eclipse.sirius.components.diagrams.NodeType;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.description.InsideLabelDescription;
 import org.eclipse.sirius.components.diagrams.description.LabelStyleDescription;
 import org.eclipse.sirius.components.diagrams.description.NodeDescription;
@@ -120,7 +119,6 @@ public NodeDescription convert(AbstractNodeMapping abstractNodeMapping, AQLInter
             }
             return result;
         };
-        Function<VariableManager, Size> sizeProvider = variableManager -> Size.UNDEFINED;
 
         String domainClass = abstractNodeMapping.getDomainClass();
         String semanticCandidatesExpression = abstractNodeMapping.getSemanticCandidatesExpression();
@@ -158,7 +156,6 @@ public NodeDescription convert(AbstractNodeMapping abstractNodeMapping, AQLInter
                 .insideLabelDescription(insideLabelDescription)
                 .styleProvider(styleProvider)
                 .childrenLayoutStrategyProvider(childrenLayoutStrategyProvider)
-                .sizeProvider(sizeProvider)
                 .borderNodeDescriptions(borderNodeDescriptions)
                 .childNodeDescriptions(childNodeDescriptions)
                 .collapsible(collapsible)

diff --git a/...eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java b/...eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java
@@ -23,8 +23,6 @@
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
 import org.eclipse.sirius.components.diagrams.ImageNodeStyle;
-import org.eclipse.sirius.components.diagrams.Position;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.ViewModifier;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.components.diagrams.elements.NodeElementProps;
@@ -76,7 +74,6 @@ public String getIdentifier(Object element) {
     }
 
     private Element createNodeElement(String descriptionId) {
-        // @formatter:off
         INodeStyle style = ImageNodeStyle.newImageNodeStyle()
                 .imageURL("")
                 .scalingFactor(42)
@@ -89,14 +86,11 @@ private Element createNodeElement(String descriptionId) {
                 .targetObjectLabel("targetObjectLabel")
                 .descriptionId(descriptionId)
                 .style(style)
-                .position(Position.UNDEFINED)
-                .size(Size.UNDEFINED)
                 .children(List.of())
                 .state(ViewModifier.Normal)
                 .modifiers(Set.of())
                 .collapsingState(CollapsingState.EXPANDED)
                 .build();
-        // @formatter:on
         return new Element(NodeElementProps.TYPE, nodeElementProps);
     }
 }
diff --git a/...lipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java b/...lipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java
@@ -22,8 +22,6 @@
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
 import org.eclipse.sirius.components.diagrams.ImageNodeStyle;
-import org.eclipse.sirius.components.diagrams.Position;
-import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.ViewModifier;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.components.diagrams.elements.NodeElementProps;
@@ -70,7 +68,6 @@ public String getIdentifier(Object element) {
     }
 
     private Element createNodeElement(String descriptionId) {
-        // @formatter:off
         INodeStyle style = ImageNodeStyle.newImageNodeStyle()
                 .imageURL("")
                 .build();
@@ -82,14 +79,11 @@ private Element createNodeElement(String descriptionId) {
                 .targetObjectLabel("targetObjectLabel")
                 .descriptionId(descriptionId)
                 .style(style)
-                .position(Position.UNDEFINED)
-                .size(Size.UNDEFINED)
                 .children(List.of())
                 .state(ViewModifier.Normal)
                 .modifiers(Set.of())
                 .collapsingState(CollapsingState.EXPANDED)
                 .build();
-        // @formatter:on
         return new Element(NodeElementProps.TYPE, nodeElementProps);
     }
 }
diff --git a/...ain/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java b/...ain/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java
@@ -15,7 +15,6 @@
 import java.util.UUID;
 
 import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramInput;
-import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.events.ReconnectEdgeKind;
 
 /**
@@ -29,6 +28,5 @@ public record ReconnectEdgeInput(
         String representationId,
         String edgeId,
         String newEdgeEndId,
-        ReconnectEdgeKind reconnectEdgeKind,
-        Position newEdgeEndPosition) implements IDiagramInput {
+        ReconnectEdgeKind reconnectEdgeKind) implements IDiagramInput {
 }
diff --git a/...rg/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java b/...rg/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java
diff --git a/.../java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java b/.../java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java
diff --git a/.../eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java b/.../eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java
diff --git a/...ava/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java b/...ava/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java
diff --git a/...clipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java b/...clipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java