Skip to content
This repository has been archived by the owner. It is now read-only.

Serialization fixes #84

Merged
merged 3 commits into from Mar 1, 2018
Merged

Serialization fixes #84

merged 3 commits into from Mar 1, 2018

Conversation

@philip-alldredge
Copy link
Contributor

@philip-alldredge philip-alldredge commented Feb 28, 2018

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

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
Copy link
Contributor Author

@philip-alldredge 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
Copy link
Contributor Author

@philip-alldredge 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
Copy link
Contributor Author

@philip-alldredge 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
Copy link
Contributor Author

@philip-alldredge 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
Copy link
Contributor

@lwrage 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
Copy link
Contributor Author

@philip-alldredge philip-alldredge commented Mar 1, 2018

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants