Merge branch 'jims_marckhacks' into develop

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

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 4132f32..d608a80 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -1,6 +1,6 @@
 /*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,6 +14,7 @@
  * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
 
@@ -246,10 +247,7 @@ public class ColourSchemeProperty
     {
       index = TCOFFEE;
     }
-    else if (cs instanceof RNAInteractionColourScheme)
-    {
-      index = RNAINTERACTION;
-    }
+   
     
     
     /*
@@ -504,14 +502,12 @@ public class ColourSchemeProperty
       cs = new TCoffeeColourScheme(coll);
       break;
       
-    case RNAINTERACTION:
-        cs = new RNAInteractionColourScheme();
-        break;
+
       
     // case COVARIATION:
     // cs = new CovariationColourScheme(annotation);
 
-      // break;
+    // break;
 
     case USER_DEFINED:
       Color[] col = new Color[24];