Merge branch 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...

[jalview.git] / src / jalview / datamodel / Alignment.java

diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index c4098e2..f389ad8 100755 (executable)
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -21,6 +21,7 @@
 package jalview.datamodel;
 
 import jalview.analysis.AlignmentUtils;
+import jalview.analysis.Conservation;
 import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping;
 import jalview.io.FastaFile;
 import jalview.util.Comparison;
@@ -71,6 +72,12 @@ public class Alignment implements AlignmentI, AutoCloseable
 
   private List<AlignedCodonFrame> codonFrameList;
 
+  private Conservation conservation;
+
+  private ProfilesI consensus;
+
+  private Hashtable[] codonConsensus, rnaStructureConsensus;
+
   private void initAlignment(SequenceI[] seqs)
   {
     groups = Collections.synchronizedList(new ArrayList<SequenceGroup>());
@@ -195,7 +202,7 @@ public class Alignment implements AlignmentI, AutoCloseable
   {
     synchronized (sequences)
     {
-    
+
       if (i > -1 && i < sequences.size())
       {
         return sequences.get(i);
@@ -716,7 +723,7 @@ public class Alignment implements AlignmentI, AutoCloseable
   public int getWidth()
   {
     int maxLength = -1;
-  
+
     for (int i = 0; i < sequences.size(); i++)
     {
       maxLength = Math.max(maxLength, getSequenceAt(i).getLength());
@@ -2032,4 +2039,55 @@ public class Alignment implements AlignmentI, AutoCloseable
     }
   }
 
+  @Override
+  public Hashtable[] getComplementConsensusHash()
+  {
+    return codonConsensus;
+  }
+
+  @Override
+  public Conservation getConservation()
+  {
+    return conservation;
+  }
+
+  @Override
+  public Hashtable[] getRnaStructureConsensusHash()
+  {
+    return rnaStructureConsensus;
+  }
+
+  @Override
+  public ProfilesI getSequenceConsensusHash()
+  {
+    return consensus;
+  }
+
+  @Override
+  public void setComplementConsensusHash(Hashtable[] hconsensus)
+  {
+    codonConsensus = hconsensus;
+
+  }
+
+  @Override
+  public void setConservation(Conservation cons)
+  {
+    conservation = cons;
+
+  }
+
+  @Override
+  public void setRnaStructureConsensusHash(Hashtable[] hStrucConsensus)
+  {
+    rnaStructureConsensus = hStrucConsensus;
+
+  }
+
+  @Override
+  public void setSequenceConsensusHash(ProfilesI hconsensus)
+  {
+    consensus = hconsensus;
+
+  }
 }