Merge branch 'JAL-952_rnahelix' into develop

[jalview.git] / src / jalview / schemes / ColourSchemeProperty.java

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 76b1ff1..8996691 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -89,6 +89,8 @@ public class ColourSchemeProperty
   
   public static final int RNAHELIX = 16;
 
+  public static final int RNAINTERACTION = 16;
+
   /**
    * index of first colourscheme (includes 'None')
    */
@@ -169,6 +171,10 @@ public class ColourSchemeProperty
     {
       ret = PURINEPYRIMIDINE;
     }
+    else if (name.equalsIgnoreCase("RNA Interaction type"))
+    {
+      ret = RNAINTERACTION;
+    }
     else if (name.equalsIgnoreCase("RNA Helices"))
     {
       ret = RNAHELIX;
@@ -246,10 +252,16 @@ public class ColourSchemeProperty
     {
       index = TCOFFEE;
     }
+<<<<<<< HEAD
+   
+    
+    
+=======
     else if (cs instanceof RNAHelicesColour)
     {
       index = RNAHELIX;
     }
+>>>>>>> JAL-952_rnahelix
     /*
      * else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
      */
@@ -344,10 +356,18 @@ public class ColourSchemeProperty
       ret = "T-Coffee Scores";
 
       break;
+<<<<<<< HEAD
+      
+    case RNAINTERACTION:
+        ret = "RNA Interaction type";
+
+        break;
+=======
     case RNAHELIX:
       ret = "RNA Helices";
 
       break;
+>>>>>>> JAL-952_rnahelix
     /*
      * case COVARIATION: ret = "Covariation";
      * 
@@ -507,8 +527,7 @@ public class ColourSchemeProperty
       
       // case COVARIATION:
       // cs = new CovariationColourScheme(annotation);
-
-      // break;
+    // break;
 
     case USER_DEFINED:
       Color[] col = new Color[24];