Make XStream more agreeable, and other fixes #4067
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Identify the Bug or Feature request
Fixes #4066
Description of the Change
The enum
ShapeType
is now considered referencable by XStream. This allows it to load campaigns that contain references to aShapeType
while still not writing them out anymore. The same was done toBarTokenOverlay.Side
to load other campaigns.On the way, a few other problems were found and fixed:
MacroButtonProperties.saveLocation
was forgotten inreadResolve()
in Make almost all of MacroButtonProperties fields non-null #4052, causing some NPEsLineSegment.width
was nullable, andtoDto()
was not accounting for that. It is no longer nullable, asreadResolve()
handles it.Possible Drawbacks
Higher memory usage according to the XStream docs.
Documentation Notes
N/A
Release Notes
This change is