Merge branch 'features/JAL-2465_No-mapping_Jmol-structures-loaded-via-url' into develop

diff --cc src/jalview/ext/jmol/JalviewJmolBinding.java
Simple merge

diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index 870c4fe,daf6131..b954677
--- 1/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
--- 2/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@@ -337,10 -337,10 +337,10 @@@ public abstract class JalviewChimeraBin
     */
    @Override
    public String superposeStructures(AlignmentI[] _alignment,
 -          int[] _refStructure, ColumnSelection[] _hiddenCols)
 +          int[] _refStructure, HiddenColumns[] _hiddenCols)
    {
      StringBuilder allComs = new StringBuilder(128);
-     String[] files = getPdbFile();
+     String[] files = getStructureFiles();
  
      if (!waitForFileLoad(files))
      {

diff --cc src/jalview/gui/ChimeraViewFrame.java
Simple merge

diff --cc src/jalview/gui/StructureViewerBase.java
Simple merge

diff --cc src/jalview/io/FileLoader.java
Simple merge

diff --cc src/jalview/structure/StructureSelectionManager.java
Simple merge

diff --cc src/jalview/structures/models/AAStructureBindingModel.java
Simple merge

diff --cc test/jalview/structures/models/AAStructureBindingModelTest.java
Simple merge