Fix resource library double install #5866
Merged
+14
−77
Conversation
This file contains hidden or 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
kwvanderlinde
force-pushed
the
bugfix/5865-add-resource-double-install
branch
from
43b4c1c to
474ff21
Compare
This isn't the right situation to throw an exception, since it is at least as likely to indicate a failure for previous code to unbind the model rather than being a problem of the current caller double-binding. Throwing an exception here has the potential to crash MT and even the OS as the exception is reported in error dialogs on repeat. This case still indicates a logical error, though, so log it as such. But after that, just unbind the old model and carry on.
- Make `GenericDialogFactory#delegate()` private instead of package-private. - Do not suppress the `UnusedReturnValue` warnings in `GenericDialogFactory`, since none of these methods generate that warning. - Remove unused `GenericDialog#_preferredSize` and `#getAllComponents(Container)` - Make `GenericDialog#_resizable` private instead of `protected`. - Use `instanceof` pattern matching in `GenericDialog` to avoid repeated casts of the content component to `AbeillePanel`. - Remove commented out code in `GenericDialog`.
`GenericDialog` automatically commits the dialog since the content component is an `AbeillePanel` with a bound model. This means we don't have to manually wire up the INSTALL button to the `#commit()` method, and in fact doing so is what causes resource libraries to be installed doubly. Also removes the redundant `AddResourceDialog#model` field - as an `AbeillePanel`, the `getModel()` method already returns this same value.
kwvanderlinde
force-pushed
the
bugfix/5865-add-resource-double-install
branch
from
474ff21 to
4842e0a
Compare
cwisniew
approved these changes
Nov 18, 2025
github-project-automation
bot
moved this from Awaiting-Review
to To-Be-Merged
in MapTool 1.19
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #5865
Description of the Change
Removes the
ButtonKind.INSTALLlistener fromAddResourceDialogsince itsGenericDialogwill automatically callcommit()for us when the dialog is approvingly closed. Doing so in a listener as well causes the redundant installation.Also did some minor clean up in
GenericDialogandGenericDialogFactoryto remove unused code and improve encapsulation.Possible Drawbacks
None
Documentation Notes
N/A
Release Notes
This change is