Merge branch 'features/JAL-3417_sdppred_calcs' into features/r2_11_2_JAL-3417_sdppred

diff --cc src/jalview/datamodel/Alignment.java
Simple merge

diff --cc src/jalview/datamodel/SequenceGroup.java
Simple merge

diff --cc src/jalview/viewmodel/AlignmentViewport.java
index 75cb45b,979f6ad..3691a69
--- 1/src/jalview/viewmodel/AlignmentViewport.java
--- 2/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@@ -746,9 -746,9 +748,10 @@@ public abstract class AlignmentViewpor
    }
  
    @Override
 -  public void setComplementConsensusHash(Hashtable[] hconsensus)
 +  public void setComplementConsensusHash(
 +          Hashtable<String, Object>[] hconsensus)
    {
+     alignment.setComplementConsensusHash(hconsensus);
      this.hcomplementConsensus = hconsensus;
    }
  
@@@ -771,9 -771,9 +774,10 @@@
    }
  
    @Override
 -  public void setRnaStructureConsensusHash(Hashtable[] hStrucConsensus)
 +  public void setRnaStructureConsensusHash(
 +          Hashtable<String, Object>[] hStrucConsensus)
    {
+     alignment.setRnaStructureConsensusHash(hStrucConsensus);
      this.hStrucConsensus = hStrucConsensus;
  
    }