Merge branch 'develop' of https://source.jalview.org/git/jalview into features/JAL...

diff --combined src/MCview/AppletPDBCanvas.java
index 277b84d,c454203..39111c3
--- 1/src/MCview/AppletPDBCanvas.java
--- 2/src/MCview/AppletPDBCanvas.java
+++ b/src/MCview/AppletPDBCanvas.java
@@@ -178,7 -178,7 +178,7 @@@ public class AppletPDBCanvas extends Pa
  
      colourBySequence();
  
-     int max = -10;
+     float max = -10;
      int maxchain = -1;
      int pdbstart = 0;
      int pdbend = 0;
@@@ -1119,7 -1119,7 +1119,7 @@@
    // ////////////////////////////////
    // /StructureListener
    @Override
 -  public String[] getPdbFile()
 +  public String[] getStructureFiles()
    {
      return new String[] { pdbentry.getFile() };
    }

diff --combined src/MCview/PDBCanvas.java
index 3b47d94,ff1211a..83642cc
--- 1/src/MCview/PDBCanvas.java
--- 2/src/MCview/PDBCanvas.java
+++ b/src/MCview/PDBCanvas.java
@@@ -177,7 -177,7 +177,7 @@@ public class PDBCanvas extends JPanel i
  
      colourBySequence();
  
-     int max = -10;
+     float max = -10;
      int maxchain = -1;
      int pdbstart = 0;
      int pdbend = 0;
@@@ -1075,7 -1075,7 +1075,7 @@@
    // ////////////////////////////////
    // /StructureListener
    @Override
 -  public String[] getPdbFile()
 +  public String[] getStructureFiles()
    {
      return new String[] { pdbentry.getFile() };
    }

diff --combined src/jalview/structure/StructureSelectionManager.java
index 6930161,0990b56..b993be2
--- 1/src/jalview/structure/StructureSelectionManager.java
--- 2/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@@ -454,7 -454,7 +454,7 @@@ public class StructureSelectionManage
         * Attempt pairwise alignment of the sequence with each chain in the PDB,
         * and remember the highest scoring chain
         */
-       int max = -10;
+       float max = -10;
        AlignSeq maxAlignseq = null;
        String maxChainId = " ";
        PDBChain maxChain = null;
@@@ -739,7 -739,7 +739,7 @@@
        if (listeners.elementAt(i) instanceof StructureListener)
        {
          sl = (StructureListener) listeners.elementAt(i);
 -        for (String pdbfile : sl.getPdbFile())
 +        for (String pdbfile : sl.getStructureFiles())
          {
            pdbs.remove(pdbfile);
          }