From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 29 May 2017 13:19:41 +0000 (+0100)
Subject: Merge branch 'features/JAL-2465_No-mapping_Jmol-structures-loaded-via-url' into develop
X-Git-Tag: Release_2_10_2~3^2~57
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=954039bbfbde3648ac4c795277e788e49be5181b;p=jalview.git

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

954039bbfbde3648ac4c795277e788e49be5181b
diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index 870c4fe,daf6131..b954677
--- a/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))
      {