Merge branch 'JAL-1347' into develop

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

diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index 21b877d..5315d1a 100755 (executable)
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -22,6 +22,8 @@ import jalview.analysis.AlignSeq;
 import java.util.Enumeration;
 import java.util.Vector;
 
+import fr.orsay.lri.varna.models.rna.RNA;
+
 /**
  * 
  * Implements the SequenceI interface for a char[] based sequence object.
@@ -48,19 +50,21 @@ public class Sequence implements SequenceI
   String vamsasId;
 
   DBRefEntry[] dbrefs;
+  
+  RNA rna;
 
   /**
    * This annotation is displayed below the alignment but the positions are tied
    * to the residues of this sequence
    */
   Vector annotation;
-  
+
   /**
-   * The index of the sequence in a MSA 
+   * The index of the sequence in a MSA
    */
   int index = -1;
 
-  /** array of seuqence features - may not be null for a valid sequence object */
+  /** array of sequence features - may not be null for a valid sequence object */
   public SequenceFeature[] sequenceFeatures;
 
   /**
@@ -122,7 +126,8 @@ public class Sequence implements SequenceI
 
   void checkValidRange()
   {
-    // Note: JAL-774 : http://issues.jalview.org/browse/JAL-774?focusedCommentId=11239&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-11239
+    // Note: JAL-774 :
+    // http://issues.jalview.org/browse/JAL-774?focusedCommentId=11239&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-11239
     {
       int endRes = 0;
       for (int j = 0; j < sequence.length; j++)
@@ -137,7 +142,8 @@ public class Sequence implements SequenceI
         endRes += start - 1;
       }
 
-      if (end<endRes) { 
+      if (end < endRes)
+      {
         end = endRes;
       }
     }
@@ -577,8 +583,9 @@ public class Sequence implements SequenceI
     return this.description;
   }
 
-  
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.datamodel.SequenceI#findIndex(int)
    */
   public int findIndex(int pos)
@@ -1177,16 +1184,29 @@ public class Sequence implements SequenceI
   }
 
   /**
-   * @return The index (zero-based) on this sequence in the MSA. 
-   * It returns {@code -1} if this information is not available.
+   * @return The index (zero-based) on this sequence in the MSA. It returns
+   *         {@code -1} if this information is not available.
    */
-  public int getIndex() { return index; }
-  
+  public int getIndex()
+  {
+    return index;
+  }
+
   /**
-   * Defines the position of this sequence in the MSA. 
-   * Use the value {@code -1} if this information is undefined.
+   * Defines the position of this sequence in the MSA. Use the value {@code -1}
+   * if this information is undefined.
    * 
-   * @param The position for this sequence. This value is zero-based (zero for this first sequence)
+   * @param The
+   *          position for this sequence. This value is zero-based (zero for
+   *          this first sequence)
    */
-  public void setIndex(int value) { index = value; }
+  public void setIndex(int value)
+  {
+    index = value;
+  }
+  
+  public void setRNA(RNA r){rna=r;}
+  
+  public RNA getRNA() { return rna; }
+  
 }