Merge branch 'features/JAL-2944_openStructuresInSelectedView' of https://source.jalvi...

diff --combined src/jalview/structure/StructureSelectionManager.java
index d68f346,7456304..ad259fd
--- 1/src/jalview/structure/StructureSelectionManager.java
--- 2/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@@ -285,8 -285,7 +285,8 @@@ public class StructureSelectionManage
    }
  
    /**
 -   * Returns the file name for a mapped PDB id (or null if not mapped).
 +   * Returns the filename the PDB id is already mapped to if known, or null if
 +   * it is not mapped
     * 
     * @param pdbid
     * @return
@@@ -295,7 -294,7 +295,7 @@@
    {
      for (StructureMapping sm : mappings)
      {
 -      if (sm.getPdbId().equals(pdbid))
 +      if (sm.getPdbId().equalsIgnoreCase(pdbid))
        {
          return sm.pdbfile;
        }
@@@ -573,6 -572,13 +573,13 @@@
              {
                System.err.println(e.getMessage());
              }
+             catch (Exception e)
+             {
+               System.err
+                       .println(
+                               "Unexpected exception during SIFTS mapping - falling back to NW for this sequence/structure pair");
+               System.err.println(e.getMessage());
+             }
            }
            if (!foundSiftsMappings.isEmpty())
            {
@@@ -606,10 -612,7 +613,10 @@@
        }
        if (forStructureView)
        {
 -        mappings.addAll(seqToStrucMapping);
 +        for (StructureMapping sm : seqToStrucMapping)
 +        {
 +          addStructureMapping(sm); // not addAll!
 +        }
        }
        if (progress != null)
        {
@@@ -661,10 -664,7 +668,10 @@@
  
    public void addStructureMapping(StructureMapping sm)
    {
 -    mappings.add(sm);
 +    if (!mappings.contains(sm))
 +    {
 +      mappings.add(sm);
 +    }
    }
  
    /**