Skip to content

Commit 8e38313

Browse files
AxelRICHARDAxelRICHARD
committed
[1535] Update ViewUsage default name
Bug: #1535 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 22532cc commit 8e38313

8 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/sysmlv2/SysMLv2ProjectTemplatesInitializer.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,18 @@ private Optional<RepresentationMetadata> initializeSysMLv2Project(ICause cause,
104104
var resource = this.defaultSysMLv2ResourceProvider.getDefaultSysMLv2Resource(UUID.randomUUID(), SYSMLV2_DOCUMENT_NAME);
105105
resourceSet.getResources().add(resource);
106106

107+
// General View is the description name of SDVDiagramDescriptionProvider
107108
var optionalGeneralViewDiagram = this.findDiagramDescription(editingContext, "General View");
108109
if (optionalGeneralViewDiagram.isPresent()) {
109110
DiagramDescription generalViewDiagram = optionalGeneralViewDiagram.get();
110-
var viewUsage = this.getOrCreateViewUsage(resource);
111-
if (viewUsage.isPresent()) {
111+
var optViewUsage = this.getOrCreateViewUsage(resource);
112+
if (optViewUsage.isPresent()) {
112113
var variableManager = new VariableManager();
114+
var viewUsage = optViewUsage.get();
113115
variableManager.put(VariableManager.SELF, viewUsage);
114-
variableManager.put(DiagramDescription.LABEL, generalViewDiagram.getLabel());
116+
variableManager.put(DiagramDescription.LABEL, viewUsage.getDeclaredName());
115117
String label = generalViewDiagram.getLabelProvider().apply(variableManager);
116-
Diagram diagram = this.diagramCreationService.create(viewUsage.get(), generalViewDiagram, editingContext);
118+
Diagram diagram = this.diagramCreationService.create(viewUsage, generalViewDiagram, editingContext);
117119
List<String> iconURLs = generalViewDiagram.getIconURLsProvider().apply(variableManager);
118120

119121
var representationMetadata = RepresentationMetadata.newRepresentationMetadata(diagram.getId())
@@ -139,16 +141,18 @@ private Optional<RepresentationMetadata> initializeSysMLv2LibraryProject(ICause
139141
var resource = this.defaultSysMLv2ResourceProvider.getDefaultSysMLv2LibraryResource(UUID.randomUUID(), SYSMLV2_LIBRARY_DOCUMENT_NAME);
140142
resourceSet.getResources().add(resource);
141143

144+
// General View is the description name of SDVDiagramDescriptionProvider
142145
var optionalGeneralViewDiagram = this.findDiagramDescription(editingContext, "General View");
143146
if (optionalGeneralViewDiagram.isPresent()) {
144147
DiagramDescription generalViewDiagram = optionalGeneralViewDiagram.get();
145-
var viewUsage = this.getOrCreateViewUsage(resource);
146-
if (viewUsage.isPresent()) {
148+
var optViewUsage = this.getOrCreateViewUsage(resource);
149+
if (optViewUsage.isPresent()) {
147150
var variableManager = new VariableManager();
151+
var viewUsage = optViewUsage.get();
148152
variableManager.put(VariableManager.SELF, viewUsage);
149-
variableManager.put(DiagramDescription.LABEL, generalViewDiagram.getLabel());
153+
variableManager.put(DiagramDescription.LABEL, viewUsage.getDeclaredName());
150154
String label = generalViewDiagram.getLabelProvider().apply(variableManager);
151-
Diagram diagram = this.diagramCreationService.create(viewUsage.get(), generalViewDiagram, editingContext);
155+
Diagram diagram = this.diagramCreationService.create(viewUsage, generalViewDiagram, editingContext);
152156
List<String> iconURLs = generalViewDiagram.getIconURLsProvider().apply(variableManager);
153157

154158
var representationMetadata = RepresentationMetadata.newRepresentationMetadata(diagram.getId())
@@ -177,16 +181,18 @@ private Optional<RepresentationMetadata> initializeBatmobileProject(ICause cause
177181
// Load after adding the resource to the resourceSet, to be sure that references will be resolved.
178182
this.defaultSysMLv2ResourceProvider.loadBatmobileResource(resource);
179183

184+
// General View is the description name of SDVDiagramDescriptionProvider
180185
var optionalGeneralViewDiagram = this.findDiagramDescription(editingContext, "General View");
181186
if (optionalGeneralViewDiagram.isPresent()) {
182187
DiagramDescription generalViewDiagram = optionalGeneralViewDiagram.get();
183-
var viewUsage = this.getOrCreateViewUsage(resource);
184-
if (viewUsage.isPresent()) {
188+
var optViewUsage = this.getOrCreateViewUsage(resource);
189+
if (optViewUsage.isPresent()) {
185190
var variableManager = new VariableManager();
191+
var viewUsage = optViewUsage.get();
186192
variableManager.put(VariableManager.SELF, viewUsage);
187-
variableManager.put(DiagramDescription.LABEL, generalViewDiagram.getLabel());
193+
variableManager.put(DiagramDescription.LABEL, viewUsage.getDeclaredName());
188194
String label = generalViewDiagram.getLabelProvider().apply(variableManager);
189-
Diagram diagram = this.diagramCreationService.create(viewUsage.get(), generalViewDiagram, editingContext);
195+
Diagram diagram = this.diagramCreationService.create(viewUsage, generalViewDiagram, editingContext);
190196
List<String> iconURLs = generalViewDiagram.getIconURLsProvider().apply(variableManager);
191197

192198
var representationMetadata = RepresentationMetadata.newRepresentationMetadata(diagram.getId())
@@ -249,7 +255,7 @@ private Optional<ViewUsage> getViewUsage(Element element) {
249255
return element.getOwnedElement().stream()
250256
.filter(ViewUsage.class::isInstance)
251257
.map(ViewUsage.class::cast)
252-
.filter(vu -> Objects.equals(vu.getDeclaredName(), "General View"))
258+
.filter(vu -> Objects.equals(vu.getDeclaredName(), "view1"))
253259
.findFirst();
254260
}
255261

@@ -258,7 +264,7 @@ private Optional<ViewUsage> createViewUsage(Element element) {
258264
var viewUsage = SysmlFactory.eINSTANCE.createViewUsage();
259265
element.getOwnedRelationship().add(viewUsageMembership);
260266
viewUsageMembership.getOwnedRelatedElement().add(viewUsage);
261-
viewUsage.setDeclaredName("General View");
267+
viewUsage.setDeclaredName("view1");
262268
viewUsage.setElementId(ElementUtil.generateUUID(viewUsage).toString());
263269

264270
var featureTyping = SysmlFactory.eINSTANCE.createFeatureTyping();

‎backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/sysmlv2/SysONDefaultResourceProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Resource getDefaultSysMLv2Resource(UUID resourcePath, String name) {
7272
var package1 = SysmlFactory.eINSTANCE.createPackage();
7373
rootNamespace.getOwnedRelationship().add(rootMembership);
7474
rootMembership.getOwnedRelatedElement().add(package1);
75-
package1.setDeclaredName("Package 1");
75+
package1.setDeclaredName("Package1");
7676
package1.setElementId(ElementUtil.generateUUID(package1).toString());
7777

7878
resource.getContents().add(rootNamespace);

‎backend/application/syson-application-configuration/src/main/resources/templates/Batmobile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6276,7 +6276,7 @@
62766276
"id": "b38b489f-9052-47f7-a417-0c1e137d0dca",
62776277
"eClass": "sysml:ViewUsage",
62786278
"data": {
6279-
"declaredName": "General View",
6279+
"declaredName": "view1",
62806280
"elementId": "b63738a8-448c-4de2-a71d-00c512807fdf",
62816281
"ownedRelationship": [
62826282
{

‎backend/application/syson-application-configuration/src/main/resources/templates/Batmobile.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ package Batmobile {
292292
part :>> wheels = wheels.xWheel;
293293
}
294294

295-
view 'General View' : StandardViewDefinitions::GeneralView {
295+
view 'view1' : StandardViewDefinitions::GeneralView {
296296
expose Vehicle;
297297
expose Vehicle::driver;
298298
expose Vehicle::engine;

‎backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/ActionFlowViewDiagramDescriptionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public RepresentationDescription create(IColorProvider colorProvider) {
5050
.domainType(SysMLMetamodelHelper.buildQualifiedName(SysmlPackage.eINSTANCE.getNamespace()))
5151
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("canCreateDiagram"))
5252
.name(DESCRIPTION_NAME)
53-
.titleExpression(DESCRIPTION_NAME)
53+
.titleExpression("view")
5454
.build();
5555
}
5656
};

‎backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/InterconnectionViewDiagramDescriptionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public RepresentationDescription create(IColorProvider colorProvider) {
5050
.domainType(SysMLMetamodelHelper.buildQualifiedName(SysmlPackage.eINSTANCE.getElement()))
5151
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("canCreateDiagram"))
5252
.name(DESCRIPTION_NAME)
53-
.titleExpression(DESCRIPTION_NAME)
53+
.titleExpression("view")
5454
.build();
5555
}
5656
};

‎backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public RepresentationDescription create(IColorProvider colorProvider) {
297297
.domainType(domainType)
298298
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("canCreateDiagram"))
299299
.name(DESCRIPTION_NAME)
300-
.titleExpression(DESCRIPTION_NAME);
300+
.titleExpression("view");
301301

302302
var diagramDescription = diagramDescriptionBuilder.build();
303303

‎backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/StateTransitionViewDiagramDescriptionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public RepresentationDescription create(IColorProvider colorProvider) {
5151
.domainType(SysMLMetamodelHelper.buildQualifiedName(SysmlPackage.eINSTANCE.getNamespace()))
5252
.preconditionExpression(AQLUtils.getSelfServiceCallExpression("canCreateDiagram"))
5353
.name(DESCRIPTION_NAME)
54-
.titleExpression(DESCRIPTION_NAME)
54+
.titleExpression("view")
5555
.build();
5656
}
5757
};

0 commit comments

Comments
 (0)