Merge pull request #124 from CompEvol/fix/beauti-legacy-sitemodel-editor

Stop registering the legacy SiteModelInputEditor as a BEAUti editor

Author: walterxie

beast-fx/src/main/java/module-info.java

@@ -76,7 +76,12 @@
         beastfx.app.inputeditor.OutFileListInputEditor,
         beastfx.app.inputeditor.ParameterInputEditor,
         beastfx.app.inputeditor.ParametricDistributionInputEditor,
-        beastfx.app.inputeditor.SiteModelInputEditor,
+        // The legacy SiteModelInputEditor is intentionally NOT provided: the spec
+        // SiteModelInputEditor (below) is the BEAUti editor for SiteModelInterface.Base in
+        // 2.8. Both declared the same type(), so registering both let ServiceLoader order
+        // decide the winner, and the legacy one could win and emit legacy operators (e.g.
+        // BactrianDeltaExchangeOperator instead of the spec DeltaExchangeOperator). The
+        // class remains for LegacyStandard.xml's connect-method references.
         beastfx.app.inputeditor.StringInputEditor,
         beastfx.app.inputeditor.TreeFileInputEditor,
         beastfx.app.inputeditor.TreeFileListInputEditor,

beast-fx/version.xml

@@ -57,7 +57,10 @@
                 <provider classname="beastfx.app.inputeditor.OutFileListInputEditor"/>
                 <provider classname="beastfx.app.inputeditor.ParameterInputEditor"/>
                 <provider classname="beastfx.app.inputeditor.ParametricDistributionInputEditor"/>
-                <provider classname="beastfx.app.inputeditor.SiteModelInputEditor"/>
+                <!-- Legacy SiteModelInputEditor intentionally not registered: the spec
+                     SiteModelInputEditor is the BEAUti editor for SiteModelInterface.Base
+                     in 2.8. Registering both let service order pick the winner, and the
+                     legacy one could emit legacy operators. -->
                 <provider classname="beastfx.app.inputeditor.StringInputEditor"/>
                 <provider classname="beastfx.app.inputeditor.TreeFileInputEditor"/>
                 <provider classname="beastfx.app.inputeditor.TreeFileListInputEditor"/>