fix a BEAUti bug to drop package-provided InputEditors and add tests - #154
Merged
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
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.
Fix #153
Problem
InputEditorFactory.init()only consultedPackageManager.listServices()(themechanism that discovers InputEditors contributed by external BEAST packages, via
their
version.xml) whenServiceLoader.load()had found zero editors. Since areal BEAUti run always finds several core beast.fx editors via
ServiceLoaderfirst,that condition was never true in practice — meaning package-provided editors (e.g.
starbeast3's
MRCAPriorInputEditorSB3) were never registered, silently. See #.ServiceLoader.load()cannot see into the separate JPMSModuleLayerthatPackageManagerloads each package into at runtime — that's expected JPMS design, nota defect — so
PackageManager.listServices()is not optional supplementary discovery;it's the only path to package-provided editors and must always run.
Fix
beast-fx/src/main/java/beastfx/app/inputeditor/InputEditorFactory.java:removed the
inputEditorMap.size() == 0(and the now-redundantisJUnitTest()) guardaround the
PackageManager.listServices()call, so it always runs in addition to theServiceLoader.load()pass, merging results from both.registerInputEditors()already just adds map entries, so this cannot clobber any core editor already found by
ServiceLoader— it can only add entries for types core editors don't already cover.