X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2Fseqfeatures%2FFeatureRendererModel.java;h=674f3d1f0d544b068703bf79d1998efc89a4cd32;hb=7f649ce2db77e15533c42997ae7a1561cb54539e;hp=30d14c2a10f644667d0e48fa1bb34a160349dd6e;hpb=497958b4e5217efaa3ddeece38f38c3a6e98cb96;p=jalview.git diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java index 30d14c2..674f3d1 100644 --- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java +++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java @@ -246,6 +246,7 @@ public abstract class FeatureRendererModel implements { ArrayList tmp = new ArrayList(); SequenceFeature[] features = sequence.getSequenceFeatures(); + if (features != null) { for (int i = 0; i < features.length; i++) @@ -322,9 +323,7 @@ public abstract class FeatureRendererModel implements for (int i = 0; i < alignment.getHeight(); i++) { SequenceI asq = alignment.getSequenceAt(i); - SequenceI dasq = asq.getDatasetSequence(); - SequenceFeature[] features = dasq != null ? dasq - .getSequenceFeatures() : asq.getSequenceFeatures(); + SequenceFeature[] features = asq.getSequenceFeatures(); if (features == null) { @@ -900,7 +899,7 @@ public abstract class FeatureRendererModel implements { for (int i = 0; i < typ.length; i++) { - if (feature_disp.isVisible(typ[i])) + if (!feature_disp.isVisible(typ[i])) { typ[i] = null; }