X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeProperty.java;h=cc303d65e21308178bd79cd596701250d85897e8;hb=5002a0f587ac8f1c18117e29bb4be2754743afc2;hp=899669147737ed44f810e71d29fdaac8a09ad1ca;hpb=f806dc4df78ef916ec8c41abeda1e836821ac18d;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 8996691..cc303d6 100755
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * 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.
+ * 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 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
@@ -86,17 +88,17 @@ public class ColourSchemeProperty
   public static final int COVARIATION = 14;
 
   public static final int TCOFFEE = 15;
-  
+
   public static final int RNAHELIX = 16;
 
-  public static final int RNAINTERACTION = 16;
+  public static final int RNAINTERACTION = 17;
 
   /**
    * index of first colourscheme (includes 'None')
    */
   public static final int FIRST_COLOUR = NONE;
 
-  public static final int LAST_COLOUR = RNAHELIX;
+  public static final int LAST_COLOUR = RNAINTERACTION;
 
   /**
    * DOCUMENT ME!
@@ -252,16 +254,10 @@ public class ColourSchemeProperty
     {
       index = TCOFFEE;
     }
-<<<<<<< HEAD
-   
-    
-    
-=======
     else if (cs instanceof RNAHelicesColour)
     {
       index = RNAHELIX;
     }
->>>>>>> JAL-952_rnahelix
     /*
      * else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
      */
@@ -356,18 +352,15 @@ public class ColourSchemeProperty
       ret = "T-Coffee Scores";
 
       break;
-<<<<<<< HEAD
-      
+
     case RNAINTERACTION:
-        ret = "RNA Interaction type";
+      ret = "RNA Interaction type";
 
-        break;
-=======
+      break;
     case RNAHELIX:
       ret = "RNA Helices";
 
       break;
->>>>>>> JAL-952_rnahelix
     /*
      * case COVARIATION: ret = "Covariation";
      * 
@@ -520,13 +513,13 @@ public class ColourSchemeProperty
     case TCOFFEE:
       cs = new TCoffeeColourScheme(coll);
       break;
-    
+
     case RNAHELIX:
       cs = new RNAHelicesColour(coll);
       break;
-      
-      // case COVARIATION:
-      // cs = new CovariationColourScheme(annotation);
+
+    // case COVARIATION:
+    // cs = new CovariationColourScheme(annotation);
     // break;
 
     case USER_DEFINED: