[1978] Add support for PortionKind edition with direct-edit in diagrams by gcoutable · Pull Request #2016 · eclipse-syson/syson

gcoutable · 2026-02-20T15:44:15Z

Bug: #1978
Signed-off-by: Guillaume Coutable guillaume.coutable@obeo.fr

PLEASE READ ALL ITEMS AND CHECK ONLY RELEVANT CHECKBOXES BELOW

Auto review

Have you reviewed this PR? Please do a first quick review, It is very useful to detect typos and missing copyrights, check comments, check your code... The reviewer will thank you for that :)

Project management

Has the pull request been added to the relevant milestone?
Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
Have the relevant issues been added to the pull request?
Have the relevant labels been added to the issues? (area:, type:)
Have the relevant issues been added to the same project milestone as the pull request?

Changelog and release notes

Has the CHANGELOG.adoc + doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc been updated to reference the relevant issues?
Have the relevant API breaks been described in the CHANGELOG.adoc?
Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc?
In case of a change with a visual impact, are there any screenshots in the doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?
In case of a key change, has the change been added to Key highlights section in doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?

Documentation

Have you included an update of the documentation in your pull request? Please ask yourself if an update (installation manual, user manual, developer manual...) is needed and add one accordingly.

Tests

Is the code properly tested? Any pull request (fix, enhancement or new feature) should come with a test (or several). It could be unit tests, integration tests or cypress tests depending on the context. Only doc and releng pull request do not need for tests.

AxelRICHARD · 2026-02-24T16:20:05Z

doc/content/modules/user-manual/pages/release-notes/2026.3.0.adoc

 ** Newly created `InterfaceDefinition` graphical nodes now have two initial _ports_ named _source_ and _target_.
 Additional ports can be created using the _New Port as end_ graphical node tool.
-
+** Allow to edit the _timeslice_ and _snapshot_ property of `OccurrenceUsage` and subtypes graphical nodes with the direct edit.


property => properties

OccurrenceUsage and subtypes graphical nodes => OccurrenceUsage graphical nodes (and all its subtypes such as PartUsage, ItemUsage...)

apply the changes in the changelog as well

AxelRICHARD · 2026-02-24T16:22:56Z

...vices/syson-services/src/main/java/org/eclipse/syson/services/DiagramDirectEditListener.java

+    public void exitPortionKindExpression(PortionKindExpressionContext ctx) {
+        if (this.element instanceof OccurrenceUsage occurrenceUsage) {
+            if (ctx != null) {
+                if (ctx.getText().equals(LabelConstants.TIMESLICE)) {


Inverse the operands or use Objects.equals

AxelRICHARD · 2026-02-24T16:23:00Z

...vices/syson-services/src/main/java/org/eclipse/syson/services/DiagramDirectEditListener.java

+            if (ctx != null) {
+                if (ctx.getText().equals(LabelConstants.TIMESLICE)) {
+                    occurrenceUsage.setPortionKind(PortionKind.TIMESLICE);
+                } else if (ctx.getText().equals(LabelConstants.SNAPSHOT)) {


Inverse the operands or use Objects.equals

AxelRICHARD · 2026-02-24T16:25:16Z

backend/services/syson-direct-edit-grammar/src/main/resources/DirectEdit.g4

 REFERENCES : 'references';
 REP : 'rep';
 RETURN : 'return';
+SNAPSHOT_PREFIX : 'snapshot';


you should probably do as it done by DERIVED/DERIVED_PREFIX or CONSTANT/CONSTANT_PREFIX

AxelRICHARD · 2026-02-24T16:25:22Z

backend/services/syson-direct-edit-grammar/src/main/resources/DirectEdit.g4

 SUBTYPE : 'subtype';
 SUCCESSION : 'succession';
 THEN : 'then';
+TIMESLICE_PREFIX : 'timeslice';


same comment

AxelRICHARD · 2026-02-24T16:27:58Z

backend/services/syson-direct-edit-grammar/src/main/resources/DirectEdit.g4


 prefixNodeExpression : 
-	(abstractPrefixExpression | variationPrefixExpression | variantPrefixExpression)*
+	(portionKindExpression)* (abstractPrefixExpression | variationPrefixExpression | variantPrefixExpression)*


it's a really strange change at first sight. why did you not add portionKindExpression as a new possibility of prefix with | ?
In other words:
FROM
(abstractPrefixExpression | variationPrefixExpression | variantPrefixExpression)*
TO
(abstractPrefixExpression | variationPrefixExpression | variantPrefixExpression | portionKindExpression)*

Because I wanted to force the portionKindPrefixExpression to be the first prefix has it is described in the specification, but maybe that is not the best way to do it

I will also rename portionKindExpression to portionKindPrefixExpression

Because I wanted to force the portionKindPrefixExpression to be the first prefix has it is described in the specification, but maybe that is not the best way to do it

But since it is for the direct edit, that does not matter where the user has to type the keyword.
I will do as you suggested.

AxelRICHARD · 2026-02-24T16:29:02Z

.../java/org/eclipse/syson/application/controllers/diagrams/general/view/GVDirectEditTests.java

-    @Sql(scripts = { GeneralViewDirectEditTestProjectData.SCRIPT_PATH }, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
-            config = @SqlConfig(transactionMode = SqlConfig.TransactionMode.ISOLATED))
-    @Sql(scripts = { "/scripts/cleanup.sql" }, executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD, config = @SqlConfig(transactionMode = SqlConfig.TransactionMode.ISOLATED))
+    @GivenSysONServer({ GeneralViewDirectEditTestProjectData.SCRIPT_PATH })


Bug: #1978 Signed-off-by: Guillaume Coutable <guillaume.coutable@obeo.fr>

gcoutable added pr: to review later priority: high labels Feb 20, 2026

gcoutable added this to the 2026.3.0 milestone Feb 20, 2026

gcoutable linked an issue Feb 20, 2026 that may be closed by this pull request

Allow to direct edit the "timeslice" prefix #1978

Open

gcoutable force-pushed the gco/enh/portion-kind-prefix-direct-edit branch from 5d3aebe to 6b3fccd Compare February 20, 2026 15:49

gcoutable marked this pull request as ready for review February 20, 2026 15:52

AxelRICHARD reviewed Feb 24, 2026

View reviewed changes

[1978] Add support for PortionKind edition with direct-edit in diagrams

9729c57

Bug: #1978 Signed-off-by: Guillaume Coutable <guillaume.coutable@obeo.fr>

gcoutable force-pushed the gco/enh/portion-kind-prefix-direct-edit branch from 6b3fccd to 9729c57 Compare March 2, 2026 14:53

Conversation

gcoutable commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PLEASE READ ALL ITEMS AND CHECK ONLY RELEVANT CHECKBOXES BELOW

Auto review

Project management

Changelog and release notes

Documentation

Tests

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

gcoutable commented Feb 20, 2026 •

edited

Loading