diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index f4ba4c531..8a1b1a412 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -108,6 +108,7 @@ Resources are now considered read-only if: * They are standard libraries (SysML and KerML) All the other resources are read-write. - https://github.com/eclipse-syson/syson/issues/1558[#1558] [doc] Add library update impact analysis in the user documentation. +- https://github.com/eclipse-syson/syson/issues/1557[#1557] [doc] Add read-only model upload in the user documentation. === New features diff --git a/backend/services/syson-services/src/main/java/org/eclipse/syson/services/LabelService.java b/backend/services/syson-services/src/main/java/org/eclipse/syson/services/LabelService.java index 5f3bcf42d..5aa03eb32 100644 --- a/backend/services/syson-services/src/main/java/org/eclipse/syson/services/LabelService.java +++ b/backend/services/syson-services/src/main/java/org/eclipse/syson/services/LabelService.java @@ -199,7 +199,7 @@ public Element directEdit(Element element, String newLabel, boolean isCompartmen DiagramDirectEditListener listener = new DiagramDirectEditListener(element, this.getFeedbackMessageService(), options); walker.walk(listener, tree); listener.resolveProxies().forEach(proxy -> { - this.feedbackMessageService.addFeedbackMessage(new Message(MessageFormat.format("Unable to resolve `{0}`", proxy.nameToResolve()), MessageLevel.WARNING)); + this.feedbackMessageService.addFeedbackMessage(new Message(MessageFormat.format("Unable to resolve \u2035{0}\u2035", proxy.nameToResolve()), MessageLevel.WARNING)); }); return element; } diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractCompartmentNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractCompartmentNodeDescriptionProvider.java index c4f79709f..4545632b1 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractCompartmentNodeDescriptionProvider.java @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EReference; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -140,7 +140,7 @@ protected String isHiddenByDefaultExpression() { */ protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } /** diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractControlNodeActionNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractControlNodeActionNodeDescriptionProvider.java index f57d562ac..a5ec8cbd5 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractControlNodeActionNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractControlNodeActionNodeDescriptionProvider.java @@ -17,7 +17,7 @@ import java.util.Objects; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -101,7 +101,7 @@ public NodeDescription create() { .outsideLabels(this.createOutsideLabelDescription()) .name(this.descriptionNameGenerator.getNodeName(this.getNodeDescriptionName())) .semanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getExposedElements", - List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT))) + List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT))) .style(this.createImageNodeStyleDescription(this.getImagePath())) .userResizable(this.isNodeResizable()) .synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractDefinitionNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractDefinitionNodeDescriptionProvider.java index 3789e9e91..98d817f66 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractDefinitionNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractDefinitionNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import java.util.Set; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -272,7 +272,7 @@ protected List getEdgeTools(NodeDescription nodeDescription, IViewDiag protected DropNodeTool createDropFromDiagramTool(IViewDiagramElementFinder cache) { var dropElementFromDiagram = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); return this.diagramBuilderHelper.newDropNodeTool() diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractEmptyDiagramNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractEmptyDiagramNodeDescriptionProvider.java index 517ad42c8..538fca864 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractEmptyDiagramNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractEmptyDiagramNodeDescriptionProvider.java @@ -17,7 +17,7 @@ import java.util.Objects; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -147,7 +147,7 @@ private NodeTool createNodeToolFromPackage(NodeDescription nodeDescription, ECla var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression("newInstance", "elementInitializer")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java index 73d2a0168..e06784982 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java @@ -17,7 +17,7 @@ import java.util.Objects; import org.eclipse.emf.common.util.EList; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.UserColor; @@ -76,7 +76,7 @@ protected ImageNodeStyleDescription createImageNodeStyleDescription(String image protected NodeTool getDeleteFromDiagramTool() { var changeContext = this.viewBuilderHelper.newChangeContext() - .expression(AQLUtils.getSelfServiceCallExpression("removeFromExposedElements", List.of(Node.SELECTED_NODE, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT))); + .expression(AQLUtils.getSelfServiceCallExpression("removeFromExposedElements", List.of(Node.SELECTED_NODE, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT))); var deleteView = this.diagramBuilderHelper.newDeleteView() .children(changeContext.build()); diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java index b857db64a..090114aba 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java @@ -472,7 +472,7 @@ private void addEndToAllocateEdge(AllocationUsage edge, Element end) { * find it. */ private Element getSourceOwner(Node sourceNode, IEditingContext editingContext, IDiagramService diagramService) { - Diagram diagram = diagramService.getDiagramContext().getDiagram(); + Diagram diagram = diagramService.getDiagramContext().diagram(); String id; var parentNode = new NodeFinder(diagram).getParent(sourceNode); if (parentNode instanceof Node node) { @@ -1086,7 +1086,7 @@ public PerformActionUsage createStateSubaction(Element self, ActionUsage perform public Feature createTransitionUsage(Feature sourceUsage, Feature targetUsage, Node source, Node target, IDiagramService diagramService, IEditingContext editingContext) { if (this.isInSameGraphicalContainer(source, target, diagramService)) { // Check source and target have the same parent - Element semanticContainer = this.getEdgeSemanticContainer(source, target, diagramService.getDiagramContext().getDiagram(), editingContext); + Element semanticContainer = this.getEdgeSemanticContainer(source, target, diagramService.getDiagramContext().diagram(), editingContext); if (semanticContainer != null) { Element sourceParentElement = sourceUsage.getOwner(); if (this.utilService.isParallelState(sourceParentElement)) { @@ -1250,7 +1250,7 @@ private EndFeatureMembership createConnectorEndFeatureMembership(Feature feature } private boolean isInSameGraphicalContainer(Node sourceNode, Node targetNode, IDiagramService diagramService) { - Diagram diagram = diagramService.getDiagramContext().getDiagram(); + Diagram diagram = diagramService.getDiagramContext().diagram(); var sourceParentNode = new NodeFinder(diagram).getParent(sourceNode); var targetParentNode = new NodeFinder(diagram).getParent(targetNode); return Objects.equals(sourceParentNode, targetParentNode); diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/description/ToolDescriptionService.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/description/ToolDescriptionService.java index 0271e0ffc..0839315ff 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/description/ToolDescriptionService.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/description/ToolDescriptionService.java @@ -20,7 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.diagrams.tools.ToolSection; @@ -183,7 +183,7 @@ public NodeTool addExistingElementsTool(boolean recursive, boolean nested) { var addToExposedElements = this.viewBuilderHelper.newChangeContext() .expression( - AQLUtils.getSelfServiceCallExpression("addToExposedElements", List.of("" + recursive, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, + AQLUtils.getSelfServiceCallExpression("addToExposedElements", List.of("" + recursive, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextViewUsageOwner = this.viewBuilderHelper.newChangeContext() @@ -322,7 +322,7 @@ public DropTool createDropFromExplorerTool() { var dropElementFromExplorer = this.viewBuilderHelper.newChangeContext() .expression( AQLUtils.getSelfServiceCallExpression("dropElementFromExplorer", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); return this.diagramBuilderHelper.newDropTool() .name("Drop from Explorer") @@ -436,7 +436,7 @@ public NodeTool createNodeToolFromDiagramWithDirection(NodeDescription nodeDescr var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression(NEW_INSTANCE, SERVICE_ELEMENT_INITIALIZER)); @@ -485,7 +485,7 @@ public NodeTool createNodeToolFromDiagramWithDirection(NodeDescription nodeDescr .body(changeContextRoot.build()) .elementsToSelectExpression("aql:newInstance") .preconditionExpression(AQLUtils.getSelfServiceCallExpression("toolShouldBeAvailable", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass)))) + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass)))) .build(); } @@ -521,7 +521,7 @@ public NodeTool createNodeToolWithDirection(NodeDescription nodeDescription, ECl var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression(NEW_INSTANCE, SERVICE_ELEMENT_INITIALIZER)); @@ -576,7 +576,7 @@ public NodeTool createNodeToolWithDirection(NodeDescription nodeDescription, ECl .body(changeContextRoot.build()) .elementsToSelectExpression("aql:newInstance") .preconditionExpression(AQLUtils.getSelfServiceCallExpression("toolShouldBeAvailable", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass)))) + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass)))) .build(); } } diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AbstractCompartmentNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AbstractCompartmentNodeToolProvider.java index c05134c43..8c0d7e6fb 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AbstractCompartmentNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AbstractCompartmentNodeToolProvider.java @@ -14,7 +14,7 @@ import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -73,11 +73,11 @@ public NodeTool create(IViewDiagramElementFinder cache) { var revealOperation = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment", - List.of("self", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of("self", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var addToExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationCompartmentItemServiceCall = this.viewBuilderHelper.newChangeContext() .expression(this.getServiceCallExpression()) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActionFlowCompartmentNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActionFlowCompartmentNodeToolProvider.java index a0be83181..8972d3a00 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActionFlowCompartmentNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActionFlowCompartmentNodeToolProvider.java @@ -14,7 +14,7 @@ import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -42,12 +42,12 @@ public NodeTool create(IViewDiagramElementFinder cache) { var addToExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var revealOperation = this.viewBuilderHelper.newChangeContext() .expression( AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment", - List.of("self", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of("self", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createSubActionUsage")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AnnotatingElementOnRelationshipNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AnnotatingElementOnRelationshipNodeToolProvider.java index 65d0215c5..968b78a27 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AnnotatingElementOnRelationshipNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AnnotatingElementOnRelationshipNodeToolProvider.java @@ -16,7 +16,7 @@ import java.util.Objects; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -59,7 +59,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression("newInstance", "elementInitializer")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ExhibitStateWithReferenceNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ExhibitStateWithReferenceNodeToolProvider.java index f570ec3c5..bd07fb213 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ExhibitStateWithReferenceNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ExhibitStateWithReferenceNodeToolProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -79,11 +79,11 @@ public NodeTool create(IViewDiagramElementFinder cache) { var revealOperation = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment", - List.of("newInstance", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of("newInstance", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression("newInstance", "elementInitializer")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageBindingConnectorAsUsageNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageBindingConnectorAsUsageNodeToolProvider.java index e6f9d6c71..5ba8b93a6 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageBindingConnectorAsUsageNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageBindingConnectorAsUsageNodeToolProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -52,7 +52,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationBindingConnectorAsUsageServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createPartUsageAndBindingConnectorAsUsage")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFeatureTypingNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFeatureTypingNodeToolProvider.java index 100c9d80d..783972bbb 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFeatureTypingNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFeatureTypingNodeToolProvider.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -53,7 +53,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationFeatureTypingServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createPartDefinitionAndFeatureTyping")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFlowConnectionNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFlowConnectionNodeToolProvider.java index 541b00393..736c4f541 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFlowConnectionNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageFlowConnectionNodeToolProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -52,7 +52,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationBindingConnectorAsUsageServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createPartUsageAndFlowConnection")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageInterfaceNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageInterfaceNodeToolProvider.java index 062768a67..685ef8b27 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageInterfaceNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageInterfaceNodeToolProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -52,7 +52,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationBindingConnectorAsUsageServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createPartUsageAndInterface")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageSubsettingNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageSubsettingNodeToolProvider.java index d66344908..838d578b5 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageSubsettingNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/PartUsageSubsettingNodeToolProvider.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -53,7 +53,7 @@ public NodeTool create(IViewDiagramElementFinder cache) { var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var creationSubsettingServiceCall = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("createPartUsageAndSubsetting")) diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ReferencingPerformActionNodeToolProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ReferencingPerformActionNodeToolProvider.java index 154371c17..ebda2221d 100644 --- a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ReferencingPerformActionNodeToolProvider.java +++ b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ReferencingPerformActionNodeToolProvider.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -84,11 +84,11 @@ public NodeTool create(IViewDiagramElementFinder cache) { var addToExposedElements = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getSelfServiceCallExpression("expose", - List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var reveal = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment", - List.of("newInstance", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); + List.of("newInstance", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() .expression("aql:newInstance") diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java index b28684db5..ccb1a0cab 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EReference; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.RepresentationDescription; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -1093,7 +1093,7 @@ private DropNodeTool createDropFromDiagramTool(IViewDiagramElementFinder cache) var dropElementFromDiagram = this.viewBuilderHelper.newChangeContext() .expression(AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); return this.diagramBuilderHelper.newDropNodeTool() diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ActorNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ActorNodeDescriptionProvider.java index 49a0e2b22..455025ee1 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ActorNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ActorNodeDescriptionProvider.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Set; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -114,7 +114,7 @@ private NodeStyleDescription createActorNodeStyle() { @Override protected String getSemanticCandidatesExpression(String domainType) { return AQLUtils.getSelfServiceCallExpression("getExposedActors", - List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT)); + List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionObjectiveRequirementCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionObjectiveRequirementCompartmentNodeDescriptionProvider.java index 831cfc915..bebbdf6d0 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionObjectiveRequirementCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionObjectiveRequirementCompartmentNodeDescriptionProvider.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -58,7 +58,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropObjectiveRequirementFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionSubjectCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionSubjectCompartmentNodeDescriptionProvider.java index 3ce4a4de5..368871d8f 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionSubjectCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseDefinitionSubjectCompartmentNodeDescriptionProvider.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -64,7 +64,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropSubjectFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageObjectiveRequirementCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageObjectiveRequirementCompartmentNodeDescriptionProvider.java index b95252cda..b312e7ed7 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageObjectiveRequirementCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageObjectiveRequirementCompartmentNodeDescriptionProvider.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -58,7 +58,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropObjectiveRequirementFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageSubjectCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageSubjectCompartmentNodeDescriptionProvider.java index c099e215a..d11d8ccd4 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageSubjectCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CaseUsageSubjectCompartmentNodeDescriptionProvider.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -64,7 +64,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropSubjectFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CompartmentNodeDescriptionProvider.java index a219dba00..42e835f2e 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/CompartmentNodeDescriptionProvider.java @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EReference; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -78,14 +78,14 @@ protected String getDropElementFromDiagramExpression() { if (this.eReference == SysmlPackage.eINSTANCE.getRequirementUsage_AssumedConstraint() || this.eReference == SysmlPackage.eINSTANCE.getRequirementDefinition_AssumedConstraint()) { customExpression = AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagramInRequirementAssumeConstraintCompartment", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } else if (this.eReference == SysmlPackage.eINSTANCE.getRequirementUsage_RequiredConstraint() || this.eReference == SysmlPackage.eINSTANCE.getRequirementDefinition_RequiredConstraint()) { customExpression = AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagramInRequirementRequireConstraintCompartment", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } else if (this.eReference == SysmlPackage.eINSTANCE.getUsage_NestedConstraint() || this.eReference == SysmlPackage.eINSTANCE.getDefinition_OwnedConstraint()) { customExpression = AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagramInConstraintCompartment", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } return customExpression; } diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/DefinitionNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/DefinitionNodeDescriptionProvider.java index 8c05eac27..5779061c1 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/DefinitionNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/DefinitionNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import java.util.Set; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -53,7 +53,7 @@ public DefinitionNodeDescriptionProvider(EClass eClass, IColorProvider colorProv @Override protected String getSemanticCandidatesExpression(String domainType) { return AQLUtils.getSelfServiceCallExpression("getExposedElements", - List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT)); + List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementDefinitionSubjectCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementDefinitionSubjectCompartmentNodeDescriptionProvider.java index 9963c2e05..0b7954a9e 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementDefinitionSubjectCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementDefinitionSubjectCompartmentNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EReference; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -75,7 +75,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropSubjectFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementUsageSubjectCompartmentNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementUsageSubjectCompartmentNodeDescriptionProvider.java index ccef92e6c..8decf8627 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementUsageSubjectCompartmentNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/RequirementUsageSubjectCompartmentNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EReference; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -74,7 +74,7 @@ protected List getDroppableNodes(IViewDiagramElementFinder cach @Override protected String getDropElementFromDiagramExpression() { return AQLUtils.getServiceCallExpression("droppedElement", "dropSubjectFromDiagram", - List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); + List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/UsageNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/UsageNodeDescriptionProvider.java index cb7915e45..355dd1584 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/UsageNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/UsageNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import java.util.Set; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; @@ -54,7 +54,7 @@ public UsageNodeDescriptionProvider(EClass eClass, IColorProvider colorProvider) @Override protected String getSemanticCandidatesExpression(String domainType) { return AQLUtils.getSelfServiceCallExpression("getExposedElements", - List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT)); + List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT)); } @Override diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ViewUsageNodeDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ViewUsageNodeDescriptionProvider.java index 9056a4f5c..583e44a6f 100644 --- a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ViewUsageNodeDescriptionProvider.java +++ b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/nodes/ViewUsageNodeDescriptionProvider.java @@ -18,7 +18,7 @@ import java.util.Objects; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; +import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.diagrams.Node; import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; @@ -83,7 +83,7 @@ public NodeDescription create() { .insideLabel(this.createInsideLabelDescription()) .name(this.getNodeDescriptionName()) .semanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getExposedElements", - List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT))) + List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT))) .style(this.createViewFrameNodeStyle()) .userResizable(UserResizableDirection.BOTH) .synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED) @@ -226,7 +226,7 @@ protected NodeTool createNodeTool(NodeDescription nodeDescription, EClass eClass var updateExposedElements = this.viewBuilderHelper.newChangeContext() .expression( - AQLUtils.getSelfServiceCallExpression("expose", List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, + AQLUtils.getSelfServiceCallExpression("expose", List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))); var changeContextNewInstance = this.viewBuilderHelper.newChangeContext() diff --git a/doc/content/modules/user-manual/assets/images/hands-on-upload-model.png b/doc/content/modules/user-manual/assets/images/hands-on-upload-model.png index 732856472..fae4b87fe 100644 Binary files a/doc/content/modules/user-manual/assets/images/hands-on-upload-model.png and b/doc/content/modules/user-manual/assets/images/hands-on-upload-model.png differ diff --git a/doc/content/modules/user-manual/pages/hands-on/how-tos/model-management.adoc b/doc/content/modules/user-manual/pages/hands-on/how-tos/model-management.adoc index f1c559e6e..6466a0ad4 100644 --- a/doc/content/modules/user-manual/pages/hands-on/how-tos/model-management.adoc +++ b/doc/content/modules/user-manual/pages/hands-on/how-tos/model-management.adoc @@ -44,11 +44,18 @@ To upload a model from a file previously exported, follow these steps: . Click the `Upload` button at the top of the {explorer} in the toolbar. . It opens the `Upload Model` modal. . Select a model from your file system. +. Select the import mode for your model: read-write (default), or read-only + image::hands-on-upload-model.png[Upload model] + . The uploaded model is automatically created and opened. +[NOTE] +==== +Read-only models cannot be renamed and their content cannot be modified. +Note that it is possible to delete a read-only model. +==== + [#rename-model] == Rename a model @@ -292,7 +299,7 @@ If _SomeTypeName_ doesn't exist, it's created as an appropriate type element (fo * Typing `[x]` on an element or a relationship sets its cardinality to _x_. * Typing `[1..x]` on an element or a relationship sets its cardinality to _1..x_. * Typing `[x..*]` on an element or a relationship sets its cardinality to _x..*_. -* Typing `someElement:>otherElement` on a element sets _someElement_ as a `subsetting` of the _otherElement_ if both element are of the same type. +* Typing `someElement:>otherElement` on a element sets _someElement_ as a `Subsetting` of the _otherElement_ if both element are of the same type. Otherwise, it creates a `specialization` relationship between _someElement_ and _otherElement_. * Typing `someElement:>>otherElement` on an element sets _someElement_ as a `redefinition` of _otherElement_. * On a `Feature`, typing `= someExpression` sets a bounded value to the feature (at the moment only `LiteralExpression` are handled in the expression part). diff --git a/doc/content/modules/user-manual/pages/release-notes/2025.10.0.adoc b/doc/content/modules/user-manual/pages/release-notes/2025.10.0.adoc index 90095d900..b94140200 100644 --- a/doc/content/modules/user-manual/pages/release-notes/2025.10.0.adoc +++ b/doc/content/modules/user-manual/pages/release-notes/2025.10.0.adoc @@ -125,6 +125,8 @@ This dialog lists references that will be removed from the models because their image::release-notes-library-update-impact-analysis.png[Dialog showing the impact analysis report of the 'Update library' action, width=85%,height=85%] +- Update the user documentation with information on read-only model upload. + == Dependency update - Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2025.8.9]