Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -272,7 +272,7 @@ protected List<EdgeTool> 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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"))
Expand Down
Loading