Merge branch 'Jalview-BH/JAL-3026' into

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

diff --git a/src/jalview/schemes/RNAHelicesColour.java b/src/jalview/schemes/RNAHelicesColour.java
index aacf557..dbc9c03 100644 (file)
--- a/src/jalview/schemes/RNAHelicesColour.java
+++ b/src/jalview/schemes/RNAHelicesColour.java
@@ -125,9 +125,9 @@ public class RNAHelicesColour extends ResidueColourScheme
   public void refresh()
   {
 
-    if (annotation != null
-            && ((annotation._rnasecstr == null || lastrefresh != annotation._rnasecstr
-                    .hashCode()) && annotation.isValidStruc()))
+    if (annotation != null && ((annotation._rnasecstr == null
+            || lastrefresh != annotation._rnasecstr.hashCode())
+            && annotation.isValidStruc()))
     {
       annotation.getRNAStruc();
       lastrefresh = annotation._rnasecstr.hashCode();
@@ -151,11 +151,11 @@ public class RNAHelicesColour extends ResidueColourScheme
         positionsToHelix.put(this.annotation._rnasecstr[x].getEnd(),
                 this.annotation._rnasecstr[x].getFeatureGroup());
 
-        if (Integer.parseInt(this.annotation._rnasecstr[x]
-                .getFeatureGroup()) > numHelix)
+        if (Integer.parseInt(
+                this.annotation._rnasecstr[x].getFeatureGroup()) > numHelix)
         {
-          numHelix = Integer.parseInt(this.annotation._rnasecstr[x]
-                  .getFeatureGroup());
+          numHelix = Integer.parseInt(
+                  this.annotation._rnasecstr[x].getFeatureGroup());
         }
 
       }
@@ -230,17 +230,8 @@ public class RNAHelicesColour extends ResidueColourScheme
     }
 
     /*
-     * check dataset
+     * not currently supporting this option for group annotation / colouring
      */
-    AnnotatedCollectionI context = ac.getContext();
-    if (context == null)
-    {
-      context = ac;
-    }
-    if (context instanceof AlignmentI)
-    {
-      return ((AlignmentI) context).hasRNAStructure();
-    }
     return false;
   }
 
@@ -249,4 +240,10 @@ public class RNAHelicesColour extends ResidueColourScheme
   {
     return JalviewColourScheme.RNAHelices.toString();
   }
+
+  @Override
+  public boolean isSimple()
+  {
+    return false;
+  }
 }