Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

392: Add categories to the model #129

Merged
merged 7 commits into from
Oct 19, 2021
Merged

392: Add categories to the model #129

merged 7 commits into from
Oct 19, 2021

Conversation

CamilleLetavernier
Copy link
Member

@CamilleLetavernier CamilleLetavernier commented Sep 15, 2021 •
edited
Loading

  • Add structured compartments using X/Y Layout
  • Improve VBox Layout to support stacking variable-size compartments
  • Introduce LayoutData to configure the new VBox layout (and potentially other layouts as well)
  • Add a custom TypeAdapter for LayoutData to workaround EMF-to-JSon serialization issues (See EMF to JSon serialization doesn't work for nested data types glsp#393 )
  • Introduce GeometryUtil to convert from absolute to relative coordinates on the Server

This PR should be reviewed together with the corresponding client-side changes: eclipse-glsp/glsp-client/pull/136

@CamilleLetavernier CamilleLetavernier marked this pull request as draft September 15, 2021 16:35
@CamilleLetavernier CamilleLetavernier mentioned this pull request Sep 16, 2021
Merged
@CamilleLetavernier CamilleLetavernier marked this pull request as ready for review September 16, 2021 07:17
@CamilleLetavernier CamilleLetavernier mentioned this pull request Sep 16, 2021
Merged
@CamilleLetavernier @tortmayr
392: Add categories to the model
9aa29d5 
- Add structured compartments using X/Y Layout
- Improve VBox Layout to support stacking variable-size compartments
- Introduce LayoutData to configure the new VBox layout (and potentially
other layouts as well)
- Add a custom TypeAdapter for LayoutData to workaround EMF-to-JSon
serialization issues
- Introduce GeometryUtil to convert from absolute to relative
coordinates on the Server

Fixes eclipse-glsp/glsp/issues/392

Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
@CamilleLetavernier @tortmayr
392: Fix checkstyle warnings
67ededf 
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
@tortmayr
Copy link
Contributor

tortmayr commented Oct 5, 2021

@CamilleLetavernier #127 has been merged so I have rebased your PR to resolve conflicts

@martin-fleck-at
Copy link
Contributor

@CamilleLetavernier I also did a quick update of your commit to fix minor code issues. I also removed the new 'layoutData' after talking to Philip. Please see also my comments on the client change. We can discuss this of course but adding yet another layout map/object does not seem necessary to me.

@tortmayr
Copy link
Contributor

tortmayr commented Oct 9, 2021 •
edited
Loading

It looks like there are some inconsistences in the copyright-headers of the generated ecore code. For new files (like Category.java) the copyright header is correct (2019-2021). For file that are just changed the copyright header is wrong (2019-2020).

@martin-fleck-at
Copy link
Contributor

@tortmayr Great catch! I did as you suggested and re-generated all files and added a new commit.

@planger
Copy link
Member

planger commented Oct 11, 2021

Please be aware that there are a few overwritten methods (marked with @generated not) in the GLSP Graph model code.

@tortmayr tortmayr self-requested a review October 18, 2021 09:27
@tortmayr
Copy link
Contributor

Thanks! LGTM! 👍

@martin-fleck-at martin-fleck-at merged commit 54bb925 into master Oct 19, 2021
@martin-fleck-at martin-fleck-at deleted the issues/392 branch October 19, 2021 07:34
@tortmayr tortmayr mentioned this pull request Nov 1, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tortmayr tortmayr Awaiting requested review from tortmayr

Assignees
No one assigned
Labels
changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@CamilleLetavernier @tortmayr @martin-fleck-at @planger