Skip to content

Commit 64c249d

Browse files
AxelRICHARDAxelRICHARD
committed
[cleanup] Fix deprecated IDiagramContext
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 3c70f15 commit 64c249d

30 files changed

Lines changed: 72 additions & 72 deletions

File tree

‎backend/services/syson-services/src/main/java/org/eclipse/syson/services/LabelService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public Element directEdit(Element element, String newLabel, boolean isCompartmen
199199
DiagramDirectEditListener listener = new DiagramDirectEditListener(element, this.getFeedbackMessageService(), options);
200200
walker.walk(listener, tree);
201201
listener.resolveProxies().forEach(proxy -> {
202-
this.feedbackMessageService.addFeedbackMessage(new Message(MessageFormat.format("Unable to resolve `{0}`", proxy.nameToResolve()), MessageLevel.WARNING));
202+
this.feedbackMessageService.addFeedbackMessage(new Message(MessageFormat.format("Unable to resolve \u2035{0}\u2035", proxy.nameToResolve()), MessageLevel.WARNING));
203203
});
204204
return element;
205205
}

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractCompartmentNodeDescriptionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.eclipse.emf.ecore.EClass;
2020
import org.eclipse.emf.ecore.EClassifier;
2121
import org.eclipse.emf.ecore.EReference;
22-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
22+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2323
import org.eclipse.sirius.components.core.api.IEditingContext;
2424
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
2525
import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
@@ -140,7 +140,7 @@ protected String isHiddenByDefaultExpression() {
140140
*/
141141
protected String getDropElementFromDiagramExpression() {
142142
return AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagram",
143-
List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE));
143+
List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE));
144144
}
145145

146146
/**

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractControlNodeActionNodeDescriptionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Objects;
1818

1919
import org.eclipse.emf.ecore.EClass;
20-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
20+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2121
import org.eclipse.sirius.components.core.api.IEditingContext;
2222
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
2323
import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
@@ -101,7 +101,7 @@ public NodeDescription create() {
101101
.outsideLabels(this.createOutsideLabelDescription())
102102
.name(this.descriptionNameGenerator.getNodeName(this.getNodeDescriptionName()))
103103
.semanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getExposedElements",
104-
List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT)))
104+
List.of(domainType, org.eclipse.sirius.components.diagrams.description.NodeDescription.ANCESTORS, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT)))
105105
.style(this.createImageNodeStyleDescription(this.getImagePath()))
106106
.userResizable(this.isNodeResizable())
107107
.synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED)

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractDefinitionNodeDescriptionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Set;
1919

2020
import org.eclipse.emf.ecore.EClass;
21-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
21+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2222
import org.eclipse.sirius.components.core.api.IEditingContext;
2323
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
2424
import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
@@ -272,7 +272,7 @@ protected List<EdgeTool> getEdgeTools(NodeDescription nodeDescription, IViewDiag
272272
protected DropNodeTool createDropFromDiagramTool(IViewDiagramElementFinder cache) {
273273
var dropElementFromDiagram = this.viewBuilderHelper.newChangeContext()
274274
.expression(AQLUtils.getServiceCallExpression("droppedElement", "dropElementFromDiagram",
275-
List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT,
275+
List.of("droppedNode", "targetElement", "targetNode", IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT,
276276
ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
277277

278278
return this.diagramBuilderHelper.newDropNodeTool()

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractEmptyDiagramNodeDescriptionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Objects;
1818

1919
import org.eclipse.emf.ecore.EClass;
20-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
20+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2121
import org.eclipse.sirius.components.core.api.IEditingContext;
2222
import org.eclipse.sirius.components.diagrams.Node;
2323
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
@@ -147,7 +147,7 @@ private NodeTool createNodeToolFromPackage(NodeDescription nodeDescription, ECla
147147

148148
var updateExposedElements = this.viewBuilderHelper.newChangeContext()
149149
.expression(AQLUtils.getSelfServiceCallExpression("expose",
150-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
150+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
151151

152152
var changeContextNewInstance = this.viewBuilderHelper.newChangeContext()
153153
.expression(AQLUtils.getServiceCallExpression("newInstance", "elementInitializer"))

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Objects;
1818

1919
import org.eclipse.emf.common.util.EList;
20-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
20+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2121
import org.eclipse.sirius.components.core.api.IEditingContext;
2222
import org.eclipse.sirius.components.diagrams.Node;
2323
import org.eclipse.sirius.components.view.UserColor;
@@ -76,7 +76,7 @@ protected ImageNodeStyleDescription createImageNodeStyleDescription(String image
7676

7777
protected NodeTool getDeleteFromDiagramTool() {
7878
var changeContext = this.viewBuilderHelper.newChangeContext()
79-
.expression(AQLUtils.getSelfServiceCallExpression("removeFromExposedElements", List.of(Node.SELECTED_NODE, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT)));
79+
.expression(AQLUtils.getSelfServiceCallExpression("removeFromExposedElements", List.of(Node.SELECTED_NODE, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT)));
8080

8181
var deleteView = this.diagramBuilderHelper.newDeleteView()
8282
.children(changeContext.build());

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ private void addEndToAllocateEdge(AllocationUsage edge, Element end) {
472472
* find it.
473473
*/
474474
private Element getSourceOwner(Node sourceNode, IEditingContext editingContext, IDiagramService diagramService) {
475-
Diagram diagram = diagramService.getDiagramContext().getDiagram();
475+
Diagram diagram = diagramService.getDiagramContext().diagram();
476476
String id;
477477
var parentNode = new NodeFinder(diagram).getParent(sourceNode);
478478
if (parentNode instanceof Node node) {
@@ -1086,7 +1086,7 @@ public PerformActionUsage createStateSubaction(Element self, ActionUsage perform
10861086
public Feature createTransitionUsage(Feature sourceUsage, Feature targetUsage, Node source, Node target, IDiagramService diagramService, IEditingContext editingContext) {
10871087
if (this.isInSameGraphicalContainer(source, target, diagramService)) {
10881088
// Check source and target have the same parent
1089-
Element semanticContainer = this.getEdgeSemanticContainer(source, target, diagramService.getDiagramContext().getDiagram(), editingContext);
1089+
Element semanticContainer = this.getEdgeSemanticContainer(source, target, diagramService.getDiagramContext().diagram(), editingContext);
10901090
if (semanticContainer != null) {
10911091
Element sourceParentElement = sourceUsage.getOwner();
10921092
if (this.utilService.isParallelState(sourceParentElement)) {
@@ -1250,7 +1250,7 @@ private EndFeatureMembership createConnectorEndFeatureMembership(Feature feature
12501250
}
12511251

12521252
private boolean isInSameGraphicalContainer(Node sourceNode, Node targetNode, IDiagramService diagramService) {
1253-
Diagram diagram = diagramService.getDiagramContext().getDiagram();
1253+
Diagram diagram = diagramService.getDiagramContext().diagram();
12541254
var sourceParentNode = new NodeFinder(diagram).getParent(sourceNode);
12551255
var targetParentNode = new NodeFinder(diagram).getParent(targetNode);
12561256
return Objects.equals(sourceParentNode, targetParentNode);

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/description/ToolDescriptionService.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.commons.lang3.StringUtils;
2121
import org.eclipse.emf.ecore.EClass;
2222
import org.eclipse.emf.ecore.EClassifier;
23-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
23+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
2424
import org.eclipse.sirius.components.core.api.IEditingContext;
2525
import org.eclipse.sirius.components.diagrams.Node;
2626
import org.eclipse.sirius.components.diagrams.tools.ToolSection;
@@ -183,7 +183,7 @@ public NodeTool addExistingElementsTool(boolean recursive, boolean nested) {
183183

184184
var addToExposedElements = this.viewBuilderHelper.newChangeContext()
185185
.expression(
186-
AQLUtils.getSelfServiceCallExpression("addToExposedElements", List.of("" + recursive, IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE,
186+
AQLUtils.getSelfServiceCallExpression("addToExposedElements", List.of("" + recursive, IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE,
187187
ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
188188

189189
var changeContextViewUsageOwner = this.viewBuilderHelper.newChangeContext()
@@ -322,7 +322,7 @@ public DropTool createDropFromExplorerTool() {
322322
var dropElementFromExplorer = this.viewBuilderHelper.newChangeContext()
323323
.expression(
324324
AQLUtils.getSelfServiceCallExpression("dropElementFromExplorer",
325-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
325+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
326326

327327
return this.diagramBuilderHelper.newDropTool()
328328
.name("Drop from Explorer")
@@ -436,7 +436,7 @@ public NodeTool createNodeToolFromDiagramWithDirection(NodeDescription nodeDescr
436436

437437
var updateExposedElements = this.viewBuilderHelper.newChangeContext()
438438
.expression(AQLUtils.getSelfServiceCallExpression("expose",
439-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
439+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
440440

441441
var changeContextNewInstance = this.viewBuilderHelper.newChangeContext()
442442
.expression(AQLUtils.getServiceCallExpression(NEW_INSTANCE, SERVICE_ELEMENT_INITIALIZER));
@@ -485,7 +485,7 @@ public NodeTool createNodeToolFromDiagramWithDirection(NodeDescription nodeDescr
485485
.body(changeContextRoot.build())
486486
.elementsToSelectExpression("aql:newInstance")
487487
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("toolShouldBeAvailable",
488-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass))))
488+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass))))
489489
.build();
490490
}
491491

@@ -521,7 +521,7 @@ public NodeTool createNodeToolWithDirection(NodeDescription nodeDescription, ECl
521521

522522
var updateExposedElements = this.viewBuilderHelper.newChangeContext()
523523
.expression(AQLUtils.getSelfServiceCallExpression("expose",
524-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
524+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
525525

526526
var changeContextNewInstance = this.viewBuilderHelper.newChangeContext()
527527
.expression(AQLUtils.getServiceCallExpression(NEW_INSTANCE, SERVICE_ELEMENT_INITIALIZER));
@@ -576,7 +576,7 @@ public NodeTool createNodeToolWithDirection(NodeDescription nodeDescription, ECl
576576
.body(changeContextRoot.build())
577577
.elementsToSelectExpression("aql:newInstance")
578578
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("toolShouldBeAvailable",
579-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass))))
579+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, SysMLMetamodelHelper.buildQualifiedName(eClass))))
580580
.build();
581581
}
582582
}

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/AbstractCompartmentNodeToolProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import java.util.List;
1616

17-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
17+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
1818
import org.eclipse.sirius.components.core.api.IEditingContext;
1919
import org.eclipse.sirius.components.diagrams.Node;
2020
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
@@ -73,11 +73,11 @@ public NodeTool create(IViewDiagramElementFinder cache) {
7373

7474
var revealOperation = this.viewBuilderHelper.newChangeContext()
7575
.expression(AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment",
76-
List.of("self", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
76+
List.of("self", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
7777

7878
var addToExposedElements = this.viewBuilderHelper.newChangeContext()
7979
.expression(AQLUtils.getSelfServiceCallExpression("expose",
80-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
80+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
8181

8282
var creationCompartmentItemServiceCall = this.viewBuilderHelper.newChangeContext()
8383
.expression(this.getServiceCallExpression())

‎backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActionFlowCompartmentNodeToolProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import java.util.List;
1616

17-
import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
17+
import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
1818
import org.eclipse.sirius.components.core.api.IEditingContext;
1919
import org.eclipse.sirius.components.diagrams.Node;
2020
import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
@@ -42,12 +42,12 @@ public NodeTool create(IViewDiagramElementFinder cache) {
4242

4343
var addToExposedElements = this.viewBuilderHelper.newChangeContext()
4444
.expression(AQLUtils.getSelfServiceCallExpression("expose",
45-
List.of(IEditingContext.EDITING_CONTEXT, IDiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
45+
List.of(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, Node.SELECTED_NODE, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
4646

4747
var revealOperation = this.viewBuilderHelper.newChangeContext()
4848
.expression(
4949
AQLUtils.getServiceCallExpression(Node.SELECTED_NODE, "revealCompartment",
50-
List.of("self", IDiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
50+
List.of("self", DiagramContext.DIAGRAM_CONTEXT, IEditingContext.EDITING_CONTEXT, ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE)));
5151

5252
var creationServiceCall = this.viewBuilderHelper.newChangeContext()
5353
.expression(AQLUtils.getSelfServiceCallExpression("createSubActionUsage"))

0 commit comments

Comments
 (0)