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.

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

Serialization fixes #84

Merged
merged 3 commits into from Mar 1, 2018

Conversation

Projects
None yet
3 participants
@philip-alldredge
Contributor

philip-alldredge commented Feb 28, 2018

Fixes no context serialization issues when working with the graphical editor as discussed for osate/osate2-core#1074.

philip-alldredge added some commits Sep 19, 2017

Adjustments to unparsing and serialization to allow AGREE specifications
to be modified using GUI tools.

Conflicts:
	fm-workbench/agree/com.rockwellcollins.atc.agree.ui/src/com/rockwellcollins/atc/agree/unparsing/AgreeAnnexUnparser.java
	fm-workbench/agree/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/serializer/AgreeSerializer.java
@philip-alldredge

This comment has been minimized.

Contributor

philip-alldredge commented Feb 28, 2018

I'm not quite sure what setting the name for the annex library/subclause is necessary, but it is. EMV2AnnexUnparser does something similar for subclauses. However, EMV2AnnexUnparser does not do it for libraries.

@philip-alldredge

This comment has been minimized.

Contributor

philip-alldredge commented Feb 28, 2018

@lwrage With this fix, serializing annexes while in the graphical editor still depends on osate/osate2-core#1064.

@philip-alldredge

This comment has been minimized.

Contributor

philip-alldredge commented Feb 28, 2018

@lwrage to be clear, this change also formats the AGREE annex during serialization to get rid of the white space as discussed in osate/osate2-core#1074. It has a negative side effect of having incorrect indention but it seems to be better in the alternative.

@philip-alldredge

This comment has been minimized.

Contributor

philip-alldredge commented Feb 28, 2018

@joeseibel @lwrage formatting in the annex like this has the down side of all formatting being lost, but that is already the typical behavior of the graphical editor. Thoughts about whether to include the formatting portion?

@lwrage

This comment has been minimized.

Contributor

lwrage commented Mar 1, 2018

The formatting is not necessary. We have a fix for core that strips the leading spaces from any serialized annex.

@philip-alldredge

This comment has been minimized.

Contributor

philip-alldredge commented Mar 1, 2018

@lwrage I have disabled the formatting in the AGREE unparser.

@lwrage lwrage merged commit dafa015 into develop Mar 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment