Merge branch 'features/JAL-845splitPaneMergeDevelop' into develop

[jalview.git] / src / jalview / renderer / seqfeatures / FeatureRenderer.java

diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index 5e6ac29..fa91342 100644 (file)
--- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@ -188,12 +188,11 @@ public class FeatureRenderer extends
       return initialCol;
     }
 
-    final SequenceI aseq = (seq.getDatasetSequence() != null) ? seq
-            .getDatasetSequence() : seq;
+    SequenceFeature[] sf = seq.getSequenceFeatures();
     if (seq != lastSeq)
     {
       lastSeq = seq;
-      sequenceFeatures = aseq.getSequenceFeatures();
+      sequenceFeatures = sf;
       if (sequenceFeatures != null)
       {
         sfSize = sequenceFeatures.length;
@@ -201,9 +200,9 @@ public class FeatureRenderer extends
     }
     else
     {
-      if (sequenceFeatures != aseq.getSequenceFeatures())
+      if (sequenceFeatures != sf)
       {
-        sequenceFeatures = aseq.getSequenceFeatures();
+        sequenceFeatures = sf;
         if (sequenceFeatures != null)
         {
           sfSize = sequenceFeatures.length;
@@ -268,10 +267,8 @@ public class FeatureRenderer extends
   public synchronized void drawSequence(Graphics g, final SequenceI seq,
           int start, int end, int y1)
   {
-    final SequenceI aseq = (seq.getDatasetSequence() != null) ? seq
-            .getDatasetSequence() : seq;
-    if (aseq.getSequenceFeatures() == null
-            || aseq.getSequenceFeatures().length == 0)
+    SequenceFeature[] sf = seq.getSequenceFeatures();
+    if (sf == null || sf.length == 0)
     {
       return;
     }
@@ -284,10 +281,10 @@ public class FeatureRenderer extends
     updateFeatures();
 
     if (lastSeq == null || seq != lastSeq
-            || aseq.getSequenceFeatures() != sequenceFeatures)
+ || sf != sequenceFeatures)
     {
       lastSeq = seq;
-      sequenceFeatures = aseq.getSequenceFeatures();
+      sequenceFeatures = sf;
     }
 
     if (transparency != 1 && g != null)