Make XStream more agreeable, and other fixes #4067
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With the move to Java 20, JOptionPane is no longer respecting our newlines. So we have to replace them with `<br/>` instead.
The two enum types known to be referenced are: - `net.rptools.maptool.model.ShapeType` - `net.rptools.maptool.client.ui.token.BarTokenOverlay.Side` Some old campaigns still have references to these, and by adding them they can be opened once again.
This field was missed in the `readResolve()` method.
Old campaigns could deserialize with the `width` field being null. This is now handled via `readResolve()` rather than being leaving it up to later interactions to provide a value.
cwisniew
approved these changes
May 16, 2023
kwvanderlinde
deleted the
bugfix/4066-old-xstream-artifacts-giving-us-trouble
branch
cwisniew
added
the
code-maintenance
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
ShapeTypeis now considered referencable by XStream. This allows it to load campaigns that contain references to aShapeTypewhile still not writing them out anymore. The same was done toBarTokenOverlay.Sideto load other campaigns.On the way, a few other problems were found and fixed:
MacroButtonProperties.saveLocationwas forgotten inreadResolve()in Make almost all of MacroButtonProperties fields non-null #4052, causing some NPEsLineSegment.widthwas 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