JAL-2371 CollectionColourScheme wraps ColourSchemeI

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

diff --git a/src/jalview/schemes/RNAInteractionColourScheme.java b/src/jalview/schemes/RNAInteractionColourScheme.java
index f4c831a..d236803 100644 (file)
--- a/src/jalview/schemes/RNAInteractionColourScheme.java
+++ b/src/jalview/schemes/RNAInteractionColourScheme.java
@@ -45,25 +45,12 @@ public class RNAInteractionColourScheme extends ResidueColourScheme
   public Color findColour(char c, int j, SequenceI seq)
   {
     // FIXME this is just a copy of NucleotideColourScheme
-    Color currentColour;
-    if ((threshold == 0) || aboveThreshold(c, j))
+    Color currentColour = Color.white;
+    try
     {
-      try
-      {
-        currentColour = colors[ResidueProperties.nucleotideIndex[c]];
-      } catch (Exception ex)
-      {
-        return Color.white;
-      }
-    }
-    else
-    {
-      return Color.white;
-    }
-
-    if (conservationColouring)
+      currentColour = colors[ResidueProperties.nucleotideIndex[c]];
+    } catch (Exception ex)
     {
-      currentColour = applyConservation(currentColour, j);
     }
 
     return currentColour;